From 19988d2d5bba419a5f24824e3c7edf3119d95898 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Mon, 15 Feb 2016 02:01:46 +0100 Subject: [PATCH] second part of syncing LCARStrek with Firefox 42-44 windows theme changes --- LCARStrek/browser/browser.css | 124 ++++++++++-------- LCARStrek/browser/caption-buttons.svg | 108 +++++++++++++++ .../browser/controlcenter/conn-degraded.svg | 27 ++++ LCARStrek/browser/controlcenter/panel.css | 22 ++-- .../tracking-protection-disabled.svg | 20 ++- .../controlcenter/tracking-protection.svg | 16 +-- .../browser/customizableui/panelUIOverlay.css | 24 +++- LCARStrek/browser/devtools/computedview.css | 5 - LCARStrek/browser/devtools/dark-theme.css | 10 +- LCARStrek/browser/devtools/filetype-globe.svg | 2 +- LCARStrek/browser/devtools/filetype-store.svg | 2 +- LCARStrek/browser/devtools/filters.svg | 27 ++-- LCARStrek/browser/devtools/netmonitor.css | 2 +- LCARStrek/browser/devtools/ruleview.css | 16 ++- LCARStrek/browser/devtools/storage.css | 4 +- LCARStrek/browser/devtools/widgets.css | 96 ++++++-------- LCARStrek/browser/newtab/newTab.css | 1 - .../browser/preferences/aboutPermissions.css | 3 - .../preferences/in-content/preferences.css | 11 +- LCARStrek/browser/warning.svg | 7 + LCARStrek/browser/win-maximize-hover.gif | Bin 56 -> 0 bytes LCARStrek/browser/win-maximize.gif | Bin 56 -> 0 bytes 22 files changed, 338 insertions(+), 189 deletions(-) create mode 100644 LCARStrek/browser/caption-buttons.svg create mode 100644 LCARStrek/browser/controlcenter/conn-degraded.svg create mode 100644 LCARStrek/browser/warning.svg delete mode 100644 LCARStrek/browser/win-maximize-hover.gif delete mode 100644 LCARStrek/browser/win-maximize.gif diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 3a964b67..e6d12d74 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -80,7 +80,7 @@ menubar { #main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen])[chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar, #main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar { -/* margin-top: 15px;*/ +/* margin-top: var(--space-above-tabbar);*/ } @media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) { @@ -253,37 +253,36 @@ menubar { } /* titlebar command buttons */ - #titlebar-min { - list-style-image: url("chrome://navigator/skin/icons/win-minimize.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#minimize"); } #titlebar-min:hover { - list-style-image: url("chrome://navigator/skin/icons/win-minimize-hover.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#minimize-hover"); } #titlebar-max { - list-style-image: url("chrome://browser/skin/win-maximize.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#maximize"); } #titlebar-max:hover { - list-style-image: url("chrome://browser/skin/win-maximize-hover.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#maximize-hover"); } #main-window[sizemode="maximized"] #titlebar-max { - list-style-image: url("chrome://navigator/skin/icons/win-restore.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#restore"); } #main-window[sizemode="maximized"] #titlebar-max:hover { - list-style-image: url("chrome://navigator/skin/icons/win-restore-hover.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#restore-hover"); } #titlebar-close { - list-style-image: url("chrome://navigator/skin/icons/win-close.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#close"); } #titlebar-close:hover { - list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif"); + list-style-image: url("chrome://browser/skin/caption-buttons.svg#close-hover"); } @media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) { @@ -919,40 +918,40 @@ toolbar[brighttext] #pocket-button, } #loop-button, -#loop-button > .toolbarbutton-badge-container { +#loop-button > .toolbarbutton-badge-stack { list-style-image: url("chrome://browser/skin/loop/toolbarfx.png"); -moz-image-region: rect(0, 18px, 18px, 0); } #loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]), -#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-stack { -moz-image-region: rect(0, 90px, 18px, 72px); } #loop-button[state="disabled"], #loop-button[disabled="true"], -#loop-button[state="disabled"] > .toolbarbutton-badge-container, -#loop-button[disabled="true"] > .toolbarbutton-badge-container { +#loop-button[state="disabled"] > .toolbarbutton-badge-stack, +#loop-button[disabled="true"] > .toolbarbutton-badge-stack { -moz-image-region: rect(0, 36px, 18px, 18px); } #loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]), -#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { +#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-stack { -moz-image-region: rect(0, 126px, 18px, 108px); } #loop-button:not([disabled="true"])[state="error"], -#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-stack { -moz-image-region: rect(0, 54px, 18px, 36px); } #loop-button:not([disabled="true"])[state="action"], -#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-stack { -moz-image-region: rect(0, 72px, 18px, 54px); } #loop-button:not([disabled="true"])[state="active"], -#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { +#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-stack { -moz-image-region: rect(0, 108px, 18px, 90px); } @@ -1322,48 +1321,38 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton { } #loop-button[cui-areatype="menu-panel"], -toolbarpaletteitem[place="palette"] > #loop-button, -#loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, -toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { +toolbarpaletteitem[place="palette"] > #loop-button { list-style-image: url("chrome://browser/skin/loop/menuPanel.png"); -moz-image-region: rect(0, 32px, 32px, 0); } /* Make sure that the state icons are not shown in the customization palette. */ -toolbarpaletteitem[place="palette"] > #loop-button, -toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { +toolbarpaletteitem[place="palette"] > #loop-button { -moz-image-region: rect(0, 32px, 32px, 0) !important; } -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]), -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 160px, 32px, 128px); } #loop-button[cui-areatype="menu-panel"][state="disabled"], -#loop-button[cui-areatype="menu-panel"][disabled="true"], -#loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, -#loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { +#loop-button[cui-areatype="menu-panel"][disabled="true"] { -moz-image-region: rect(0, 64px, 32px, 32px); } -#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]), -#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { +#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) { -moz-image-region: rect(0, 224px, 32px, 192px); } -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"], -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { -moz-image-region: rect(0, 96px, 32px, 64px); } -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"], -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { -moz-image-region: rect(0, 128px, 32px, 96px); } -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"], -#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { -moz-image-region: rect(0, 192px, 32px, 160px); } @@ -1544,7 +1533,7 @@ toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-bri .findbar-button > .toolbarbutton-text, #nav-bar .toolbarbutton-1 > .toolbarbutton-icon, #nav-bar .toolbarbutton-1 > .toolbarbutton-text, -#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-stack, #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, #nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon { @@ -1556,7 +1545,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an } /* #nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon, -#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-stack, #nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } @@ -1564,7 +1553,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an /* Help SDK icons fit: */ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 16px; } @@ -1574,9 +1563,9 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba } #nav-bar .toolbarbutton-1[type=panel]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-icon, -#nav-bar .toolbarbutton-1[type=panel]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1[type=panel]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-badge-stack, #nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-icon, -#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-badge-stack, #nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ { /* -moz-padding-end: 17px;*/ } @@ -1620,7 +1609,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-an #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text, -#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-stack, window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([open]):not(:active):not([disabled=true]):hover > .toolbarbutton-icon, #nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon { } @@ -1630,7 +1619,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([ope #nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon, #nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text, -#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container { +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack { } #TabsToolbar .toolbarbutton-1, @@ -2007,6 +1996,10 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, color: #8050B0; } +#PopupAutoCompleteRichResult > richlistbox { + transition: height 100ms; +} + #search-container { min-width: calc(54px + 11ch); } @@ -2090,7 +2083,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but #identity-box[open=true] { } -#identity-box.verifiedIdentity:not(:-moz-lwtheme) { +#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover):not([open=true]) { var(--verified-identity-box-backgroundcolor); } @@ -2155,7 +2148,23 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but background-repeat: no-repeat; } -/* page proxy icon */ +/* TRACKING PROTECTION ICON */ + +#tracking-protection-icon { + width: 16px; + height: 16px; + list-style-image: url("chrome://browser/skin/tracking-protection-16.svg"); +} + +#tracking-protection-icon[state="loaded-tracking-content"] { + list-style-image: url("chrome://browser/skin/tracking-protection-disabled-16.svg"); +} + +#tracking-protection-icon:not([state]) { + display: none; +} + +/* MAIN IDENTITY ICON */ #page-proxy-favicon { width: 16px; @@ -3897,10 +3906,6 @@ notification[value="loop-sharing-notification"] .messageImage { box-shadow: 0 0 2px #9C9CFF; } -#full-screen-warning-container[obscure-browser] { - background-color: rgba(0,0,0,0.3); -} - .full-screen-description { font-size: 150%; } @@ -3909,11 +3914,6 @@ notification[value="loop-sharing-notification"] .messageImage { font-size: 300%; } -.full-screen-approval-button, -#full-screen-remember-decision { - font-size: 120%; -} - /* === BEGIN commandline.inc.css === */ /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS. @@ -5309,14 +5309,14 @@ toolbarpaletteitem[notransition][place="panel"] { } toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarpaletteitem > toolbaritem.panel-wide-item, toolbarpaletteitem > toolbarbutton[type="menu-button"] { transition: transform .3s cubic-bezier(.6, 2, .75, 1.5) !important; } toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-stack > .toolbarbutton-icon { transform: scale(1.3); } @@ -5739,10 +5739,12 @@ toolbarpaletteitem[place="toolbar"] { padding: 2em 15px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button { margin: 0 15px; } +#UITourTooltipButtons > label:first-child, #UITourTooltipButtons > button:first-child { -moz-margin-start: 0; } @@ -5753,6 +5755,7 @@ toolbarpaletteitem[place="toolbar"] { -moz-margin-end: 5px; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button .button-text { font-size: 1.15rem; } @@ -5773,6 +5776,7 @@ toolbarpaletteitem[place="toolbar"] { color: #000000; } +#UITourTooltipButtons > label, #UITourTooltipButtons > button.button-link { -moz-appearance: none; background: transparent; @@ -5920,7 +5924,13 @@ notification.heartbeat { /* === END UITour.inc.css === */ #UITourTooltipButtons { - margin: 24px -4px -4px; + /** + * Override the --panel-arrowcontent-padding so the background extends + * to the sides and bottom of the panel. + */ + margin-left: -10px; + margin-right: -10px; + margin-bottom: -10px; } /* === BEGIN contextmenu.inc.css === */ diff --git a/LCARStrek/browser/caption-buttons.svg b/LCARStrek/browser/caption-buttons.svg new file mode 100644 index 00000000..7b0bb600 --- /dev/null +++ b/LCARStrek/browser/caption-buttons.svg @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/controlcenter/conn-degraded.svg b/LCARStrek/browser/controlcenter/conn-degraded.svg new file mode 100644 index 00000000..4381d21e --- /dev/null +++ b/LCARStrek/browser/controlcenter/conn-degraded.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css index f070fe51..ec88a339 100644 --- a/LCARStrek/browser/controlcenter/panel.css +++ b/LCARStrek/browser/controlcenter/panel.css @@ -228,6 +228,15 @@ background-image: url(chrome://browser/skin/controlcenter/conn-secure.svg); } +#identity-popup-securityView.weakCipher, +#identity-popup-securityView.mixedDisplayContent, +#identity-popup-securityView.mixedDisplayContentLoadedActiveBlocked, +#identity-popup-security-content.weakCipher, +#identity-popup-security-content.mixedDisplayContent, +#identity-popup-security-content.mixedDisplayContentLoadedActiveBlocked { + background-image: url(chrome://browser/skin/controlcenter/conn-degraded.svg); +} + #identity-popup-securityView.mixedActiveContent, #identity-popup-security-content.mixedActiveContent { background-image: url(chrome://browser/skin/controlcenter/mcb-disabled.svg); @@ -258,8 +267,7 @@ background-image: url("chrome://browser/skin/controlcenter/tracking-protection.svg"); } -#tracking-protection-content[state="loaded-tracking-content"], -#tracking-protection-content[block-disabled] { +#tracking-protection-content[state="loaded-tracking-content"] { background-image: url("chrome://browser/skin/controlcenter/tracking-protection-disabled.svg"); } @@ -277,15 +285,7 @@ #tracking-protection-content:not([state="blocked-tracking-content"]) #tracking-action-unblock-private, #tracking-protection-content:not([state="loaded-tracking-content"]) > #tracking-loaded, #tracking-protection-content:not([state="loaded-tracking-content"]) #tracking-action-block, -#tracking-protection-content:not([state]) > #tracking-actions, - -#tracking-protection-content[block-active] > #tracking-not-detected, -#tracking-protection-content[block-disabled] > #tracking-not-detected, -#tracking-protection-content:not([block-active]) > #tracking-blocked, -#tracking-protection-content:not([block-active]) #tracking-action-unblock, -#tracking-protection-content:not([block-disabled]) > #tracking-loaded, -#tracking-protection-content:not([block-disabled]) #tracking-action-block, -#tracking-protection-content:not([block-active]):not([block-disabled]) > #tracking-actions { +#tracking-protection-content:not([state]) > #tracking-actions { display: none; } diff --git a/LCARStrek/browser/controlcenter/tracking-protection-disabled.svg b/LCARStrek/browser/controlcenter/tracking-protection-disabled.svg index 4558ffaa..eb663676 100644 --- a/LCARStrek/browser/controlcenter/tracking-protection-disabled.svg +++ b/LCARStrek/browser/controlcenter/tracking-protection-disabled.svg @@ -2,23 +2,21 @@ - + - - - + + + - + - + + - + diff --git a/LCARStrek/browser/controlcenter/tracking-protection.svg b/LCARStrek/browser/controlcenter/tracking-protection.svg index 29af973a..5ec36c22 100644 --- a/LCARStrek/browser/controlcenter/tracking-protection.svg +++ b/LCARStrek/browser/controlcenter/tracking-protection.svg @@ -2,21 +2,19 @@ - + - - - + + + - + + diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 95025404..955f6e6a 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -297,9 +297,9 @@ toolbarpaletteitem[place="panel"]:not([haswideitem=true]) > .toolbarbutton-1 { /* Help SDK buttons fit in. */ toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-icon, -toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon, toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-icon, -toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-badge-container > .toolbarbutton-icon { +toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-badge-stack > .toolbarbutton-icon { height: 32px; width: 32px; } @@ -409,10 +409,10 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon, -.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container, +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack, .customization-palette .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, .customization-palette .toolbarbutton-1 > .toolbarbutton-icon, -.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-container, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack, .panelUI-grid #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .customization-palette #bookmarks-toolbar-placeholder > .toolbarbutton-icon, .panel-customization-placeholder-child > .toolbarbutton-icon { @@ -436,8 +436,8 @@ toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-it /* above we treat the container as the icon for the margins, that is so the /* badge itself is positioned correctly. Here we make sure that the icon itself /* has the minum size we want, but no padding/margin. */ -.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon, -.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-container > .toolbarbutton-icon { +.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon, +.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon { width: 32px; height: 32px; min-width: 32px; @@ -493,6 +493,16 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { display: none; } +#PanelUI-footer-fxa[fxastatus="error"] > #PanelUI-fxa-status::after { + content: url("chrome://browser/skin/warning.svg"); + width: 47px; + padding-top: 1px; + display: block; + text-align: center; + position: relative; + top: 25%; +} + #PanelUI-fxa-status { display: flex; flex: 1 1 0%; @@ -619,7 +629,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-footer-fxa[fxastatus="migrate-signup"] > #PanelUI-fxa-status > #PanelUI-fxa-label, #PanelUI-footer-fxa[fxastatus="migrate-verify"] > #PanelUI-fxa-status > #PanelUI-fxa-label { - list-style-image: url(chrome://global/skin/warning-16.png); + list-style-image: url(chrome://browser/skin/warning.svg); } #PanelUI-customize { diff --git a/LCARStrek/browser/devtools/computedview.css b/LCARStrek/browser/devtools/computedview.css index ff809e24..c992a5c5 100644 --- a/LCARStrek/browser/devtools/computedview.css +++ b/LCARStrek/browser/devtools/computedview.css @@ -124,11 +124,6 @@ body { border-bottom-width: 1px; } -/* This rule is necessary because Templater.jsm breaks LTR TDs in RTL docs */ -.rule-text { - direction: ltr; -} - .matched { text-decoration: line-through; } diff --git a/LCARStrek/browser/devtools/dark-theme.css b/LCARStrek/browser/devtools/dark-theme.css index bbe0e341..38407b5d 100644 --- a/LCARStrek/browser/devtools/dark-theme.css +++ b/LCARStrek/browser/devtools/dark-theme.css @@ -840,6 +840,13 @@ div.CodeMirror span.eval-text { -moz-border-end-width: 0; } +.devtools-sidebar-tabs tabs > tab { +} + +.devtools-sidebar-tabs tabs > tab[selected], +.devtools-sidebar-tabs tabs > tab[selected] + tab { +} + .devtools-sidebar-tabs tabs > tab:first-child { } @@ -849,9 +856,6 @@ div.CodeMirror span.eval-text { .devtools-sidebar-tabs tabs > tab:hover:active { } -.devtools-sidebar-tabs tabs > tab[selected] + tab { -} - .devtools-sidebar-tabs tabs > tab[selected] + tab:hover { } diff --git a/LCARStrek/browser/devtools/filetype-globe.svg b/LCARStrek/browser/devtools/filetype-globe.svg index 82a4268e..539d6912 100644 --- a/LCARStrek/browser/devtools/filetype-globe.svg +++ b/LCARStrek/browser/devtools/filetype-globe.svg @@ -2,5 +2,5 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/LCARStrek/browser/devtools/filetype-store.svg b/LCARStrek/browser/devtools/filetype-store.svg index 01d36250..c704763a 100644 --- a/LCARStrek/browser/devtools/filetype-store.svg +++ b/LCARStrek/browser/devtools/filetype-store.svg @@ -1,7 +1,7 @@ - + diff --git a/LCARStrek/browser/devtools/filters.svg b/LCARStrek/browser/devtools/filters.svg index a06b3429..c95aa301 100644 --- a/LCARStrek/browser/devtools/filters.svg +++ b/LCARStrek/browser/devtools/filters.svg @@ -3,29 +3,22 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - - - - - - - - - - - - - - + + + - - + + - + diff --git a/LCARStrek/browser/devtools/netmonitor.css b/LCARStrek/browser/devtools/netmonitor.css index 6c0e81c5..ed906966 100644 --- a/LCARStrek/browser/devtools/netmonitor.css +++ b/LCARStrek/browser/devtools/netmonitor.css @@ -11,7 +11,7 @@ window { :root.theme-dark, :root.theme-light { - --table-splitter-color: #9C9CFF; + --table-splitter-color: #A09090; --table-zebra-background: rgba(255,159,0,0.1); } diff --git a/LCARStrek/browser/devtools/ruleview.css b/LCARStrek/browser/devtools/ruleview.css index b3529121..8374d629 100644 --- a/LCARStrek/browser/devtools/ruleview.css +++ b/LCARStrek/browser/devtools/ruleview.css @@ -225,14 +225,28 @@ border-bottom-color: #008484; } -.ruleview-selector { +.ruleview-selectorcontainer { word-wrap: break-word; + cursor: text; } .ruleview-selector-separator, .ruleview-selector-unmatched { color: #8050B0; } +.ruleview-selector-matched > .ruleview-selector-attribute { + /* TODO: Bug 1178535 Awaiting UX feedback on highlight colors */ +} + +.ruleview-selector-matched > .ruleview-selector-pseudo-class { + /* TODO: Bug 1178535 Awaiting UX feedback on highlight colors */ +} + +.ruleview-selector-matched > .ruleview-selector-pseudo-class-lock { + font-weight: bold; + color: var(--theme-highlight-orange); +} + .ruleview-selectorhighlighter { background: url("chrome://browser/skin/devtools/vview-open-inspector.png") no-repeat 0 0; padding-left: 16px; diff --git a/LCARStrek/browser/devtools/storage.css b/LCARStrek/browser/devtools/storage.css index a800b3f7..5c6e66a3 100644 --- a/LCARStrek/browser/devtools/storage.css +++ b/LCARStrek/browser/devtools/storage.css @@ -10,8 +10,8 @@ overflow: auto; } -.theme-dark #storage-tree { - background: #000000; /* Toolbars */ +#storage-tree { + background: var(--theme-sidebar-background); } #storage-tree .tree-widget-item[type="store"]:after { diff --git a/LCARStrek/browser/devtools/widgets.css b/LCARStrek/browser/devtools/widgets.css index b401f242..6c8df245 100644 --- a/LCARStrek/browser/devtools/widgets.css +++ b/LCARStrek/browser/devtools/widgets.css @@ -5,6 +5,12 @@ /* === BEGIN widgets.inc.css === */ +.theme-dark, +.theme-light { + --table-splitter-color: #A09090; + --table-zebra-background: rgba(255,159,0,0.1); +} + /* Generic pane helpers */ .generic-toggled-side-pane { @@ -1088,31 +1094,18 @@ .table-widget-body { overflow: auto; - - background: var(--theme-sidebar-background); -} - -.table-widget-body:-moz-locale-dir(ltr) { -/* box-shadow: inset -1px 0 0 @smw_marginDark@;*/ -} - -.table-widget-body:-moz-locale-dir(rtl) { -/* box-shadow: inset 1px 0 0 @smw_marginDark@;*/ -} - -.table-widget-body:-moz-locale-dir(ltr) { -/* box-shadow: inset -1px 0 0 @smw_marginLight@;*/ } -.table-widget-body:-moz-locale-dir(rtl) { -/* box-shadow: inset 1px 0 0 @smw_marginLight@;*/ +table-widget-body, +.table-widget-empty-text { + background-color: var(--theme-body-background); } /* Column Headers */ .table-widget-column-header, .table-widget-cell { - -moz-border-end: 1px solid #A09090; + -moz-border-end: 1px solid var(--table-splitter-color) !important; } /* Table widget column header colors are taken from netmonitor.inc.css to match @@ -1123,10 +1116,8 @@ background: rgba(0,0,0,0); position: sticky; top: 0; - min-height: 32px; width: 100%; - border: none; - padding: 8px 0 0 !important; + padding: 5px 0 0 !important; color: inherit; text-align: center; font-weight: inherit !important; @@ -1134,15 +1125,15 @@ } .table-widget-column-header:hover { - background: #FFCF00; + background: var(--theme-hover-background); } .table-widget-column-header:hover:active { - background: #FF9F00; + background: var(--theme-active-background); } .table-widget-column-header:not(:active)[sorted] { - background: #008484; + background: var(--theme-selection-background); } .table-widget-column-header:not(:active)[sorted=ascending] { @@ -1162,27 +1153,23 @@ .table-widget-cell { width: 100%; - margin: -1px 0 !important; padding: 3px 4px; background-clip: padding-box; min-width: 100px; -moz-user-focus: normal; -} -.table-widget-cell { - border-top: 1px solid #A09090; - border-bottom: 1px solid #A09090; - color: var(--theme-body-color); + margin-bottom: -1px !important; + border-bottom: 1px solid transparent; + color: var(--theme-body-color); } -.theme-dark:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), -.theme-light:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), -.table-widget-cell:not(.theme-selected)[odd] { - background: #404000; +.table-widget-cell:last-child { + border-bottom: 1px solid var(--table-splitter-color); } -.table-widget-cell:last-of-type { -/* box-shadow: inset 0 -1px 0 @smw_itemDarkTopBorder@;*/ +:root:not(.filtering) .table-widget-cell:nth-child(odd):not(.theme-selected), +.table-widget-cell:not(.theme-selected)[odd] { + background: var(--table-zebra-background); } .table-widget-cell.flash-out { @@ -1255,11 +1242,11 @@ } .tree-widget-item[level="1"] { - font-weight: 800; + font-weight: 700; } /* Twisties */ -.tree-widget-item:before { +.tree-widget-item::before { content: ""; width: 14px; height: 14px; @@ -1272,27 +1259,19 @@ background-position: -28px -14px; } -.tree-widget-item:-moz-locale-dir(rtl):before { +.tree-widget-item:-moz-locale-dir(rtl)::before { float: right; transform: scaleX(-1); } -.theme-light .tree-widget-item:before { - background-position: 0 -14px; -} - -.tree-widget-item[empty]:before { +.tree-widget-item[empty]::before { background: transparent; } -.tree-widget-item[expanded]:before { +.tree-widget-item[expanded]::before { background-position: -42px -14px; } -.theme-light .tree-widget-item[expanded]:before { - background-position: -14px -14px; -} - .tree-widget-item + ul { overflow: hidden; animation: collapse-tree-item 0.2s; @@ -1367,7 +1346,7 @@ /* Custom icons for certain tree items indicating the type of the item */ -.tree-widget-item[type]:after { +.tree-widget-item[type]::after { content: ""; float: left; width: 16px; @@ -1375,31 +1354,36 @@ -moz-margin-end: 4px; background-repeat: no-repeat; background-size: 20px auto; - filter: url('filters.svg#invert'); background-position: 0 0; background-size: auto 20px; + opacity: 0.75; +} + +.tree-widget-item.theme-selected[type]::after { + opacity: 1; } -.tree-widget-item:-moz-locale-dir(rtl):after { +.tree-widget-item:-moz-locale-dir(rtl)::after { float: right; } -.theme-dark .tree-widget-item[type]:after { - filter: url('filters.svg#invert-white'); +/*.theme-light .tree-widget-item.theme-selected[type]::after,*/ +.tree-widget-item[type]::after { + filter: invert(1); } -.tree-widget-item[type="dir"]:after { +.tree-widget-item[type="dir"]::after { background-image: url("chrome://browser/skin/devtools/filetype-dir-close.svg"); background-position: 2px 0; background-size: auto 16px; width: 20px; } -.tree-widget-item[type="dir"][expanded]:not([empty]):after { +.tree-widget-item[type="dir"][expanded]:not([empty])::after { background-image: url("chrome://browser/skin/devtools/filetype-dir-open.svg"); } -.tree-widget-item[type="url"]:after { +.tree-widget-item[type="url"]::after { background-image: url("chrome://browser/skin/devtools/filetype-globe.svg"); background-size: auto 18px; width: 18px; diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index dea4dd6d..01d64b76 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -153,7 +153,6 @@ body { } /* TITLES */ -/*#newtab-intro-what,*/ .newtab-sponsored, .newtab-title, .newtab-suggested { diff --git a/LCARStrek/browser/preferences/aboutPermissions.css b/LCARStrek/browser/preferences/aboutPermissions.css index 927bce66..74a98095 100644 --- a/LCARStrek/browser/preferences/aboutPermissions.css +++ b/LCARStrek/browser/preferences/aboutPermissions.css @@ -116,9 +116,6 @@ .pref-icon[type="plugins"] { list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png"); } -.pref-icon[type="fullscreen"] { - list-style-image: url("chrome://global/skin/icons/alert-question.gif"); -} .pref-icon[type="camera"] { list-style-image: url("chrome://global/skin/icons/alert-question.gif"); } diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 88dd05cf..9ab3c4f1 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -542,7 +542,12 @@ description > html|a { } #tosPP-small-ToS { - margin-bottom: 14px; + margin-bottom: 1em; +} + +#fxaLoginRejectedWarning { + list-style-image: url("chrome://browser/skin/warning.svg"); + margin: 4px 8px 0px 0px; } #noFxaCaption { @@ -558,8 +563,8 @@ description > html|a { margin-bottom: 11px; } -#fxaDeviceName { - margin-bottom: 27.5px; +#fxaSyncComputerName { + margin-left: 0px; } #noFxaDescription { diff --git a/LCARStrek/browser/warning.svg b/LCARStrek/browser/warning.svg new file mode 100644 index 00000000..f71230f7 --- /dev/null +++ b/LCARStrek/browser/warning.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/LCARStrek/browser/win-maximize-hover.gif b/LCARStrek/browser/win-maximize-hover.gif deleted file mode 100644 index 33f12f83537f4b36c338efd237b983812c877b51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmZ?wbhEHbjEB<5wG8q|kKzxu40~3Es|H^}BpUL#_U#L2~L`#&x F8UStN4!i&W diff --git a/LCARStrek/browser/win-maximize.gif b/LCARStrek/browser/win-maximize.gif deleted file mode 100644 index 073a7d4631751e0e55dbc9a35155cc63cbf1b908..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56 zcmZ?wbhEHb