From 7aa3ede8569c4ca23fa5d5604524030e86ad65d4 Mon Sep 17 00:00:00 2001 From: "hewitt%netscape.com" Date: Fri, 19 Jan 2001 04:41:50 +0000 Subject: [PATCH] 64425 - edit mode tabs, r=andreww, sr=ben --- themes/modern/global/globalBindings.xml | 15 +-- themes/modern/global/tab-bot-clicked-left.gif | Bin 232 -> 222 bytes .../modern/global/tab-bot-clicked-middle.gif | Bin 277 -> 253 bytes .../modern/global/tab-bot-clicked-right.gif | Bin 231 -> 221 bytes themes/modern/global/tab-bot-select-left.gif | Bin 630 -> 612 bytes .../modern/global/tab-bot-select-middle.gif | Bin 285 -> 261 bytes themes/modern/global/tab-bot-select-right.gif | Bin 604 -> 586 bytes .../modern/global/tab-bot-unselect-left.gif | Bin 227 -> 217 bytes .../modern/global/tab-bot-unselect-middle.gif | Bin 285 -> 261 bytes .../modern/global/tab-bot-unselect-right.gif | Bin 234 -> 224 bytes themes/modern/global/tabcontrol.css | 115 +++++++++++------- 11 files changed, 82 insertions(+), 48 deletions(-) diff --git a/themes/modern/global/globalBindings.xml b/themes/modern/global/globalBindings.xml index 24e2e43706dc..f58fecf2976e 100644 --- a/themes/modern/global/globalBindings.xml +++ b/themes/modern/global/globalBindings.xml @@ -6,13 +6,13 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> - + - - - + + + @@ -260,12 +260,13 @@ - - + + + - + diff --git a/themes/modern/global/tab-bot-clicked-left.gif b/themes/modern/global/tab-bot-clicked-left.gif index eee66c1379fbfdbc15f7d3d47b307d87b06ece81..7b83efc4693cf2b01237ee9da7a9d3bd2ac75f19 100644 GIT binary patch delta 119 zcmV--0EqwS0p0-&M@dFFIbjO`69B{jkqmHR6951OTObCEWN86Gs;UpY Z+v^&EVbAAl@(zK5fq!`dhlm0p06WN9FD?K8 delta 129 zcmV-{0Dk}80q6k?M@dFFIbjO`6#&E#0N?<_iz7`P7G=0gz zpzlK_^Sp{IK`as}vW9Z06v!UXDAXB{Sg%%UWXs)BA>c5WswkVwREB!3rcU1QH+4a; j)2WEOKJPRf{(yfP0tSVKh8lwoi;Rnjg94F~0wDl9v^q5a diff --git a/themes/modern/global/tab-bot-clicked-middle.gif b/themes/modern/global/tab-bot-clicked-middle.gif index b3940f5de369808c19eaac3943216cbaedb869c2..bb508f7241b4286700ba3d08c5f92f302fd495b5 100644 GIT binary patch delta 163 zcmV;U09^l-0{sCAM@dFFIbk3G6OjpIe=Gn1001BW6951Of}kLdWNDrxq^@l1zAPZm zbZy^spznO||2&*D~ Rrl+I>s;jK6uCJ^i06QJxOz;2z delta 187 zcmV;s07U=&0hIy?M@dFFIbk3G6_E*Ker0;z1|2%+jNGuwU#DH?iY&xGzq;y(@TCYuqcFXO0zubs;OfH+x zWQlssZoA)Xg?vu0+wXLQe$Vgw|9lUEgM@{KhlB-+i;RtqkBkPAla!T~my`{fDVv;~ po}ZitqNAjxrl+I{s;jK6uCJ^Fva__cwzsqcy1Tr+zQ4R706TL0SZDwM diff --git a/themes/modern/global/tab-bot-clicked-right.gif b/themes/modern/global/tab-bot-clicked-right.gif index 90b3184df1f47d68d42adf062f77516154995a1a..e82650b006955984d497a550a477512d8c560b99 100644 GIT binary patch delta 118 zcmV-+0Ez$S0o?%%M@dFFIbjO`69B{jkqmHQ6951OS|B8jqjfoGnwmiCy6pQ>LS)}J zee67s35}poNP8HM$BbsdY&J0ggmgNk1QOV6*2?I5z1D(wJgx)?=ycj_XuI8Jg?v6Y YOYZo)c{Azz`vDsp0fdEwf*Tblu>b%7 delta 128 zcmV-`0Du480p|e>M@dFFIbjO`6#&E=kqmHa6#xJQWZ)o<=kzf}086#C-5!Kn)=ig6fP3pr}y*fdBwI4>d(# diff --git a/themes/modern/global/tab-bot-select-middle.gif b/themes/modern/global/tab-bot-select-middle.gif index 599be4ef6026cd609a62346c3a81e337d423e65b..94d1d4efa2ca295778b2f01aa9ae48d5d80f6dd9 100644 GIT binary patch delta 171 zcmV;c095~-0)+wzM@dFFIbk3G6OjpIe=Gn1001BW6951OiXb44WNDtHpssA|zAPor zbZy_Xqwjq0|2&3pNGuwUM1yk4Y&xIJhIC4;TCY@ycFXO0zubs;OfH+xi;RtqkBkM9la!T~my`jTo1C4VpPUb(8Kb17 Zrl+J6s;jK6uCJ^Eva__cwzsq)06Vo_QeFT6 delta 195 zcmV;!06hPN0-XX0M@dFFIbk3G6_E*Ked1V06PM;UBmzY diff --git a/themes/modern/global/tab-bot-select-right.gif b/themes/modern/global/tab-bot-select-right.gif index d6b73b02c2c773aeea3eac2dc787736050215793..0370e1514d57fce4e38d88b2ddf3f99d8c0df533 100644 GIT binary patch delta 197 zcmV;$06PEN1j+;qM@dFFIbjO`69DD_u?&y_e-i)z2d97|RRINs9w0AA0)+(!j#OYQ zKLQAqmIfU$Mgj(%o>@IkDgqFtrbQ?kX95wet|2E^LIM)Cwi_!hHv$U1z9}$JL|Y8S z#sp#|WdH=t&RhdzBmfQ7)=C&UGXM+S-d15zG5`tX=1W~bUH}8_?ie&p%uoPOVS>R4S}rhY0RRn;3RrL?X_8|g8Z-c&WH4dDLWYJH0|5X#ouN8^ delta 215 zcmV;|04V>;1l$A+M@dFFIbjO`6#(XFu?&y_e-!`#2f2V>907!c1%)kqmHW6#xJQU|=AQWMCa=s%lB=z7`|TG$!15 zz72fuXOEz8cqtfq3?X}|2%|nNGuwUM1yk4Y&xIJfpki(TCY@!cFXO0zuba&OfH+xWQBUoZoA*? zfP7A`+wXLSe$Vgw|9l66gM@{KhlB!(i;RtqkBknIla!T~my`>do1C4VpPUe)8Kb17 Zrl+J4s;jK6uCJ^Tva__cwzsq)06VmrQYioc delta 195 zcmV;!06hPN0-XX0M@dFFIbk3G6_E*Ked1V06T_SUWfny diff --git a/themes/modern/global/tab-bot-unselect-right.gif b/themes/modern/global/tab-bot-unselect-right.gif index ffa078c1d73b2ed6d58658be70c1fff04d31f9fb..7f9f40b7a33d4d7207e29dea5acc3c999de1f9bc 100644 GIT binary patch delta 121 zcmV-<0EYkS0pI})M@dFFIbjO`69B{jkqmHT6951OU7#b5qm?CSnwm=Mx+WygvlT3O zo>xKP|36KjK`a(|hNM!-*&Lows0J{oTCEiTVaw%aCE##4`zV{u7XV|;W~U?Ycsz}$ b+wB;@WY6E{I~0L}6n`B6hlqzAiy;6z{EIO| delta 131 zcmV-}0DS-80qOw^M@dFFIbjO`6#&E?kqmHd6#xJQXP_XCq!65F8aQm*T3I5`GpyV= z4nut3TY-geIIIK;$YfFzXgHrwqhU&=ayEyoR;vLFzF=?#Kq#BdV~Kjb9zWi2_yxeI l+wJp+e!rh1{(yiO0276Vg@YXwi;NVB9RQJ%ksXyG06SUvGWGxf diff --git a/themes/modern/global/tabcontrol.css b/themes/modern/global/tabcontrol.css index 84af4774e23d..f60662d486fe 100644 --- a/themes/modern/global/tabcontrol.css +++ b/themes/modern/global/tabcontrol.css @@ -25,13 +25,12 @@ tab { border-bottom: 1px solid #D7E2E3; } -.tab-image-middle { - min-height: 19px; +.tab-image-mid { background : url(chrome://global/skin/tab-unselect-middle.gif) repeat-x top; background-color: #9BA8AA; } -.tab-image-middle-btm { +.tab-image-mid-btm { border-top: 1px solid #333D4B; border-bottom: 1px solid #D7E2E3; } @@ -68,7 +67,7 @@ tab:hover:active > box > box > .tab-image-left-mid { background-image: url(chrome://global/skin/tab-clicked-left-mid.gif); } -tab:hover:active > box > .tab-image-middle { +tab:hover:active > box > .tab-image-mid { background-image: url(chrome://global/skin/tab-clicked-middle.gif); background-color: #7A878C; } @@ -105,14 +104,14 @@ tab:hover:active[selected="true"] > box > box > .tab-image-left-btm { height: 2px; } -.tab-image-middle[selected="true"], -tab:hover:active[selected="true"] > box > .tab-image-middle { +.tab-image-mid[selected="true"], +tab:hover:active[selected="true"] > box > .tab-image-mid { background-image: url(chrome://global/skin/tab-select-middle.gif); background-color: #C3D1D1; } -.tab-image-middle-btm[selected="true"], -tab:hover:active[selected="true"] > box > box > .tab-image-middle-btm { +.tab-image-mid-btm[selected="true"], +tab:hover:active[selected="true"] > box > box > .tab-image-mid-btm { border-top: 1px solid #919FA3; border-bottom: 1px solid #F4F7F9; } @@ -167,74 +166,108 @@ tabcontrol[align="vertical"] > tabbox[align="horizontal"] > tab { /* Found in editor.xul & editorOverlay.xul * SMALL TABS FOR NOW */ -.tab-bottom:hover:active > box > .tab-image-middle > .tab-text { - color : #FEFEFE; +.tab-bottom { + min-height: 21px; +} + +.tab-bottom > .tab-top > .tab-image-left > .tab-image-left-top { + border-top: 1px solid #919FA3; + border-bottom: 1px solid #333D4B; + height: 0px; + background: none; } -.tab-bottom > box > .tab-image-left { - background : url(chrome://global/skin/tab-bot-unselect-left.gif) no-repeat; +.tab-bottom > .tab-top > .tab-image-left > .tab-image-left-middle { + border-left: 1px solid #333D4B; + background-color: #9BA8AA; +} + +.tab-bottom > .tab-top > .tab-image-left > .tab-image-left-btm { + border: none; + background : url(chrome://global/skin/tab-bot-unselect-left.gif) no-repeat; width : 11px; height : 19px; } -.tab-bottom > box > .tab-image-middle { - background : url(chrome://global/skin/tab-bot-unselect-middle.gif) repeat-x; +.tab-bottom > .tab-top > .tab-image-mid > .tab-image-mid-top { + border-top: 1px solid #919FA3; + border-bottom: 1px solid #333D4B; } -.tab-bottom > box > .tab-image-right { +.tab-bottom > .tab-top > .tab-image-mid > .tab-image-mid-mid { + background: url(chrome://global/skin/tab-bot-unselect-middle.gif) repeat-x bottom; + background-color: #9BA8AA; +} + +.tab-bottom > .tab-top > .tab-image-mid > .tab-image-mid-btm { + border: none; +} + +.tab-bottom > .tab-top > .tab-image-right > .tab-image-right-top { + border-top: 1px solid #919FA3; + border-bottom: 1px solid #333D4B; + height: 0px; + background: none; +} + +.tab-bottom > .tab-top > .tab-image-right > .tab-image-right-mid { + background: url(chrome://global/skin/tab-unselect-right-mid.gif) repeat-y; +} + +.tab-bottom > .tab-top > .tab-image-right > .tab-image-right-btm { + border: none; background : url(chrome://global/skin/tab-bot-unselect-right.gif) no-repeat; width : 11px; height : 19px; } -.tab-bottom > box > .tab-image-middle > .tab-text { - padding : 4px 0px 1px 0px; +/* active state */ + +.tab-bottom:hover:active > .tab-top > .tab-image-left > .tab-image-left-btm { + background-image: url(chrome://global/skin/tab-bot-clicked-left.gif); } -.tab-bottom:hover:active > box > .tab-image-left { - background : url(chrome://global/skin/tab-bot-clicked-left.gif) no-repeat; +.tab-bottom:hover:active > .tab-top > .tab-image-mid > .tab-image-mid-mid { + background-image: url(chrome://global/skin/tab-bot-clicked-middle.gif); } -.tab-bottom:hover:active > box > .tab-image-middle { - background : url(chrome://global/skin/tab-bot-clicked-middle.gif) repeat-x; +.tab-bottom:hover:active > .tab-top > .tab-image-right > .tab-image-right-btm { + background-image: url(chrome://global/skin/tab-bot-clicked-right.gif); } -.tab-bottom:hover:active > box > .tab-image-right { - background : url(chrome://global/skin/tab-bot-clicked-right.gif) no-repeat; +/* selected state */ + +.tab-bottom[selected="true"] > .tab-top > .tab-image-left > .tab-image-left-btm, +.tab-bottom:hover:active[selected="true"] > .tab-top > .tab-image-left > .tab-image-left-btm { + background-image: url(chrome://global/skin/tab-bot-select-left.gif); } -/* when a tab is selected this is how it should look */ - -.tab-bottom[selected="true"] > box > .tab-image-left, -.tab-bottom:hover:active[selected="true"] > box > .tab-image-left { - background : url(chrome://global/skin/tab-bot-select-left.gif) no-repeat; +.tab-bottom[selected="true"] > .tab-top > .tab-image-mid > .tab-image-mid-mid , +.tab-bottom:hover:active[selected="true"] > .tab-top > .tab-image-mid > .tab-image-mid-mid { + background-image: url(chrome://global/skin/tab-bot-select-middle.gif); } -.tab-bottom[selected="true"] > box > .tab-image-middle, -.tab-bottom:hover:active[selected="true"] > box > .tab-image-middle { - background : url(chrome://global/skin/tab-bot-select-middle.gif) repeat-x; +.tab-bottom[selected="true"] > .tab-top > .tab-image-right > .tab-image-right-btm, +.tab-bottom:hover:active[selected="true"] > .tab-top > .tab-image-right > .tab-image-right-btm { + background-image: url(chrome://global/skin/tab-bot-select-right.gif); } -.tab-bottom[selected="true"] > box > .tab-image-right, -.tab-bottom:hover:active[selected="true"] > box > .tab-image-right { - background : url(chrome://global/skin/tab-bot-select-right.gif) no-repeat; -} +/* tabbox-bottom - the whole tabbox */ -.tabbox-bottom > .tab-border-top-left, .tabbox-bottom > .tab-border-top-right { - background : url(chrome://global/skin/tab-bot-border.gif) repeat-x top; +.tabbox-bottom > .tab-border-top-left, +.tabbox-bottom > .tab-border-top-right { + background : url(chrome://global/skin/tab-bot-border.gif) repeat-x top; width : 2px; } .tabbox-bottom > .tab-border-top-left-cap { - background : url(chrome://global/skin/tab-bot-border-leftcap.gif) no-repeat top; + background : url(chrome://global/skin/tab-bot-border-leftcap.gif) no-repeat top; width : 2px; - height : 2px; } .tabbox-bottom > .tab-border-top-right-cap { - background : url(chrome://global/skin/tab-bot-border-rightcap.gif) no-repeat top; + background : url(chrome://global/skin/tab-bot-border-rightcap.gif) no-repeat top; width : 2px; - height : 2px; } /* bottom tabs */