Bug 963083 - [Australis] Background tabs should inherit the text color. r=MattN a=sledru
authorDão Gottwald <dao@mozilla.com>
Wed, 26 Feb 2014 09:00:25 +0100
changeset 183009 2d1f9c800085478795153b26d4fbdb5bc51cb006
parent 183008 955fa8e5c6ea7468e2f7fb2bed272916412e8e2d
child 183010 81664379b07295432a84f71e4cb3417da5f74150
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN, sledru
bugs963083
milestone29.0a2
Bug 963083 - [Australis] Background tabs should inherit the text color. r=MattN a=sledru
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/shared/tabs.inc.css
browser/themes/windows/browser.css
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -1562,20 +1562,16 @@ richlistitem[type~="action"][actiontype=
   color: -moz-menubartext;
 }
 
 #toolbar-menubar:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-metric(menubar-drag),
 #TabsToolbar:not(:-moz-lwtheme):-moz-system-metric(menubar-drag) {
   -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar-drag");
 }
 
-#TabsToolbar:not(:-moz-lwtheme) > #tabbrowser-tabs > .tabbrowser-tab:not([selected]) {
-  color: -moz-menubartext;
-}
-
 .tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
 }
 
 #context_reloadTab {
   list-style-image: url("moz-icon://stock/gtk-refresh?size=menu");
 }
 
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -2634,22 +2634,23 @@ toolbarbutton.chevron > .toolbarbutton-m
 
 .tabbrowser-tab,
 .tabs-newtab-button {
   font: message-box;
   font-weight: bold;
   border: none;
 }
 
-.tabbrowser-tab:not(:-moz-lwtheme) {
-  color: #333;
-  text-shadow: @loweredShadow@;
-}
-
-.tabbrowser-tab[selected=true]:-moz-lwtheme {
+.tabbrowser-tab[selected=true]:not(:-moz-lwtheme) {
+  /* overriding tabbox.css */
+  color: inherit;
+}
+
+.tabbrowser-tab[selected=true] {
+  /* overriding tabbox.css */
   text-shadow: inherit;
 }
 
 .tabbrowser-tabs[closebuttons="hidden"] > * > * > * > .tab-close-button:not([pinned]) {
   display: -moz-box;
   visibility: hidden;
 }
 
@@ -2683,16 +2684,21 @@ toolbarbutton.chevron > .toolbarbutton-m
 }
 
 #TabsToolbar {
   position: relative;
   -moz-appearance: none;
   background-repeat: repeat-x;
 }
 
+#TabsToolbar:not(:-moz-lwtheme) {
+  color: #333;
+  text-shadow: @loweredShadow@;
+}
+
 /*
  * Draw the bottom border of the tabstrip when core doesn't do it for us:
  */
 #main-window:-moz-any([privatebrowsingmode=temporary],[sizemode="fullscreen"],[customize-entered]) #TabsToolbar::after,
 #main-window:not([tabsintitlebar]) #TabsToolbar::after,
 #TabsToolbar:-moz-lwtheme::after {
   content: '';
   /* Because we use placeholders for window controls etc. in the tabstrip,
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -114,16 +114,17 @@
 .tab-background-start,
 .tab-background-end,
 .tab-background-end[selected=true]::after,
 .tab-background-end[selected=true]::before {
   min-height: @tabHeight@;
   width: @tabCurveWidth@;
 }
 
+.tabbrowser-tab:not([selected=true]),
 .tabbrowser-tab:-moz-lwtheme {
   color: inherit;
 }
 
 /* Selected tab */
 
 /*
  Tab background pseudo-elements which are positioned above .tab-background-start/end:
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1586,20 +1586,16 @@ toolbarbutton[type="socialmark"] > .tool
   }
 }
 %endif
 
 .tab-close-button:not(:hover):not([selected="true"]):-moz-lwtheme-brighttext {
   -moz-image-region: rect(0, 64px, 16px, 48px) !important;
 }
 
-#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-tab:not([selected]):not(:-moz-lwtheme) {
-  color: CaptionText;
-}
-
 /* tabbrowser-tab focus ring */
 .tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
 }
 
 /* Tab DnD indicator */
 .tab-drop-indicator {
   list-style-image: url(chrome://browser/skin/tabbrowser/tabDragIndicator.png);