Bug 1313840 - Don’t use the ’ButtonText’ foreground color in findbar/notification buttons and make text color in pressed notification buttons black.r=dao.
authorstefanh@inbox.com
Sat, 21 Jan 2017 13:31:23 +0100
changeset 377823 8b402de2f73cc2487c69db5f110fc366165aa8b3
parent 377822 48e7992f133511770d04b75bdcf42178ed1a4573
child 377824 052b90b5414fea4b6d6ed3a5ce714d76a029716a
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1313840
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1313840 - Don’t use the ’ButtonText’ foreground color in findbar/notification buttons and make text color in pressed notification buttons black.r=dao.
toolkit/themes/osx/global/findBar.css
toolkit/themes/osx/global/global.css
toolkit/themes/osx/global/shared.inc
--- a/toolkit/themes/osx/global/findBar.css
+++ b/toolkit/themes/osx/global/findBar.css
@@ -71,19 +71,19 @@ label.findbar-find-fast:-moz-lwtheme,
 .findbar-find-next,
 .findbar-find-previous,
 .findbar-highlight,
 .findbar-case-sensitive,
 .findbar-entire-word {
   -moz-appearance: none;
   border-radius: 10000px;
   border: @roundButtonBorder@;
+  color: @roundButtonColor@;
   background: @roundButtonBackground@;
   box-shadow: @roundButtonShadow@;
-  color: buttontext;
   margin: 0;
 }
 
 @media (-moz-mac-yosemite-theme) {
   .findbar-find-previous,
   .findbar-find-next {
     border-radius: 3px;
     box-shadow: none;
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -248,21 +248,23 @@ notification > button {
   margin: 0 3px;
   padding: 1px 10px;
   min-width: 60px;
   min-height: 16px;
   -moz-appearance: none;
   border-radius: 10000px;
   border: @roundButtonBorder@;
   text-shadow: @loweredShadow@;
+  color: @roundButtonColor@;
   background: @roundButtonBackground@;
   box-shadow: @roundButtonShadow@;
 }
 
 notification > button:active:hover {
+  color: @roundButtonColor@;
   background: @roundButtonPressedBackground@;
   box-shadow: @roundButtonPressedShadow@;
 }
 
 notification > button:-moz-focusring {
   box-shadow: @focusRingShadow@, @roundButtonShadow@;
 }
 
--- a/toolkit/themes/osx/global/shared.inc
+++ b/toolkit/themes/osx/global/shared.inc
@@ -1,15 +1,16 @@
 %filter substitution
 
 %define loweredShadow 0 1px rgba(255, 255, 255, .4)
 %define focusRingShadow 0 0 1px -moz-mac-focusring inset, 0 0 4px 1px -moz-mac-focusring, 0 0 1.5px 1px -moz-mac-focusring
 %define yosemiteFocusRingShadow 0 0 0 0.5px -moz-mac-focusring inset, 0 0 0 2px -moz-mac-focusring
 
 %define roundButtonBorder 1px solid rgba(0,0,0,.35)
+%define roundButtonColor black
 %define roundButtonBackground linear-gradient(#f6f6f6, #e9e9e9)
 %define roundButtonShadow 0 1px rgba(255,255,255,.5), inset 0 1px 1px rgba(255,255,255,.5)
 %define roundButtonPressedBackground #dadada
 %define roundButtonPressedShadow 0 1px rgba(255,255,255,.4), inset 0 1px 3px rgba(0,0,0,.2)
 
 %define scopeBarBackground linear-gradient(#E8E8E8, #D0D0D0) repeat-x
 %define scopeBarSeparatorBorder 1px solid #888
 %define scopeBarTitleColor #6D6D6D