From 2a5b7882f0136ca4ce1e4500862719f1ea30a2e0 Mon Sep 17 00:00:00 2001 From: Robert Kaiser Date: Thu, 2 Aug 2012 03:02:39 +0200 Subject: [PATCH] improve and correct identity box display, also make it work with current 17.0a1 Nightly builds --- LCARStrek/browser/browser.css | 55 +++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index e71fc9e4..0112c5de 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -723,7 +723,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button > #forward-button { /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */ - mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask"); + /*clip-path: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-clip-path"); */ -moz-margin-start: -6px !important; padding-left: 7px; padding-right: 3px; @@ -745,13 +745,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon border-bottom-left-radius: 11px; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #forward-button:not([disabled="true"]):not(:active):hover { - /*mask: url(keyhole-forward-mask.svg#mask-hover);*/ - mask: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-mask-hover"); -} - .unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr), .unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) { list-style-image: url("chrome://global/skin/arrow/arrow-left.gif") !important; @@ -1192,12 +1185,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon border-bottom-right-radius: 0; */ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled] + #urlbar-container { - mask: url("chrome://browser/content/browser.xul#winstripe-urlbar-back-button-mask"); -} - window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar { @@ -1316,19 +1303,22 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box { /* border-radius: 0; */ + -moz-padding-start: 2px; + -moz-padding-end: 2px; + -moz-margin-end: 1px; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { - padding-left: 5px; + padding-left: 2px; -moz-transition: padding-left; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { - padding-right: 5px; + padding-right: 2px; -moz-transition: padding-right; } @@ -1343,14 +1333,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ - padding-left: 5.01px; + padding-left: 2.01px; } window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { /* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */ - padding-right: 5.01px; + padding-right: 2.01px; } #identity-box.verifiedIdentity { @@ -1415,23 +1405,44 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon -moz-image-region: rect(0, 16px, 16px, 0); } -.verifiedDomain > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon { +.verifiedDomain > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon, +.verifiedDomain > #page-proxy-favicon[pageproxystate="valid"] { list-style-image: url("chrome://browser/skin/identity-icons-https.png"); } -.verifiedIdentity > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon { +.verifiedIdentity > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon, +.verifiedIdentity > #page-proxy-favicon[pageproxystate="valid"] { list-style-image: url("chrome://browser/skin/identity-icons-https-ev.png"); } -#identity-box:hover > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon { +#identity-box:hover > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon, +#identity-box:hover > #page-proxy-favicon { -moz-image-region: rect(0, 32px, 16px, 16px); } #identity-box:hover:active > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon, -#identity-box[open=true] > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon { +#identity-box[open=true] > #identity-box-inner > #page-proxy-stack > #page-proxy-favicon, +#identity-box:hover:active > #page-proxy-favicon, +#identity-box[open=true] > #page-proxy-favicon { -moz-image-region: rect(0, 48px, 16px, 32px); } +#identity-box:hover { + background-color: #FFCF00; +} + +#identity-box:hover:active, +#identity-box[open=true] { + background-color: #FF9F00; +} + +#identity-box.verifiedIdentity:hover, +#identity-box.verifiedIdentity:hover:active, +#identity-box.verifiedIdentity[open=true] { + background-color: #008484; + color: #000000; +} + #page-proxy-favicon[pageproxystate="invalid"] { opacity: 0.5; } -- 2.43.0