From 9a1dfe297183d9aeac90f169d59e105c13414bf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Sat, 11 Oct 2008 15:55:39 +0200 Subject: [PATCH] Bug 458111 - Remove Mac-specific tabbrowser-tab binding. r=rflint --- browser/base/content/tabbrowser.xml | 13 -- browser/themes/pinstripe/browser/browser.css | 113 ++++++------------ browser/themes/pinstripe/browser/jar.mn | 7 +- .../browser/tabbrowser/tab-bkgnd.png | Bin 0 -> 149 bytes .../browser/tabbrowser/tab-left-bkgnd.png | Bin 306 -> 0 bytes .../pinstripe/browser/tabbrowser/tab-left.png | Bin 318 -> 0 bytes .../browser/tabbrowser/tab-middle-bkgnd.png | Bin 182 -> 0 bytes .../browser/tabbrowser/tab-middle.png | Bin 161 -> 0 bytes .../browser/tabbrowser/tab-right-bkgnd.png | Bin 336 -> 0 bytes .../browser/tabbrowser/tab-right.png | Bin 333 -> 0 bytes 10 files changed, 40 insertions(+), 93 deletions(-) create mode 100644 browser/themes/pinstripe/browser/tabbrowser/tab-bkgnd.png delete mode 100755 browser/themes/pinstripe/browser/tabbrowser/tab-left-bkgnd.png delete mode 100644 browser/themes/pinstripe/browser/tabbrowser/tab-left.png delete mode 100755 browser/themes/pinstripe/browser/tabbrowser/tab-middle-bkgnd.png delete mode 100644 browser/themes/pinstripe/browser/tabbrowser/tab-middle.png delete mode 100755 browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png delete mode 100644 browser/themes/pinstripe/browser/tabbrowser/tab-right.png diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml index ec6fb3476f5..3049fefa641 100644 --- a/browser/base/content/tabbrowser.xml +++ b/browser/base/content/tabbrowser.xml @@ -3353,22 +3353,9 @@ extends="chrome://global/content/bindings/tabbox.xml#tab"> -#ifdef XP_MACOSX - - - - - - - - - - -#else -#endif diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css index 385de02199e..b51a7a8ea7a 100755 --- a/browser/themes/pinstripe/browser/browser.css +++ b/browser/themes/pinstripe/browser/browser.css @@ -1562,51 +1562,67 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { .tab-icon-image { width: 16px; height: 16px; + list-style-image: url("chrome://global/skin/tree/item-grayscale.png"); + opacity: 0.6; + margin-top: 2px; +} + +.tabbrowser-tab[selected="true"] > .tab-icon-image { list-style-image: url("chrome://global/skin/tree/item.png"); } -.tab-icon { - margin: 0 0 3px 0; - opacity: 0.6; +.tabbrowser-tab[busy] > .tab-icon-image { + list-style-image: url("chrome://global/skin/icons/loading_16.png") !important; } -.tabbrowser-tab:not([selected="true"]):hover .tab-icon, -.tabbrowser-tab[selected="true"] .tab-icon { - opacity: 1.0; +.tabbrowser-tab:hover > .tab-icon-image, +.tabbrowser-tab[selected="true"] > .tab-icon-image { + opacity: 1; } .tab-text { - margin-top: 0; + margin-top: 3px; + margin-bottom: 0; font: message-box; font-weight: bold; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4); - padding-bottom: 1px; -} - -.tabbrowser-tab[busy] > .tab-icon-image, -.tabbrowser-tab[busy] > .tab-image-middle > .tab-icon > .tab-icon-image { - list-style-image: url("chrome://global/skin/icons/loading_16.png") !important; } .tabbrowser-tab { -moz-appearance: none; - -moz-border-radius: 0 0 3px 3px; + -moz-border-radius: 0 0 6px 6px; color: #222; -moz-box-pack: center; - margin: 0 3px 3px 2px; - padding: 0px; - border: none !important; + -moz-box-align: center; + margin-bottom: 1px; + -moz-margin-end: 1px; + padding: 0 5px; + border-style: none solid solid; + border-width: 3px; + -moz-border-right-colors: rgba(0, 0, 0, .08) rgba(0, 0, 0, .17) rgba(180, 180, 180, .29); + -moz-border-bottom-colors: rgba(0, 0, 0, .08) rgba(0, 0, 0, .17) rgba(180, 180, 180, .29); + -moz-border-left-colors: rgba(0, 0, 0, .08) rgba(0, 0, 0, .17) rgba(180, 180, 180, .29); + -moz-background-clip: padding; min-width: 1px !important; text-align: center; - height: 22px; + height: 24px; +} + +.tabbrowser-tab:not([selected="true"]) { + background-image: url(chrome://browser/skin/tabbrowser/tab-bkgnd.png); } .tabbrowser-tab[selected="true"] { -moz-user-focus: normal; + padding: 0 6px 1px; + border-width: 2px; + -moz-border-left-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2); + -moz-border-bottom-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2); + -moz-border-right-colors: rgba(0, 0, 0, .1) rgba(0, 0, 0, .2); background-color: -moz-mac-chrome-active; } -.tabbrowser-tab[selected="true"]:focus > .tab-image-middle > .tab-text { +.tabbrowser-tab[selected="true"]:focus > .tab-text { outline: 2px solid #4F8EC9; outline-offset: -2px; -moz-outline-radius: 3px; @@ -1617,58 +1633,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker { color: #000000; } -.tab-image-left, -.tab-image-right { - width: 8px; - margin: 0px; - padding: 0px; -} - -.tab-image-left, -.tab-image-right, -.tabbrowser-tab > .tab-image-middle, -.tabbrowser-tab > .tab-close-button { - margin-bottom: -3px; - padding-top: 1px; -} - -.tabbrowser-tab > .tab-image-right, -.tabbrowser-tab[chromedir="rtl"] > .tab-image-left { - margin-right: -3px; - background: url("chrome://browser/skin/tabbrowser/tab-right.png") no-repeat; -} - -.tabbrowser-tab:not([selected="true"]) > .tab-image-right, -.tabbrowser-tab:not([selected="true"])[chromedir="rtl"] > .tab-image-left { - background: url("chrome://browser/skin/tabbrowser/tab-right-bkgnd.png") no-repeat; -} - -.tabbrowser-tab > .tab-image-left, -.tabbrowser-tab[chromedir="rtl"] > .tab-image-right { - margin-left: -2px; - background: url("chrome://browser/skin/tabbrowser/tab-left.png") no-repeat; -} - -.tabbrowser-tab:not([selected="true"]) > .tab-image-left, -.tabbrowser-tab:not([selected="true"])[chromedir="rtl"] > .tab-image-right { - background: url("chrome://browser/skin/tabbrowser/tab-left-bkgnd.png") no-repeat; -} - -.tabbrowser-tab > .tab-image-middle, -.tabbrowser-tab > .tab-close-button { - background: url("chrome://browser/skin/tabbrowser/tab-middle.png") repeat-x; - -moz-box-pack: center; -} - -.tabbrowser-tab:not([selected="true"]) > .tab-image-middle, -.tabbrowser-tab:not([selected="true"]) > .tab-close-button { - background: url("chrome://browser/skin/tabbrowser/tab-middle-bkgnd.png"); -} - -.tabbrowser-tab:not([selected="true"]) > .tab-image-middle > .tab-icon > .tab-icon-image { - list-style-image: url("chrome://global/skin/tree/item-grayscale.png"); -} - .tabbrowser-strip { margin-top: -1px; border-bottom: 1px solid #404040; @@ -1724,15 +1688,16 @@ tabbrowser > tabbox > tabpanels { .tab-close-button > .toolbarbutton-icon { -moz-margin-end: 0px !important; margin-top: 1px; + padding: 0; } .tab-close-button { list-style-image: url("chrome://global/skin/icons/closetab.png"); -moz-appearance: none; border: none !important; - padding: 0 0 3px 0; - margin: 0; - background: inherit; + padding: 0; + margin: 1px 0 0; + background: none; cursor: default; } diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn index 7e8847cfbd0..396fc21c3eb 100644 --- a/browser/themes/pinstripe/browser/jar.mn +++ b/browser/themes/pinstripe/browser/jar.mn @@ -127,12 +127,7 @@ classic.jar: skin/classic/browser/tabbrowser/tab-arrow-end-bkgnd-animate.png (tabbrowser/tab-arrow-end-bkgnd-animate.png) skin/classic/browser/tabbrowser/tabbrowser-tabs-bkgnd.png (tabbrowser/tabbrowser-tabs-bkgnd.png) skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png) - skin/classic/browser/tabbrowser/tab-left.png (tabbrowser/tab-left.png) - skin/classic/browser/tabbrowser/tab-left-bkgnd.png (tabbrowser/tab-left-bkgnd.png) - skin/classic/browser/tabbrowser/tab-middle.png (tabbrowser/tab-middle.png) - skin/classic/browser/tabbrowser/tab-middle-bkgnd.png (tabbrowser/tab-middle-bkgnd.png) - skin/classic/browser/tabbrowser/tab-right.png (tabbrowser/tab-right.png) - skin/classic/browser/tabbrowser/tab-right-bkgnd.png (tabbrowser/tab-right-bkgnd.png) + skin/classic/browser/tabbrowser/tab-bkgnd.png (tabbrowser/tab-bkgnd.png) skin/classic/browser/tabbrowser/tabs-bottom-bg.png (tabbrowser/tabs-bottom-bg.png) skin/classic/browser/urlbar/endcap.png (urlbar/endcap.png) skin/classic/browser/urlbar/endcap-rtl.png (urlbar/endcap-rtl.png) diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/tab-bkgnd.png new file mode 100644 index 0000000000000000000000000000000000000000..acf39e6e0e9236bddd226536703a50bc502aca4a GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^96+qW!2%>RR~4H9DfSXiUsv`UT#N$dLi=?swSYpL z1s;*b3=DDyL74GyW=JqlkR{#G*O7tY+Knsz5k^41il>WXNX4yW9o`fNMxC1d7g&ze qE#NHp>nfU%lprB0A-Z5C14G<87R$%cTlsq+rZposKb>0{J-E=hTJVeEB+r{&$o}o;!+q> z*d?R$pHEpHm)S7kSfYfQB8&BF1F7Vkh}J1VGS*AE^4G@x-Zy_r(4?kE-=*B(C{SFbB*-tAK`T;RikV-PO;I$Ojhn@cQ%6?FpC>{-*iz8Q z(K~>HUxLXaoA=&7p!!%(7srr_xYDzcd@TwBECC@?LJRI+pZWX#MTTBAiQli6YOQqp zK9McpSi=iPDW`z>BKj$cE^jA4k(Ri?c!DAH>+*N6msDnN{61^f+c`Zli8)7}rQY>X g>z{0R``?sF;un>f1H^+o)j#{HZJ`SG?T&8)z4*}Q$iB}9fCOI diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png b/browser/themes/pinstripe/browser/tabbrowser/tab-middle.png deleted file mode 100644 index 02b8bdb3dcf4713ccb8aa29fd5476b334d99d786..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^96&6|!VDz;tuATuJ$aN z4V2(43GxeOP-F`bm-1I;VQX;o01E1Ox;TbZ#O*y`Ey$q2!+as)#F2ZN)$dj@$cS*? oef__kTW;UZ-y(PX3U(|Au+iAaTzvVWh9JlmPgg&ebxsLQ0N08yN&o-= diff --git a/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png b/browser/themes/pinstripe/browser/tabbrowser/tab-right-bkgnd.png deleted file mode 100755 index 8a1410bcbade05ba3d9ddac6a431094ccabfbb58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmV-W0k8gvP)X1^@s6425sC00004XF*Lt007q5 z)K6G40000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy;z>k7RCwB? zQ^5*@Fbth(d+EX9#Xr~w?PL53?|y;bw4-<$gI&fDCu?n%ND-}~$O4aQ^75LrX@rQU zEsL@&yN1p@&u_Fm32zz4@pqO%MvEc<|H?E?yA{G{Qfu8$9RM&RK)C-dK?nhxgoWba zE&eBj=Wv|xe;2z7-f)$`1v=+A$QS6C2*Eu>#uyIpjM#;OQcBcy-O}fWU|2;CLm?$_ zkdL4&%LlnyuYfX165TY7<;jr@u+f2@v|v%n=$(ZYKIAlxd}#Th+0Vd zI2*}J@Y}stJ_pp0;pyTSQW2MW)}8N&0uO6|hYW|YLskCeclE~%55+C0Xq@-Ye3Qp= zQ-O&m-MiAJZoD*O$qC7)yk?8zmDO3*{e2`HLj5JooYG$$soBL~eYM+Z%C2t>dvEXu oCl>6zw~vc^{(JtAhQsD(