From 63e1fb2bc210a67c02c6a7a975f623e6f653c4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Mon, 15 Aug 2011 17:43:36 +0200 Subject: [PATCH] Bug 580194 - use inverted tabbrowser icons on glass and dark personas. r=shorlander --- browser/themes/winstripe/browser/browser.css | 57 +++++++++++------- browser/themes/winstripe/browser/jar.mn | 8 +++ .../winstripe/browser/tabbrowser/newtab.png | Bin 603 -> 445 bytes .../browser/tabbrowser/tab-arrow-left.png | Bin 460 -> 368 bytes 4 files changed, 44 insertions(+), 21 deletions(-) diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css index 71137ae46771..9572614034e4 100644 --- a/browser/themes/winstripe/browser/browser.css +++ b/browser/themes/winstripe/browser/browser.css @@ -968,6 +968,14 @@ toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { list-style-image: url(chrome://browser/skin/tabview/tabview.png); } +%ifdef WINSTRIPE_AERO +#TabsToolbar > #tabview-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +#TabsToolbar > toolbarpaletteitem > #tabview-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +%endif +#tabview-button:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/tabview/tabview-inverted.png); +} + #tabview-button { -moz-image-region: rect(0, 90px, 18px, 72px); } @@ -1887,23 +1895,26 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tabbrowser-arrowscrollbox > .scrollbutton-up, .tabbrowser-arrowscrollbox > .scrollbutton-down { list-style-image: url("chrome://browser/skin/tabbrowser/tab-arrow-left.png"); - -moz-image-region: rect(0, 15px, 17px, 0); margin: 0; padding-right: 2px; border-right: 2px solid transparent; background-origin: border-box; } +%ifdef WINSTRIPE_AERO +.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +%endif +.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext, +.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-arrow-left-inverted.png); +} + .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled], .tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] { opacity: .4; } -.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover:active, -.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover:active { - -moz-image-region: rect(0, 30px, 17px, 15px); -} - .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl), .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) { -moz-transform: scaleX(-1); @@ -1932,7 +1943,17 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- #TabsToolbar > #new-tab-button, #TabsToolbar > toolbarpaletteitem > #new-tab-button { list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png); - -moz-image-region: rect(0, 16px, 18px, 0); + -moz-image-region: auto; +} + +%ifdef WINSTRIPE_AERO +#TabsToolbar > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +%endif +.tabs-newtab-button:-moz-lwtheme-brighttext, +#TabsToolbar > #new-tab-button:-moz-lwtheme-brighttext, +#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/tabbrowser/newtab-inverted.png); } .tabs-newtab-button { @@ -1943,25 +1964,24 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- width: 26px; } -.tabs-newtab-button:hover:active, -#TabsToolbar > #new-tab-button:hover:active { - -moz-image-region: rect(0, 32px, 18px, 16px); -} - #alltabs-button { list-style-image: url("chrome://browser/skin/tabbrowser/alltabs.png"); -moz-image-region: rect(0, 14px, 16px, 0); } -#alltabs-button:hover:active { - -moz-image-region: rect(0, 28px, 16px, 14px); -} - #alltabs-button[type="menu"] { list-style-image: url("chrome://browser/skin/mainwindow-dropdown-arrow.png"); -moz-image-region: rect(0, 13px, 11px, 0); } +%ifdef WINSTRIPE_AERO +#TabsToolbar > #alltabs-button[type="menu"]:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +#TabsToolbar > toolbarpaletteitem > #alltabs-button[type="menu"]:-moz-system-metric(windows-compositor):not(:-moz-lwtheme), +%endif +#alltabs-button[type="menu"]:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/mainwindow-dropdown-arrow-inverted.png); +} + #alltabs-button[type="menu"] > .toolbarbutton-icon { margin: 3px 0; } @@ -1970,11 +1990,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- display: none; } -#alltabs-button[type="menu"]:hover:active, -#alltabs-button[type="menu"][open="true"] { - -moz-image-region: rect(0, 26px, 11px, 13px); -} - /* All tabs menupopup */ .alltabs-item > .menu-iconic-left > .menu-iconic-icon { list-style-image: url("chrome://global/skin/icons/folder-item.png"); diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn index dafbebd20f61..39832dc22165 100644 --- a/browser/themes/winstripe/browser/jar.mn +++ b/browser/themes/winstripe/browser/jar.mn @@ -25,6 +25,7 @@ browser.jar: skin/classic/browser/KUI-background.png skin/classic/browser/KUI-close.png skin/classic/browser/mainwindow-dropdown-arrow.png + skin/classic/browser/mainwindow-dropdown-arrow-inverted.png skin/classic/browser/pageInfo.css skin/classic/browser/pageInfo.png (pageInfo.png) skin/classic/browser/page-livemarks.png (feeds/feedIcon16.png) @@ -89,10 +90,12 @@ browser.jar: skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) skin/classic/browser/tabbrowser/newtab.png (tabbrowser/newtab.png) + skin/classic/browser/tabbrowser/newtab-inverted.png (tabbrowser/newtab-inverted.png) skin/classic/browser/tabbrowser/connecting.png (tabbrowser/connecting.png) skin/classic/browser/tabbrowser/loading.png (tabbrowser/loading.png) skin/classic/browser/tabbrowser/tab.png (tabbrowser/tab.png) skin/classic/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png) + skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png) skin/classic/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) skin/classic/browser/tabview/close.png (tabview/close.png) @@ -101,6 +104,7 @@ browser.jar: skin/classic/browser/tabview/search.png (tabview/search.png) skin/classic/browser/tabview/stack-expander.png (tabview/stack-expander.png) skin/classic/browser/tabview/tabview.png (tabview/tabview.png) + skin/classic/browser/tabview/tabview-inverted.png (tabview/tabview-inverted.png) skin/classic/browser/tabview/tabview.css (tabview/tabview.css) #ifdef MOZ_SERVICES_SYNC skin/classic/browser/sync-throbber.png @@ -140,6 +144,7 @@ browser.jar: skin/classic/aero/browser/KUI-background.png skin/classic/aero/browser/KUI-close.png skin/classic/aero/browser/mainwindow-dropdown-arrow.png (mainwindow-dropdown-arrow-aero.png) + skin/classic/aero/browser/mainwindow-dropdown-arrow-inverted.png skin/classic/aero/browser/pageInfo.css skin/classic/aero/browser/pageInfo.png (pageInfo-aero.png) skin/classic/aero/browser/page-livemarks.png (feeds/feedIcon16-aero.png) @@ -205,10 +210,12 @@ browser.jar: skin/classic/aero/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css) skin/classic/aero/browser/tabbrowser/alltabs.png (tabbrowser/alltabs.png) skin/classic/aero/browser/tabbrowser/newtab.png (tabbrowser/newtab.png) + skin/classic/aero/browser/tabbrowser/newtab-inverted.png (tabbrowser/newtab-inverted.png) skin/classic/aero/browser/tabbrowser/connecting.png (tabbrowser/connecting.png) skin/classic/aero/browser/tabbrowser/loading.png (tabbrowser/loading.png) skin/classic/aero/browser/tabbrowser/tab.png (tabbrowser/tab.png) skin/classic/aero/browser/tabbrowser/tab-arrow-left.png (tabbrowser/tab-arrow-left.png) + skin/classic/aero/browser/tabbrowser/tab-arrow-left-inverted.png (tabbrowser/tab-arrow-left-inverted.png) skin/classic/aero/browser/tabbrowser/tab-overflow-border.png (tabbrowser/tab-overflow-border.png) skin/classic/aero/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) skin/classic/aero/browser/tabview/close.png (tabview/close.png) @@ -217,6 +224,7 @@ browser.jar: skin/classic/aero/browser/tabview/search.png (tabview/search.png) skin/classic/aero/browser/tabview/stack-expander.png (tabview/stack-expander.png) skin/classic/aero/browser/tabview/tabview.png (tabview/tabview.png) + skin/classic/aero/browser/tabview/tabview-inverted.png (tabview/tabview-inverted.png) skin/classic/aero/browser/tabview/tabview.css (tabview/tabview.css) #ifdef MOZ_SERVICES_SYNC skin/classic/aero/browser/sync-throbber.png diff --git a/browser/themes/winstripe/browser/tabbrowser/newtab.png b/browser/themes/winstripe/browser/tabbrowser/newtab.png index 404f3af1cafe487d668a64e062d9e4c79d1b2882..c25c98053b045908ecb130bac2bebab64dbef7bb 100644 GIT binary patch literal 445 zcmV;u0Yd(XP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iph) z1~44N^^DX200BKoL_t(I%gvI_O2bePMo-JNY0?IXU1(}46!Hi@f#9OjMVEr$w$J2N z5PSkRYWJ1+28DtYS{Egnq<;`o7v7fJm|%B0%b9P!nK=ynb>z~L{gEdC1JGq^4$K_e zijrE9VQc^mr5*tTz)uSE83sBa+O4MBZZ%zLq^Ak9Hpl}U*BieM6Dc?6feJvOpsCtQ zf8+tgDie`$^Ect#7Gn*lCYj{q28TfH{Or^%l}!LjrpZyQ4#0T$$}|W7n1%uO58V@B z=-AfV)_8o0000PbVXQnQ*UN; zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz{YgYYRCwBA{Qv(y!$1PYLE(VAFFv4) zvj8y{5OYHL-+}lW5dT3|q%0u-rps2JCrf`8KMR&P11S^+ z39_-VBdZmL(*Ll;DOUZQ{K5qFv*3s`ND5_SMCO8ABZVVQvFc~#VT%FEv z^YDTNxOsUQBxK~k?1Z?OGhaV{2D86@`OL6w_dXM-o=@m;&MPJj7T^_^VvsYo2D7i6 zJ$mNz%V%Kr=T}b|+#>Vg`cYiW$;HLMFDL|NvvF`Rz={Yiprcq=SRvu}?=Q}X=a-ac z5L43yvpM($7}$CEAz`nm&cH1s4oL{iELhV3C{F(D+q)+nSu!FzZYGFcv2+oN`1>zE z{y_CGAnWfd%|}r;{q$|H{sIRhBylH(m8T!V^}`$hN)Y#f2ERZ`MC_kFet=nc7D)XB z;`+AO|y$G`+$$8Ave}2e~^jtUD+363AH^ z;1l9H(NT0_02>qq*VW%ndjAuouq4PYn8D%MjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8 zVMc~ob0mO*>?NMQuI#rtSlA5A