From c9b0a39698caad3beaf5228ce051ec83042d4de9 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Wed, 6 Jan 2016 19:42:01 +0100 Subject: [PATCH] sixth and last part of syncing LCARStrek with Firefox 41 windows theme changes --- EarlyBlue/install.rdf | 2 +- LCARStrek/browser/aboutWelcomeBack.css | 6 +- LCARStrek/browser/actionicon-tab@2x.png | Bin 0 -> 196 bytes LCARStrek/browser/browser.css | 148 +++++++++++++++--- .../browser/controlcenter/conn-secure-ev.svg | 36 ----- .../{conn-secure-dv.svg => conn-secure.svg} | 0 LCARStrek/browser/controlcenter/panel.css | 11 +- .../browser/customizableui/panelUIOverlay.css | 7 +- LCARStrek/browser/devtools/debugger.css | 4 +- LCARStrek/browser/downloads/indicator.css | 6 +- LCARStrek/browser/identity-icon.svg | 31 ++++ .../browser/identity-mixed-active-blocked.svg | 31 ++++ .../browser/identity-mixed-active-loaded.svg | 38 +++++ .../browser/identity-mixed-passive-loaded.svg | 31 ++++ LCARStrek/browser/identity-not-secure.svg | 8 + LCARStrek/browser/identity-secure.svg | 27 ++++ LCARStrek/browser/newtab/newTab.css | 13 +- .../preferences/in-content/preferences.css | 5 +- LCARStrek/browser/tracking-protection-16.svg | 21 +++ .../tracking-protection-disabled-16.svg | 23 +++ LCARStrek/chrome.manifest | 2 +- LCARStrek/devtools/themes | 1 - LCARStrek/install.rdf | 4 +- 23 files changed, 363 insertions(+), 92 deletions(-) create mode 100644 LCARStrek/browser/actionicon-tab@2x.png delete mode 100644 LCARStrek/browser/controlcenter/conn-secure-ev.svg rename LCARStrek/browser/controlcenter/{conn-secure-dv.svg => conn-secure.svg} (100%) create mode 100755 LCARStrek/browser/identity-icon.svg create mode 100644 LCARStrek/browser/identity-mixed-active-blocked.svg create mode 100644 LCARStrek/browser/identity-mixed-active-loaded.svg create mode 100644 LCARStrek/browser/identity-mixed-passive-loaded.svg create mode 100644 LCARStrek/browser/identity-not-secure.svg create mode 100644 LCARStrek/browser/identity-secure.svg create mode 100755 LCARStrek/browser/tracking-protection-16.svg create mode 100755 LCARStrek/browser/tracking-protection-disabled-16.svg delete mode 120000 LCARStrek/devtools/themes diff --git a/EarlyBlue/install.rdf b/EarlyBlue/install.rdf index 3e4c4b11..fefbedc8 100644 --- a/EarlyBlue/install.rdf +++ b/EarlyBlue/install.rdf @@ -12,7 +12,7 @@ {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.38 - 2.42a1 + 2.43a1 diff --git a/LCARStrek/browser/aboutWelcomeBack.css b/LCARStrek/browser/aboutWelcomeBack.css index 34368b30..e65fbebe 100644 --- a/LCARStrek/browser/aboutWelcomeBack.css +++ b/LCARStrek/browser/aboutWelcomeBack.css @@ -13,14 +13,10 @@ /* tablist starts out hidden, but JS may make it visible in response to clicks on the radio buttons by setting an "available" attribute. */ -#tabList { +.tree-container:not([available]) { display: none; } -#tabList[available] { - display: -moz-box; -} - treechildren::-moz-tree-image(icon), treechildren::-moz-tree-image(noicon) { padding-right: 2px; diff --git a/LCARStrek/browser/actionicon-tab@2x.png b/LCARStrek/browser/actionicon-tab@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fd836f53a67b3c6649038da527cb4229a1c6181c GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@#0(_a9?Z1`Qak}ZA+C?ZnSjhWbN>H7&%kRh zy#UBzED7=pW^j0RBMrn!@^*J&=wOxg0CG4BJR*x382Ao>Fr%o3R|8Oxy~NYkmHh!D zn}CV>fw@YHfI^0zE{-7@=aUl_NJX%+D9qwKlEGlK!(k6=N#dV&CYIz6jAuS@vNi#^ gEl!M0j;ag{agq*4ox<%EftndSUHx3vIVCg!05?oAcmMzZ literal 0 HcmV?d00001 diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 7fb1cbea..64c688a1 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -38,6 +38,11 @@ menubar { :root { --verified-identity-box-backgroundcolor: #000000; + + --panel-separator-color: #A09090; + + /*--urlbar-separator-color: rgba(0,0,0,.2);*/ + --urlbar-separator-color: #9C9CFF; } #menubar-items { @@ -1863,6 +1868,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but color: #FFBFFF; } +/* overlap the urlbar's border */ +#PopupAutoCompleteRichResult { + margin-top: -1px; +} + #urlbar:-moz-lwtheme, .searchbar-textbox:-moz-lwtheme { /* background-color: rgba(255,255,255,.8); @@ -2084,7 +2094,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but } #urlbar-container[combined="true"] > #urlbar > .urlbar-history-dropmarker, -#urlbar-wrapper > #urlbar > .urlbar-history-dropmarker { +#urlbar-wrapper > #urlbar > .urlbar-history-dropmarker, +#urlbar-wrapper > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker { border: none; border-radius: 0px; } @@ -2183,6 +2194,99 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but opacity: 1; } +/* MAIN IDENTITY ICON */ + +#identity-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-icon.svg#normal); +} + +#identity-box:hover > #identity-icon, +#identity-box[open=true] > #identity-icon { + list-style-image: url(chrome://browser/skin/identity-icon.svg#hover); +} + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); +} + +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon { + opacity: 0.3; +} + +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); + width: 16px; + height: 16px; + opacity: 1; +} + +/* TRACKING PROTECTION ICON */ + +#tracking-protection-icon { + width: 16px; + height: 16px; + margin-inline-start: 2px; + margin-inline-end: 0; + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); + opacity: 1; +} + +#tracking-protection-icon[state="loaded-tracking-content"] { + list-style-image: url(chrome://browser/skin/tracking-protection-disabled-16.svg); +} + +#tracking-protection-icon[animate] { + transition: margin-left 200ms ease-out, margin-right 200ms ease-out; +} + +#tracking-protection-icon:not([state]) { + margin-inline-end: -18px; + pointer-events: none; + opacity: 0; + /* Only animate the shield in, when it disappears hide it immediately. */ + transition: none; +} + +#urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon { + visibility: collapse; +} + +/* CONNECTION ICON */ + +#connection-icon { + width: 16px; + height: 16px; + margin-inline-start: 2px; + visibility: collapse; +} + +#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-secure.svg); + visibility: visible; +} + +#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); + visibility: visible; +} + +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; +} + +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); + visibility: visible; +} + /* === END identity-block.inc.css === */ #page-proxy-favicon { @@ -2314,13 +2418,19 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- /* combined go/reload/stop button in location bar */ -#urlbar > toolbarbutton { - -moz-margin-start: 0; - padding: 0 2px; - background-origin: border-box; - border: none; +#urlbar-go-button, +#urlbar-reload-button, +#urlbar-stop-button { + border-style: none; list-style-image: url("chrome://browser/skin/reload-stop-goFx.png"); - -moz-border-start: 1px solid #9C9CFF; +/* padding: 0 9px;*/ + margin-inline-start: 2px; + border-inline-start: 1px solid var(--urlbar-separator-color); + border-image: linear-gradient(transparent 15%, + var(--urlbar-separator-color) 15%, + var(--urlbar-separator-color) 85%, + transparent 85%); + border-image-slice: 1; } #urlbar:-moz-locale-dir(ltr) > toolbarbutton { @@ -2376,10 +2486,18 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- } @media (min-resolution: 1.1dppx) { - #urlbar > toolbarbutton { + #urlbar-go-button, + #urlbar-reload-button, + #urlbar-stop-button { list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png"); } + #urlbar-go-button > .toolbarbutton-icon, + #urlbar-reload-button > .toolbarbutton-icon, + #urlbar-stop-button > .toolbarbutton-icon { + width: 14px; + } + #urlbar-go-button { -moz-image-region: rect(0, 84px, 28px, 56px); } @@ -2415,10 +2533,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- #urlbar-stop-button:hover:active { -moz-image-region: rect(56px, 56px, 84px, 28px); } - - #urlbar > toolbarbutton > .toolbarbutton-icon { - width: 14px; - } } /* popup blocker button */ @@ -3139,7 +3253,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="xpinstall-disabled"], -.popup-notification-icon[popupid="addon-install-blocked"] { +.popup-notification-icon[popupid="addon-install-blocked"], +.popup-notification-icon[popupid="addon-install-origin-blocked"] { list-style-image: url(chrome://browser/skin/addons/addon-install-blocked.svg); } @@ -3245,6 +3360,8 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled } .notification-anchor-icon { + list-style-image: url("chrome://global/skin/icons/information-16.png"); + width: 16px; height: 16px; margin: 0 2px; @@ -3254,11 +3371,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled outline: 1px dotted #008484; } -.default-notification-icon, -#default-notification-icon { - list-style-image: url("chrome://global/skin/icons/information-16.png"); -} - .identity-notification-icon, #identity-notification-icon { list-style-image: url("chrome://mozapps/skin/profile/profileicon.png"); diff --git a/LCARStrek/browser/controlcenter/conn-secure-ev.svg b/LCARStrek/browser/controlcenter/conn-secure-ev.svg deleted file mode 100644 index c03c8efc..00000000 --- a/LCARStrek/browser/controlcenter/conn-secure-ev.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/LCARStrek/browser/controlcenter/conn-secure-dv.svg b/LCARStrek/browser/controlcenter/conn-secure.svg similarity index 100% rename from LCARStrek/browser/controlcenter/conn-secure-dv.svg rename to LCARStrek/browser/controlcenter/conn-secure.svg diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css index b351999e..f070fe51 100644 --- a/LCARStrek/browser/controlcenter/panel.css +++ b/LCARStrek/browser/controlcenter/panel.css @@ -92,7 +92,7 @@ } .identity-popup-section:not(:first-child) { - border-top: 1px solid #A09090; /*var(--panel-separator-color);*/ + border-top: 1px solid var(--panel-separator-color); } #identity-popup-securityView, @@ -222,13 +222,10 @@ } #identity-popup-securityView.verifiedDomain, -#identity-popup-security-content.verifiedDomain { - background-image: url(chrome://browser/skin/controlcenter/conn-secure-dv.svg); -} - #identity-popup-securityView.verifiedIdentity, +#identity-popup-security-content.verifiedDomain, #identity-popup-security-content.verifiedIdentity { - background-image: url(chrome://browser/skin/controlcenter/conn-secure-ev.svg); + background-image: url(chrome://browser/skin/controlcenter/conn-secure.svg); } #identity-popup-securityView.mixedActiveContent, @@ -237,7 +234,7 @@ } #identity-popup-securityView-header { - border-bottom: 1px solid #A09090; /*var(--panel-separator-color);*/ + border-bottom: 1px solid var(--panel-separator-color); padding-bottom: 1em; margin-bottom: 1em; } diff --git a/LCARStrek/browser/customizableui/panelUIOverlay.css b/LCARStrek/browser/customizableui/panelUIOverlay.css index 9a5e70ef..95025404 100644 --- a/LCARStrek/browser/customizableui/panelUIOverlay.css +++ b/LCARStrek/browser/customizableui/panelUIOverlay.css @@ -496,10 +496,11 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-fxa-status { display: flex; flex: 1 1 0%; + width: 1px; } #PanelUI-footer-inner, -#PanelUI-footer-fxa { +#PanelUI-footer-fxa:not([hidden]) { display: flex; border-top: 1px solid #9C9CFF; } @@ -616,8 +617,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { list-style-image: url("chrome://browser/skin/syncFxProgress-horizontalbar.png"); } -#PanelUI-fxa-icon[fxastatus="migrate-signup"], -#PanelUI-fxa-icon[fxastatus="migrate-verify"] { +#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); } diff --git a/LCARStrek/browser/devtools/debugger.css b/LCARStrek/browser/devtools/debugger.css index 4083c5a2..3bec7c29 100644 --- a/LCARStrek/browser/devtools/debugger.css +++ b/LCARStrek/browser/devtools/debugger.css @@ -611,11 +611,11 @@ window { } } -#resume ~ toolbarbutton { +#debugger-controls toolbarbutton { /* transition: opacity 0.15s ease-in-out; */ } -#resume:not([checked]) ~ toolbarbutton { +#debugger-controls toolbarbutton[disabled] { /* opacity: 0.5; */ } diff --git a/LCARStrek/browser/downloads/indicator.css b/LCARStrek/browser/downloads/indicator.css index 5cb8592a..a9274484 100644 --- a/LCARStrek/browser/downloads/indicator.css +++ b/LCARStrek/browser/downloads/indicator.css @@ -19,13 +19,13 @@ /*** Main indicator icon ***/ -@media not all and (min-resolution: 1.1dppx) { - #downloads-indicator-icon { +/*@media not all and (min-resolution: 1.1dppx) {*/ + #downloads-button { --downloads-indicator-icon: -moz-image-rect(url("chrome://browser/skin/ToolbarFx.png"), 0, 198, 18, 180); --downloads-indicator-icon-hover: -moz-image-rect(url("chrome://browser/skin/ToolbarFx.png"), 18, 198, 36, 180); --downloads-indicator-icon-attention: url("chrome://browser/skin/downloads/download-glow.png"); } -} +/*}*/ #downloads-indicator-icon { diff --git a/LCARStrek/browser/identity-icon.svg b/LCARStrek/browser/identity-icon.svg new file mode 100755 index 00000000..584dc74f --- /dev/null +++ b/LCARStrek/browser/identity-icon.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/identity-mixed-active-blocked.svg b/LCARStrek/browser/identity-mixed-active-blocked.svg new file mode 100644 index 00000000..622d8872 --- /dev/null +++ b/LCARStrek/browser/identity-mixed-active-blocked.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/identity-mixed-active-loaded.svg b/LCARStrek/browser/identity-mixed-active-loaded.svg new file mode 100644 index 00000000..ec8e29ae --- /dev/null +++ b/LCARStrek/browser/identity-mixed-active-loaded.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/identity-mixed-passive-loaded.svg b/LCARStrek/browser/identity-mixed-passive-loaded.svg new file mode 100644 index 00000000..92f05850 --- /dev/null +++ b/LCARStrek/browser/identity-mixed-passive-loaded.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/identity-not-secure.svg b/LCARStrek/browser/identity-not-secure.svg new file mode 100644 index 00000000..4e6c8e0c --- /dev/null +++ b/LCARStrek/browser/identity-not-secure.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/LCARStrek/browser/identity-secure.svg b/LCARStrek/browser/identity-secure.svg new file mode 100644 index 00000000..aad4d3c0 --- /dev/null +++ b/LCARStrek/browser/identity-secure.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/newtab/newTab.css b/LCARStrek/browser/newtab/newTab.css index 56fef1b8..dea4dd6d 100644 --- a/LCARStrek/browser/newtab/newTab.css +++ b/LCARStrek/browser/newtab/newTab.css @@ -93,9 +93,7 @@ body { } /* CELLS */ -.newtab-cell, -.newtab-intro-cell, -.newtab-intro-cell-hover { +.newtab-cell { background-color: rgba(255,159,0,.2); border: 1px solid; border-color: #9C9CFF; @@ -116,17 +114,10 @@ body { .newtab-cell:not([ignorehover]) .newtab-control:hover ~ .newtab-link, .newtab-cell:not([ignorehover]) .newtab-link:hover, -.newtab-site[dragged], -.newtab-intro-cell-hover .newtab-link { +.newtab-site[dragged] { box-shadow: 0 0 10px rgba(0,132,132,.3); } -.newtab-intro-cell .newtab-thumbnail, -.newtab-intro-cell-hover .newtab-thumbnail { - background-color: #9C9CFF; - background-image: url("chrome://browser/skin/newtab/whimsycorn.png"); -} - .newtab-site[dragged] { transition-property: box-shadow, background-color; background-color: #002121; diff --git a/LCARStrek/browser/preferences/in-content/preferences.css b/LCARStrek/browser/preferences/in-content/preferences.css index 9bdbfe74..60ad0001 100644 --- a/LCARStrek/browser/preferences/in-content/preferences.css +++ b/LCARStrek/browser/preferences/in-content/preferences.css @@ -372,9 +372,10 @@ description > html|a { background-color: transparent !important; border: none; box-shadow: none; - height: 18px; padding: 0; - min-width: 18px; + height: auto; + min-height: 16px; + min-width: 0; } #dialogBox > .groupbox-title > caption { diff --git a/LCARStrek/browser/tracking-protection-16.svg b/LCARStrek/browser/tracking-protection-16.svg new file mode 100755 index 00000000..63100f68 --- /dev/null +++ b/LCARStrek/browser/tracking-protection-16.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/browser/tracking-protection-disabled-16.svg b/LCARStrek/browser/tracking-protection-disabled-16.svg new file mode 100755 index 00000000..c819621f --- /dev/null +++ b/LCARStrek/browser/tracking-protection-disabled-16.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/LCARStrek/chrome.manifest b/LCARStrek/chrome.manifest index f800c8e0..105a76aa 100644 --- a/LCARStrek/chrome.manifest +++ b/LCARStrek/chrome.manifest @@ -10,4 +10,4 @@ skin editor LCARStrek editor/ skin chatzilla LCARStrek chatzilla/ skin inspector LCARStrek inspector/ skin browser LCARStrek browser/ -skin devtools LCARStrek devtools/ +skin devtools LCARStrek browser/devtools/ diff --git a/LCARStrek/devtools/themes b/LCARStrek/devtools/themes deleted file mode 120000 index 18e44be4..00000000 --- a/LCARStrek/devtools/themes +++ /dev/null @@ -1 +0,0 @@ -../browser/devtools \ No newline at end of file diff --git a/LCARStrek/install.rdf b/LCARStrek/install.rdf index 451179cf..c2043b2d 100644 --- a/LCARStrek/install.rdf +++ b/LCARStrek/install.rdf @@ -12,7 +12,7 @@ {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.38 - 2.42a1 + 2.43a1 @@ -20,7 +20,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 41.0 - 45.0a1 + 46.0a1 -- 2.35.3