From dffb508bfe75328a434ca7f57307848d9a00c94a Mon Sep 17 00:00:00 2001 From: Markus Stange Date: Sun, 21 Feb 2010 16:03:55 +0100 Subject: [PATCH] Bug 547538 - Fix performance regression of bug 482086 and bug 482105 by using layered backgrounds instead of borders and less box shadows. r=dao --- browser/themes/pinstripe/browser/browser.css | 123 +++++++++--------- browser/themes/pinstripe/browser/jar.mn | 3 - .../navbar-textbox-button-verifiedDomain.png | Bin 207 -> 0 bytes ...navbar-textbox-button-verifiedIdentity.png | Bin 208 -> 0 bytes .../browser/navbar-textbox-button.png | Bin 217 -> 0 bytes 5 files changed, 62 insertions(+), 64 deletions(-) delete mode 100755 browser/themes/pinstripe/browser/navbar-textbox-button-verifiedDomain.png delete mode 100755 browser/themes/pinstripe/browser/navbar-textbox-button-verifiedIdentity.png delete mode 100755 browser/themes/pinstripe/browser/navbar-textbox-button.png diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css index e2f7eaa50a53..54cdab5af5fc 100644 --- a/browser/themes/pinstripe/browser/browser.css +++ b/browser/themes/pinstripe/browser/browser.css @@ -718,45 +718,56 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke width: 7em; min-width: 7em; -moz-appearance: none; - -moz-background-clip: padding; -moz-border-radius: 100%; - border: 1px solid; - -moz-border-top-colors: #666; - -moz-border-right-colors: #777; - -moz-border-bottom-colors: #888; - -moz-border-left-colors: #777; - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.3) inset, - 0 1px 0 rgba(255,255,255,.3); + border: 0; + padding: 1px; + background: -moz-linear-gradient(top, rgba(0,0,0,.55), rgba(0,0,0,.27)); + -moz-box-shadow: @loweredShadow@; margin-top: 0; margin-bottom: 1px; - -moz-padding-end: 6px; } .searchbar-textbox[focused="true"], #urlbar[focused="true"] { - -moz-border-top-colors: rgba(0,0,0,.3); - -moz-border-right-colors: rgba(0,0,0,.2); - -moz-border-bottom-colors: rgba(0,0,0,.15); - -moz-border-left-colors: rgba(0,0,0,.2); - -moz-box-shadow: 0 1px 1px rgba(0,0,0,.3) inset, - @focusRingShadow@; + -moz-box-shadow: 0 0 3px 2px -moz-mac-focusring; + background: -moz-mac-focusring -moz-linear-gradient(top, rgba(0,0,0,.1), rgba(0,0,0,.1)); +} + +.search-go-container, +#urlbar > .autocomplete-history-dropmarker { + -moz-padding-end: 6px; + -moz-border-radius: 100%; +} + +#urlbar > .autocomplete-history-dropmarker { + width: 22px; +} + +.search-go-container:-moz-locale-dir(ltr), +#urlbar > .autocomplete-history-dropmarker { + -moz-border-radius-topleft: 0; + -moz-border-radius-bottomleft: 0; +} + +.search-go-container:-moz-locale-dir(rtl) { + -moz-border-radius-topright: 0; + -moz-border-radius-bottomright: 0; } .searchbar-engine-button, #identity-box { - background: #fff url(navbar-textbox-button.png) bottom repeat-x; - -moz-background-clip: padding; + background: @toolbarbuttonBackground@; color: black; -moz-padding-start: 6px; -moz-padding-end: 16px; -moz-border-radius: 100%; - border-top: 1px solid rgba(0,0,0,.35); - -moz-border-start: 1px solid rgba(0,0,0,.25); - border-bottom: 1px solid rgba(0,0,0,.2); - margin-top: -1px; - margin-bottom: -1px; - -moz-margin-start: -1px; - -moz-margin-end: 0; + margin: 0; + -moz-box-shadow: 0 1px rgba(0,0,0,.3); +} + +.searchbar-textbox[focused="true"] .searchbar-engine-button, +#urlbar[focused="true"] > #identity-box { + -moz-box-shadow: none; } #identity-box:focus:not(:active):not([open="true"]) #page-proxy-stack { @@ -765,31 +776,26 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke 0 0 3px 2px -moz-mac-focusring; } -.searchbar-textbox[focused="true"] .searchbar-engine-button, -#urlbar[focused="true"] > #identity-box { - -moz-box-shadow: 0 0 1px -moz-mac-focusring inset; -} - .searchbar-engine-button[open="true"], .searchbar-engine-button:hover:active, #identity-box[open="true"], #identity-box:hover:active { - border-style: none; + margin-top: -1px; + margin-bottom: -1px; + -moz-margin-start: -1px; padding-top: 1px; padding-bottom: 1px; -moz-padding-start: 7px; - -moz-box-shadow: 0 0 50px rgba(0,0,0,.3) inset, - 0 3px 3px rgba(0,0,0,.6) inset, - 2px 0 2px rgba(0,0,0,.3) inset, - 0 -2px 2px rgba(0,0,0,.1) inset !important; + -moz-box-shadow: @toolbarbuttonPressedInnerShadow@, + 0 0 0 20px rgba(0,0,0,.2) inset !important; } #identity-box.verifiedDomain { - background-image: url(navbar-textbox-button-verifiedDomain.png); + background-image: -moz-linear-gradient(top, #E8F2F9, #AED4EA 1px, #87ACCF 50%, #749CC5 50%, #4B6CA4); } #identity-box.verifiedIdentity { - background-image: url(navbar-textbox-button-verifiedIdentity.png); + background-image: -moz-linear-gradient(top, #EBF8D2, #D3EEA1 1px, #AAD77B 50%, #96CB60 50%, #6EB142); } #identity-icon-label { @@ -804,39 +810,30 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke #urlbar > .autocomplete-textbox-container > .textbox-input-box { -moz-margin-end: 0; -moz-margin-start: -16px; - background-color: -moz-field; -moz-padding-start: 10px; height: 20px; + -moz-border-radius: 100%; +} + +.searchbar-textbox > .autocomplete-textbox-container > .textbox-input-box, +#urlbar > .autocomplete-textbox-container > .textbox-input-box, +.search-go-container, +#urlbar-icons, +#urlbar > .autocomplete-history-dropmarker { + background: -moz-linear-gradient(#D6D6D6, #D6D6D6 1px, #F7F7F7 1px, #F7F7F7 2px, #FFF 2px, #FFF); } .searchbar-textbox:-moz-locale-dir(ltr) > .autocomplete-textbox-container > .textbox-input-box, #urlbar > .autocomplete-textbox-container > .textbox-input-box { - -moz-border-radius-topleft: 100%; - -moz-border-radius-bottomleft: 100%; - -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset, - 1px 0 0 rgba(0,0,0,.2) inset; + -moz-border-radius-topright: 0; + -moz-border-radius-bottomright: 0; + -moz-box-shadow: 1px 0 rgba(0,0,0,.4) inset; } .searchbar-textbox:-moz-locale-dir(rtl) > .autocomplete-textbox-container > .textbox-input-box { - -moz-border-radius-topright: 100%; - -moz-border-radius-bottomright: 100%; - -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset, - -1px 0 0 rgba(0,0,0,.2) inset; -} - -.searchbar-textbox[focused="true"]:-moz-locale-dir(ltr) > .autocomplete-textbox-container > .textbox-input-box, -#urlbar[focused="true"] > .autocomplete-textbox-container > .textbox-input-box { - -moz-box-shadow: 1px 1px 1px rgba(0,0,0,.3) inset, - 1px 0 0 rgba(0,0,0,.2) inset, - 2px 0 0 -moz-field inset, - 1px 0 1px -moz-mac-focusring inset; -} - -.searchbar-textbox[focused="true"]:-moz-locale-dir(rtl) > .autocomplete-textbox-container > .textbox-input-box { - -moz-box-shadow: -1px 1px 1px rgba(0,0,0,.3) inset, - -1px 0 0 rgba(0,0,0,.2) inset, - -2px 0 0 -moz-field inset, - -1px 0 1px -moz-mac-focusring inset; + -moz-border-radius-topleft: 0; + -moz-border-radius-bottomleft: 0; + -moz-box-shadow: -1px 0 rgba(0,0,0,.4) inset; } #urlbar-icons { @@ -891,10 +888,14 @@ toolbar[iconsize="small"] #unified-back-forward-button > #back-forward-dropmarke } #wrapper-urlbar-container #identity-icon-label, -#wrapper-urlbar-container .autocomplete-history-dropmarker { +#wrapper-urlbar-container .autocomplete-history-dropmarker > .dropmarker-icon { display: none; } +#wrapper-urlbar-container .autocomplete-history-dropmarker { + width: 10px; +} + #PopupAutoCompleteRichResult { direction: ltr !important; margin-top: 2px; diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn index 61185fae4b6e..cb65489fed39 100644 --- a/browser/themes/pinstripe/browser/jar.mn +++ b/browser/themes/pinstripe/browser/jar.mn @@ -30,9 +30,6 @@ browser.jar: skin/classic/browser/KUI-close.png skin/classic/browser/menu-back.png skin/classic/browser/menu-forward.png - skin/classic/browser/navbar-textbox-button.png - skin/classic/browser/navbar-textbox-button-verifiedDomain.png - skin/classic/browser/navbar-textbox-button-verifiedIdentity.png skin/classic/browser/page-livemarks.png skin/classic/browser/livemark-item.png skin/classic/browser/pageInfo.css diff --git a/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedDomain.png b/browser/themes/pinstripe/browser/navbar-textbox-button-verifiedDomain.png deleted file mode 100755 index fddb8a5f4e06eefcbd67afabcac0175b5bf52257..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Ec!3HFkTfSKYq!^2X+?^QKos)S9l{gq%#jgVj`FpxJhHzX@ zJ!i<*V8Fxdp#1g!`q$c8Y}1rX{TdVvnRAvO>D=?xFrOi#)`!8Ndxy|FCzqx#O;?X- v=%`H#O|w52B{{Y7eEkFQcV8_-oR7-wxMIEJjN=z$pwSGTu6{1-oD!MlUJk_!%=5)Q4tDo_-W;-9l+lnv-ht20$a+`LrT@gwW x`k}G-Ny**nX}hBDZr0$Q)3uZRg-pjM=Jj8!=Se%7`~jNH;OXk;vd$@?2>?_6M0)@L diff --git a/browser/themes/pinstripe/browser/navbar-textbox-button.png b/browser/themes/pinstripe/browser/navbar-textbox-button.png deleted file mode 100755 index 9d509365f958e1813d6aaa93cc1abae0cb7a3445..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^%s?!{!3HEfez(s7QjEnx?oJHr&dIz4a@dl*-CY>| zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfO=flxEg9$Qc29vqk|nMYCC>S| zxv6<249-QVi6yBi3gww484B*6z5(HleBwYwCY~;iArhC96ArLSOw4p+V`DR$!NbkW z%&Z;q!JgYp(xSb$vGJijP(Znjr_CrRb;WWXhPA;=3wWH?IRo`Gc)I$ztaD0e0su5) BI6D9U