Bug 879588 - Tab title is hard to read in windows high-contrast mode with a light LWT (yellow text). r=gijs

browser/themes/linux/browser.css

@@ -1525,10 +1525,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   color: -moz-menubartext;
 }
 
-.tabbrowser-tab:-moz-lwtheme {
-  color: inherit;
-}
-
 .tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;
 }

browser/themes/osx/browser.css

@@ -2505,12 +2505,12 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 .tabs-newtab-button {
   font: message-box;
   font-weight: bold;
-  text-shadow: @loweredShadow@;
   border: none;
 }
 
-.tabbrowser-tab {
+.tabbrowser-tab:not(:-moz-lwtheme) {
   color: #333;
+  text-shadow: @loweredShadow@;
 }
 
 .tabbrowser-tabs[closebuttons="hidden"] > * > * > * > .tab-close-button:not([pinned]) {
@@ -2528,11 +2528,6 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   box-shadow: @focusRingShadow@;
 }
 
-.tabbrowser-tab:-moz-lwtheme {
-  color: inherit;
-  text-shadow: inherit;
-}
-
 #main-window:not([privatebrowsingmode=temporary]):not([customizing]):not([customize-exiting]) #navigator-toolbox:not(:-moz-lwtheme)::before {
   /* We want the titlebar to be unified, but we still want to be able
    * to give #TabsToolbar a background. So we can't set -moz-appearance:

browser/themes/shared/tabs.inc.css

@@ -119,6 +119,10 @@
   width: @tabCurveWidth@;
 }
 
+.tabbrowser-tab:-moz-lwtheme {
+  color: inherit;
+}
+
 /* Selected tab */
 
 /*

browser/themes/windows/browser.css

@@ -1459,16 +1459,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   color: CaptionText;
 }
 
-/* The selected tab should keep dark text with lightweight themes */
-.tabbrowser-tab:-moz-lwtheme:not([selected=true]) {
-  color: inherit;
-}
-
-.tabbrowser-tab[selected=true]:-moz-lwtheme {
-  /* Copied from :root:-moz-lwtheme-darktext in global.css */
-  text-shadow: 0 -0.5px 1.5px white;
-}
-
 /* tabbrowser-tab focus ring */
 .tabbrowser-tab:focus > .tab-stack > .tab-content > .tab-label {
   outline: 1px dotted;