Bug 438302 - Remove Pinstripe text-shadow hacks. r=rflint

browser/themes/pinstripe/browser/browser.css

@@ -138,19 +138,15 @@ toolbarbutton.bookmark-item[chromedir="rtl"] {
   list-style-image: url("chrome://browser/skin/places/history.png");
 }
 
-toolbarbutton.bookmark-item > .toolbarbutton-text-stack > label {
+toolbarbutton.bookmark-item > .toolbarbutton-text {
   margin: 0;
 }
-toolbarbutton.bookmark-item > .toolbarbutton-text-stack > .toolbarbutton-text-shadow {
-  padding-top: 2px;
-  text-align: center;
-}
 
-toolbarbutton.bookmark-item:not([container]) > .toolbarbutton-text-stack {
+toolbarbutton.bookmark-item:not([container]) > .toolbarbutton-text {
   -moz-padding-end: 7px;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"] > .toolbarbutton-text-stack {
+toolbarbutton.bookmark-item[chromedir="rtl"] > .toolbarbutton-text {
   -moz-padding-end: 0;
   -moz-padding-start: 7px;
 }
@@ -164,53 +160,45 @@ toolbarbutton.bookmark-item[open="true"] {
   background:url("chrome://browser/skin/bookmark-open-left.png") no-repeat left center;
 }
 
-toolbarbutton.bookmark-item:not([container]):hover > .toolbarbutton-text-stack,
+toolbarbutton.bookmark-item:not([container]):hover > .toolbarbutton-text,
 toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-dropmarker {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right center;
 }
 
-toolbarbutton.bookmark-item[container]:hover > .toolbarbutton-text-stack,
+toolbarbutton.bookmark-item[container]:hover > .toolbarbutton-text,
 toolbarbutton.bookmark-item[container]:not([open]):hover > .toolbarbutton-menu-dropmarker[chromedir="rtl"],
 #home-button.bookmark-item:hover > .toolbarbutton-icon,
-#home-button.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text-stack {
+#home-button.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-mid.png") repeat-x;
 }
 
 #home-button.bookmark-item:hover[chromedir="rtl"] > .toolbarbutton-icon,
-toolbarbutton.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text-stack {
+toolbarbutton.bookmark-item[chromedir="rtl"]:hover > .toolbarbutton-text {
   background: url("chrome://global/skin/toolbar/toolbarbutton-customhover-right.png") no-repeat right center;
 }
 
-toolbarbutton.bookmark-item:not([container]):hover:active  > .toolbarbutton-text-stack,
+toolbarbutton.bookmark-item:not([container]):hover:active > .toolbarbutton-text,
 toolbarbutton.bookmark-item[open] > .toolbarbutton-menu-dropmarker,
 toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropmarker 
 {
   background: url("chrome://browser/skin/bookmark-open-right.png") no-repeat right center;
 }
 
-toolbarbutton.bookmark-item[container]:hover:active  > .toolbarbutton-text-stack,
-toolbarbutton.bookmark-item[container][open="true"] > .toolbarbutton-text-stack,
+toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-text,
+toolbarbutton.bookmark-item[container][open="true"] > .toolbarbutton-text,
 #home-button.bookmark-item:hover:active > .toolbarbutton-icon,
 toolbarbutton.bookmark-item[container]:hover:active > .toolbarbutton-menu-dropmarker[chromedir="rtl"],
 toolbarbutton.bookmark-item[container][open="true"] > .toolbarbutton-menu-dropmarker[chromedir="rtl"],
-#home-button.bookmark-item:hover:active[chromedir="rtl"] > .toolbarbutton-text-stack {
+#home-button.bookmark-item:hover:active[chromedir="rtl"] > .toolbarbutton-text {
   background: url("chrome://browser/skin/bookmark-open-mid.png") repeat-x !important;
 }
 
-toolbarbutton.bookmark-item[chromedir="rtl"][container]:hover:active  > .toolbarbutton-text-stack,
-toolbarbutton.bookmark-item[chromedir="rtl"][container][open] > .toolbarbutton-text-stack,
+toolbarbutton.bookmark-item[chromedir="rtl"][container]:hover:active > .toolbarbutton-text,
+toolbarbutton.bookmark-item[chromedir="rtl"][container][open] > .toolbarbutton-text,
 #home-button.bookmark-item[chromedir="rtl"]:hover:active > .toolbarbutton-icon {
   background: url("chrome://browser/skin/bookmark-open-right.png") no-repeat right center !important;
 }
 
-toolbarbutton.bookmark-item:not([container="true"]) {
-  -moz-binding: url(chrome://browser/skin/browser.xml#toolbarbutton-shadow);
-}
-
-toolbarbutton.bookmark-item[container="true"] {
-  -moz-binding: url(chrome://browser/skin/browser.xml#toolbarbutton-menu-shadow);
-}
-
 toolbarbutton.bookmark-item-microsummarized {
   max-width: 20em;
 }
@@ -381,19 +369,6 @@ toolbar[mode="icons"] #forward-button .toolbarbutton-text-box,
   display: none;
 }
 
-/* ----- DEFAULT PRIMARY TOOLBAR BUTTONS ----- */	
-
-.toolbarbutton-text-shadow,
-.tab-text-shadow {
-  color: #f0f0f0;
-  padding-top: 1px;
-  opacity: 0.5;
-}
-
-.tab-text-shadow {
-  padding-top: 0;
-}
-
 /* ----- DEFAULT BACK BUTTON, STAND-ALONE ----- */	
 
 #back-button {
@@ -1601,13 +1576,11 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 .tab-text {
-  margin-top: 0 !important;
-}
-
-.tab-text,
-.tab-text-shadow {
+  margin-top: 0;
   font: message-box;
-  font-weight: bold !important;
+  font-weight: bold;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+  padding-bottom: 1px;
 }
 
 .tabbrowser-tab[busy] > .tab-icon-image,
@@ -1616,7 +1589,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 .tabbrowser-tab {
-  -moz-binding: url("chrome://browser/skin/browser.xml#tabbrowser-tab") !important;
   -moz-appearance: none;
   -moz-border-radius: 0 0 3px 3px;
   color: #222;
@@ -1634,7 +1606,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   background-color: -moz-mac-chrome-active;
 }
 
-.tabbrowser-tab[selected="true"]:focus > .tab-image-middle > .tab-text-stack > .tab-text {
+.tabbrowser-tab[selected="true"]:focus > .tab-image-middle > .tab-text {
   outline: 2px solid #4F8EC9;
   outline-offset: -2px;
   -moz-outline-radius: 3px;

browser/themes/pinstripe/browser/browser.xml

@@ -21,50 +21,6 @@
         <children/>
     </content>
   </binding>
-   <binding id="toolbarbutton-menu-shadow" display="xul:menu" 
-           extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-    <content chromedir="&locale.dir;">
-      <children includes="observes|template|menupopup|tooltip"/>
-      <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/>
-      <xul:stack class="toolbarbutton-text-stack" crop="right" flex="1">
-         <xul:label class="toolbarbutton-text-shadow" crop="right" flex="1"
-                 xbl:inherits="value=label,accesskey,crop,dragover-top,toolbarmode,buttonstyle"/>
-         <xul:label class="toolbarbutton-text" crop="right" flex="1"
-                 xbl:inherits="value=label,accesskey,crop,dragover-top,toolbarmode,buttonstyle"/>
-      </xul:stack>
-      <xul:dropmarker type="menu" class="toolbarbutton-menu-dropmarker" xbl:inherits="disabled,label,chromedir"/>
-    </content>
-  </binding>
-  <binding id="toolbarbutton-shadow" extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton">
-   <content chromedir="&locale.dir;">
-      <children includes="observes|template|menupopup|tooltip"/>
-      <xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,toolbarmode,buttonstyle"/>
-      <xul:stack class="toolbarbutton-text-stack" crop="right" flex="1">
-         <xul:label class="toolbarbutton-text-shadow" crop="right" flex="1"
-                 xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"/>
-         <xul:label class="toolbarbutton-text" crop="right" flex="1"
-                 xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"/>
-      </xul:stack>
-    </content>
-  </binding>
-  
-  <binding id="tabbrowser-tab" extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
-    <content chromedir="&locale.dir;" closetabtext="&closeTab.label;">
-      <xul:hbox class="tab-image-left" xbl:inherits="selected"/>
-      <xul:hbox class="tab-image-middle" flex="1" align="center" xbl:inherits="selected">
-        <xul:stack class="tab-icon">
-          <xul:image xbl:inherits="validate,src=image" class="tab-icon-image"/>
-          <xul:image class="tab-extra-status"/>
-        </xul:stack>
-        <xul:stack class="tab-text-stack" flex="1">
-            <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text-shadow"/>
-            <xul:label flex="1" xbl:inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
-        </xul:stack>
-      </xul:hbox>
-      <xul:toolbarbutton anonid="close-button" tabindex="-1" class="tab-close-button"/>
-      <xul:hbox class="tab-image-right" xbl:inherits="selected"/>
-    </content>
-    </binding>
     <binding id="radiogroup-wrapper" extends="chrome://global/content/bindings/radio.xml#radiogroup">
     <content>
       <xul:box class="radiogroup-wrapper">

toolkit/themes/pinstripe/global/tabbox.css

@@ -18,7 +18,6 @@ tab {
 
 .tab-text {
   font				: menu;
-  font-weight: normal !important;
 }
 
 tabs {

toolkit/themes/pinstripe/global/toolbarbutton.css

@@ -53,6 +53,11 @@ toolbarbutton {
   border-right: 1px solid transparent;
   border-left: 1px solid transparent;
   background-color: transparent;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+}
+
+toolbarbutton:not([disabled="true"]):active:hover {
+  text-shadow: none;
 }
 
 .toolbarbutton-icon {