From 4e287d002cd0b5887e3b5931416228008329a594 Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Mon, 25 Sep 2006 05:57:54 +0000 Subject: [PATCH] Backing out the fix for 353757 since it didn't help Ts. a=mconnor. --- toolkit/themes/winstripe/global/browser.css | 95 +++++++++--------- .../winstripe/global/globalBindings.xml | 8 +- .../themes/winstripe/global/icons/tabs.png | Bin 3282 -> 0 bytes toolkit/themes/winstripe/global/jar.mn | 10 +- 4 files changed, 56 insertions(+), 57 deletions(-) delete mode 100644 toolkit/themes/winstripe/global/icons/tabs.png diff --git a/toolkit/themes/winstripe/global/browser.css b/toolkit/themes/winstripe/global/browser.css index a4610bde7acd..14664a3a2aa0 100644 --- a/toolkit/themes/winstripe/global/browser.css +++ b/toolkit/themes/winstripe/global/browser.css @@ -52,14 +52,14 @@ .tabbrowser-tab > .tab-image-left { width: 8px; height: 24px; - list-style-image: url("chrome://global/skin/icons/tabs.png"); - -moz-image-region: rect(75px,8px,99px,0); + background: url("chrome://global/skin/icons/tab-left.png") no-repeat; background-color: -moz-dialog; -moz-border-radius-topleft: 3px; } .tabbrowser-tab[chromedir="rtl"] > .tab-image-left { - -moz-image-region: rect(75px,16px,99px,8px); + background: url("chrome://global/skin/icons/tab-right.png") no-repeat; + background-color: -moz-dialog; -moz-border-radius-topleft: 0px; -moz-border-radius-topright: 3px; } @@ -67,19 +67,23 @@ .tabbrowser-tab:not([selected="true"]) > .tab-image-left { height: 23px; margin-bottom: 1px; - -moz-image-region: rect(0,8px,23px,0); + background: url("chrome://global/skin/icons/tab-left-bkgnd.png") no-repeat; + background-color: -moz-dialog; } -.tabbrowser-tab[chromedir="rtl"]:not([selected="true"])> .tab-image-left { - -moz-image-region: rect(0,16px,23px,8px); +.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]) > .tab-image-left { + background: url("chrome://global/skin/icons/tab-right-bkgnd.png") no-repeat; + background-color: -moz-dialog; } -.tabbrowser-tab:not([selected="true"]):hover > .tab-image-left { - -moz-image-region: rect(75px,8px,98px,0); +.tabbrowser-tab:hover:not([selected="true"]) > .tab-image-left { + background: url("chrome://global/skin/icons/tab-left-hover.png") no-repeat; + background-color: -moz-dialog; } -.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]):hover > .tab-image-left { - -moz-image-region: rect(75px,16px,98px,8px); +.tabbrowser-tab[chromedir="rtl"]:hover:not([selected="true"]) > .tab-image-left { + background: url("chrome://global/skin/icons/tab-right-hover.png") no-repeat; + background-color: -moz-dialog; } .tabbrowser-tab > .tab-image-middle { @@ -91,24 +95,26 @@ .tabbrowser-tab:not([selected="true"]) > .tab-image-middle { height: 23px; margin-bottom: 1px; + background: url("chrome://global/skin/icons/tab-middle-bkgnd.png") repeat-x; + background-color: -moz-dialog; } -.tabbrowser-tab:not([selected="true"]):not(:hover) > .tab-image-middle { - background: url("chrome://global/skin/icons/tab-middle-bkgnd.png") repeat-x; +.tabbrowser-tab:hover:not([selected="true"]) > .tab-image-middle { + background: url("chrome://global/skin/icons/tab-middle-hover.png") repeat-x; background-color: -moz-dialog; } .tabbrowser-tab > .tab-image-right { width: 8px; height: 24px; - list-style-image: url("chrome://global/skin/icons/tabs.png"); - -moz-image-region: rect(75px,16px,99px,8px); + background: url("chrome://global/skin/icons/tab-right.png") no-repeat; background-color: -moz-dialog; -moz-border-radius-topright: 3px; } .tabbrowser-tab[chromedir="rtl"] > .tab-image-right { - -moz-image-region: rect(75px,8px,99px,0); + background: url("chrome://global/skin/icons/tab-left.png") no-repeat; + background-color: -moz-dialog; -moz-border-radius-topleft: 3px; -moz-border-radius-topright: 0px; } @@ -116,19 +122,23 @@ .tabbrowser-tab:not([selected="true"]) > .tab-image-right { height: 23px; margin-bottom: 1px; - -moz-image-region: rect(0,16px,23px,8px); + background: url("chrome://global/skin/icons/tab-right-bkgnd.png") no-repeat; + background-color: -moz-dialog; } .tabbrowser-tab[chromedir="rtl"]:not([selected="true"]) > .tab-image-right { - -moz-image-region: rect(0,8px,23px,0); + background: url("chrome://global/skin/icons/tab-left-bkgnd.png") no-repeat; + background-color: -moz-dialog; } -.tabbrowser-tab:not([selected="true"]):hover > .tab-image-right { - -moz-image-region: rect(75px,16px,98px,8px); +.tabbrowser-tab:hover:not([selected="true"]) > .tab-image-right { + background: url("chrome://global/skin/icons/tab-right-hover.png") no-repeat; + background-color: -moz-dialog; } -.tabbrowser-tab[chromedir="rtl"]:not([selected="true"]):hover > .tab-image-right { - -moz-image-region: rect(75px,8px,98px,0); +.tabbrowser-tab[chromedir="rtl"]:hover:not([selected="true"]) > .tab-image-right { + background: url("chrome://global/skin/icons/tab-left-hover.png") no-repeat; + background-color: -moz-dialog; } .tab-icon-image { @@ -268,8 +278,8 @@ tabpanels { height: 23px; -moz-margin-start: 0px; -moz-margin-end: 0px; - list-style-image: url("chrome://global/skin/icons/tabs.png"); - -moz-image-region: rect(0,27px,11px,16px); + list-style-image: url("chrome://global/skin/icons/tab-arrow-start.png"); + -moz-image-region: rect(0, 11px, 14px, 0); background-repeat: no-repeat; background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-enabled.png"); background-color: -moz-dialog; @@ -277,42 +287,36 @@ tabpanels { } .tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up { - -moz-image-region: rect(11px,27px,22px,16px); + list-style-image: url("chrome://global/skin/icons/tab-arrow-end.png"); background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-enabled.png"); -moz-border-radius-topleft: 5px; -moz-border-radius-topright: 0px; } .tabbrowser-arrowscrollbox > .scrollbutton-up[disabled="true"] { - -moz-image-region: rect(0,49px,11px,38px); + -moz-image-region: rect(0, 33px, 14px, 22px); background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-disabled.png"); } .tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up[disabled="true"] { - -moz-image-region: rect(11px,49px,22px,38px); background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-disabled.png"); } .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover { - -moz-image-region: rect(0,38px,11px,27px); background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-hover.png"); + -moz-image-region: rect(0, 22px, 14px, 11px); } .tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up:not([disabled="true"]):hover { - -moz-image-region: rect(11px,38px,22px,27px); background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-hover.png"); } .tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled="true"]):hover:active { - -moz-image-region: rect(0,60px,11px,49px); -} - -.tabbrowser-arrowscrollbox[chromedir="rtl"] > .scrollbutton-up:not([disabled="true"]):hover:active { - -moz-image-region: rect(11px,60px,22px,49px); + -moz-image-region: rect(0, 44px, 14px, 33px); } .tabbrowser-arrowscrollbox > .scrollbutton-up > .toolbarbutton-icon { - margin: 2px 0px 0px 0px; + margin: 6px 0px 0px 0px; } .tabbrowser-arrowscrollbox > .scrollbutton-down-stack { @@ -359,46 +363,37 @@ tabpanels { -moz-appearance: none !important; border: none !important; width: 18px; - list-style-image: url("chrome://global/skin/icons/tabs.png"); - -moz-image-region: rect(11px,27px,22px,16px); + list-style-image: url("chrome://global/skin/icons/tab-arrow-end.png"); + -moz-image-region: rect(0, 11px, 14px, 0); margin: 0px; padding: 0px; } .tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down { - -moz-image-region: rect(0,27px,11px,16px); + list-style-image: url("chrome://global/skin/icons/tab-arrow-start.png"); } .scrollbutton-rel-box > .scrollbutton-down[disabled="true"] { - -moz-image-region: rect(11px,49px,22px,38px); -} - -.tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down[disabled="true"] { - -moz-image-region: rect(0,49px,11px,38px); + -moz-image-region: rect(0, 33px, 14px, 22px); } .scrollbutton-rel-box > .scrollbutton-down:not([disabled="true"]):hover { - -moz-image-region: rect(11px,38px,22px,27px); + -moz-image-region: rect(0, 22px, 14px, 11px); background-image: url("chrome://global/skin/icons/tab-arrow-end-bkgnd-hover.png"); background-repeat: no-repeat; background-position: top left; } .tabbrowser-arrowscrollbox[chromedir="rtl"] > stack > .scrollbutton-rel-box > .scrollbutton-down:not([disabled="true"]):hover { - -moz-image-region: rect(0,38px,11px,27px); background-image: url("chrome://global/skin/icons/tab-arrow-start-bkgnd-hover.png"); } .scrollbutton-rel-box > .scrollbutton-down:not([disabled="true"]):hover:active { - -moz-image-region: rect(11px,60px,22px,49px); -} - -.scrollbutton-rel-box[chromedir="rtl"] > .scrollbutton-down:not([disabled="true"]):hover:active { - -moz-image-region: rect(0,60px,11px,49px); + -moz-image-region: rect(0, 44px, 14px, 33px); } .scrollbutton-rel-box > .scrollbutton-down > .toolbarbutton-icon { - margin: 2px 0px 0px 1px; + margin: 6px 0px 0px 1px; } /** diff --git a/toolkit/themes/winstripe/global/globalBindings.xml b/toolkit/themes/winstripe/global/globalBindings.xml index 36c025bdae1a..036332058c72 100644 --- a/toolkit/themes/winstripe/global/globalBindings.xml +++ b/toolkit/themes/winstripe/global/globalBindings.xml @@ -58,9 +58,7 @@ - - - + @@ -69,9 +67,7 @@ - - - + diff --git a/toolkit/themes/winstripe/global/icons/tabs.png b/toolkit/themes/winstripe/global/icons/tabs.png deleted file mode 100644 index dbee61c3e0a10629ffdcbc67d23b9a668f65c0b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3282 zcmeHJ`BzeT8%I${Mby*;S~NwoNyp1l)*FebnWU!mR%*vnK!RF&(y=kOL{Z$ba_Kd| z8Ow5-Q!~e)X>4;6QA5+BOs%wiGqpi;DO}*b_X5t$KhO{FIq&xzE?*v=_491EIDG47 zOLKxb0)en(1O;q|zG={>Y5@v*@-s(f5D1Kj5wLMb+7IlQ9R9V(kr5~q$_MpY_VcEr z4x?Nqlc@$ldiib?8WKQ&Ae#k|fz34G#l_s!S0&+18B@cnuvqNYEJF62`qMLc_x2yl%Rjl< z+Wxi*iEL3dHZF;AmE33Nn}vv}roTibCzC)t4u@Ohxm#Ye(`aFPXXht@_;*p+ZaV!m zh=ES^n#5+nL2rr8<-Vp+yd#>D-`o!7a^HhZJWyL;MWIkY9f^{X@;#U9HtFGeXr>^& z3Wu2RAR*pIMH?JtvH2$Q({$b~n*;6`*`%M*jZN)Yc7hKzo8F&Otho_eKK(&@OcfR5 z zglYT5^A@>mHUuhDt(o=iAYmR_n3iJFDoEtWD{*Enw_-{$ZlU7K_`T#n6ci?_wW_q- zU>J%NP7qT)HS$Pj1&IvtBGm+-k@gP_x^rDSM_)8mM#nWzp53`VuirrDXR5zI^y1al zsIu{~GFTs!B#8P(aRN6~X^ksc1{VmN?wEY_gl6`ON8SE{p`}|4YFYf--5_+zFN(}I zV+P;7n~R0~5K`mKn~A=o?_Kq>Y?dJ4qmGRar;nNOX>HQ|)jb)kYs^j! zj*ow*J*S|4t88m)n_JOyC18>6QP@T`XkzDkFVj{O;mampo93-NZvbH9FruucP*k+) zr{a!Iz<1;ZUeC_r<_`K-R8lMU*o7@uxUW$(rstamt(@<* zwoal?DUytYd!m^@n+Hbkp5M1z#&H%6OE|PlV1S36yYr{g(o$k(+JZG#aC$a2i^bx= zIbcF1wT|(dM1s9OAO5sv)&U70M@PqwWq+f`A7uIX+^QYSAkUk+5>#JU=&b)mNH#$4 z_j&BTn6lhfPd>}oKojc2CM1(!Cqa;qoDRDIUl;`4g`c^WOs=RSYNkdahHn;N^|H?O zXnLvs`j__qUv#(`u>N{z_$4HaPu-pVGI|Rr1aMi z27}e@4FFE#apFoEjrO0;DzAe-|8n30%m;U(85Vnw5gN)NUzGsR&{a3Lx3?b;L#|jc z7-kV1oDvv#yOPe++=;rG`e#{5yk4kP*=&hejzI!~FbC$M8(_F=K)E~R=}2QPI_El> z;(X_`YdZ14XO(JLb@>n1^0(3>E@yXfjfFh)tqh&jo&l+i48R~sCG1n0*w6`w^W)af zk?k4%yJQw!s=kJbtQ9O*8z#dzaQlGI$n~ucK)ti981{@(mb3OKTFe6}%=)s}8EB2T z?C{hzM965kvEIR+Ua2L*$+|_>$_Bq5dQL4`I%Xb`W)xp7dJ@qyV7u#FMcw{hL@rpL zYS7E#76c4|;0yej8ct3tfS~}sSeM-NDw{MQpk`Ll-qqEGc)0%LJSQ}x+r}c|x&`m{CXl*Jg1g~;@()$H?^@sy2G2`gqzA=` zc2}13_6f97nky&6yIKrk^gv;d79f3X@lx>DlacCbrS*kN^cr5jDm6e@$M_fJNaA4< zrOJdMId)N=o-|}-7_NLf+QH|I(@JOvofe7ks`wZyaC%}8gccA^tJQQu0nkx4HZ~~X z^I8+Vt*#$xEfD~w<>VodPIFy(p#&ZK8eMv1|DGic2P+Uob!AWM68#q{st;|*re&Xn zMg}~^Ir{|myPNQMe0gx(Nm^GgcI2b(~xW*?Kyo)5&#$ z7gyV6G8$?r)#&!@JZN0LH!a(Lh^O8X?|v7;Stg^IOaRcouq|#uL@=+GL3qC{nn8Ge z{_nxp(+4LTV?uf+1?4M!?9Kql8ac)DOwO)z4dSWcA~fTz+pHo!QLiVr?G+6C+~yn} z=5Zy}mfGP@(fY0x8Kx$i6+pG(kpW2?%bKF7Kx_mix&^jvDo9h=;&xLvR2RyRT&(xy9FWQ*BMCw2;TOG4~VJ&dGw z2r4n*11>`&V@MtAgJv_R&yX9fyLmTrS3B^0KFSsrTxSlfXSmu6598b=2}w|3n+d}L&#Rw|WhW@o>6J#B&f<;=mw35841s6XWm%^vQyTI}ed2dD=&0YE+Q z%{5T6(NQecKCN|Ga`k1=wP&7;H!A<{nu%dt^Bg0|#hFyKt}J_$we|?71*X2#`|%&? z%dE^z`7?>Cmx)PU3EZQi2hY&5ZM~k(PRzNv+_ zW<%y@SSC*@CArY)^cJY`nCF)J_Zb?Skg;^P`TW}b>dWHmt)c%#%}B(~eQIUQ{or1> Oz!;mh2Gsj8`TqqG4_>7J diff --git a/toolkit/themes/winstripe/global/jar.mn b/toolkit/themes/winstripe/global/jar.mn index 15858f97b73a..6f3ab98105d9 100644 --- a/toolkit/themes/winstripe/global/jar.mn +++ b/toolkit/themes/winstripe/global/jar.mn @@ -90,7 +90,8 @@ classic.jar: skin/classic/global/icons/Landscape.png (icons/Landscape.png) skin/classic/global/icons/Question.png (icons/Question.png) skin/classic/global/icons/Restore.gif (icons/Restore.gif) - skin/classic/global/icons/tabs.png (icons/tabs.png) + skin/classic/global/icons/tab-arrow-end.png (icons/tab-arrow-end.png) + skin/classic/global/icons/tab-arrow-start.png (icons/tab-arrow-start.png) skin/classic/global/icons/tab-arrow-end-bkgnd-hover.png (icons/tab-arrow-end-bkgnd-hover.png) skin/classic/global/icons/tab-arrow-end-bkgnd-disabled.png (icons/tab-arrow-end-bkgnd-disabled.png) skin/classic/global/icons/tab-arrow-end-bkgnd-enabled.png (icons/tab-arrow-end-bkgnd-enabled.png) @@ -99,8 +100,15 @@ classic.jar: skin/classic/global/icons/tab-arrow-start-bkgnd-disabled.png (icons/tab-arrow-start-bkgnd-disabled.png) skin/classic/global/icons/tab-arrow-start-bkgnd-enabled.png (icons/tab-arrow-start-bkgnd-enabled.png) skin/classic/global/icons/tab-arrow-start-bkgnd-animate.png (icons/tab-arrow-start-bkgnd-animate.png) + skin/classic/global/icons/tab-left.png (icons/tab-left.png) skin/classic/global/icons/tab-middle.png (icons/tab-middle.png) + skin/classic/global/icons/tab-right.png (icons/tab-right.png) + skin/classic/global/icons/tab-left-hover.png (icons/tab-left-hover.png) + skin/classic/global/icons/tab-middle-hover.png (icons/tab-middle-hover.png) + skin/classic/global/icons/tab-right-hover.png (icons/tab-right-hover.png) + skin/classic/global/icons/tab-left-bkgnd.png (icons/tab-left-bkgnd.png) skin/classic/global/icons/tab-middle-bkgnd.png (icons/tab-middle-bkgnd.png) + skin/classic/global/icons/tab-right-bkgnd.png (icons/tab-right-bkgnd.png) skin/classic/global/icons/tabstrip-bottom.png (icons/tabstrip-bottom.png) skin/classic/global/icons/tabbrowser-tabs-bkgnd.png (icons/tabbrowser-tabs-bkgnd.png) skin/classic/global/icons/Warning.png (icons/Warning.png)