Bug 1506869 - Don't remove .findbar-button's background-color set by toolbarbutton-icons.inc.css. r=jaws, a=RyanVM
authorDão Gottwald <dao@mozilla.com>
Fri, 14 Dec 2018 19:51:13 +0000
changeset 506235 d68c09b685cc5a7fb915fed38c0201c0c48a62ff
parent 506234 23693d234e3707f419b60eac254633031ef94dd5
child 506236 8f78e91a61b8a533c282ce009be7ed195c1a03b9
push id10340
push userryanvm@gmail.com
push dateSat, 15 Dec 2018 19:26:47 +0000
treeherdermozilla-beta@7cc9c0386e87 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, RyanVM
bugs1506869
milestone65.0
Bug 1506869 - Don't remove .findbar-button's background-color set by toolbarbutton-icons.inc.css. r=jaws, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D14539
browser/themes/osx/browser.css
toolkit/themes/osx/global/findBar.css
toolkit/themes/osx/global/shared.inc
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -204,17 +204,17 @@
 }
 
 %include ../shared/toolbarbuttons.inc.css
 %include ../shared/toolbarbutton-icons.inc.css
 %include ../shared/menupanel.inc.css
 
 /* Override OSX-specific toolkit findbar button styles */
 .findbar-button {
-  background: none !important;
+  background-image: none !important;
   box-shadow: none !important;
   border: none;
 }
 
 /* On Mac, native buttons keep their full opacity when they become disabled
  * and only the glyph or text on top of them becomes less opaque. */
 :root:not([customizing]) #back-button[disabled="true"] {
   opacity: 1 !important;
--- a/toolkit/themes/osx/global/findBar.css
+++ b/toolkit/themes/osx/global/findBar.css
@@ -35,17 +35,17 @@ label.findbar-find-fast:-moz-lwtheme {
 }
 
 .findbar-find-next:not(:-moz-lwtheme),
 .findbar-find-previous:not(:-moz-lwtheme),
 .findbar-button {
   border-style: @roundButtonBorderStyle@;
   border-color: @roundButtonBorderColor@;
   color: @roundButtonColor@;
-  background: @roundButtonBackground@;
+  background-image: @roundButtonBackground@;
 }
 
 .findbar-button {
   -moz-appearance: none;
   border-width: @roundButtonBorderWidth@;
   margin-inline-end: 5px;
   padding: 2px 9px;
   border-radius: 10000px;
@@ -55,17 +55,17 @@ label.findbar-find-fast:-moz-lwtheme {
 .findbar-find-previous:-moz-lwtheme {
   border-color: var(--lwt-toolbar-field-border-color, @roundButtonBorderColor@);
 }
 
 .findbar-find-next:not(:-moz-lwtheme):not([disabled]):hover:active,
 .findbar-find-previous:not(:-moz-lwtheme):not([disabled]):hover:active,
 .findbar-button:not([disabled]):hover:active,
 .findbar-button:not([disabled])[checked="true"] {
-  background: @roundButtonPressedBackground@;
+  background-image: @roundButtonPressedBackground@;
   box-shadow: @roundButtonPressedShadow@;
 }
 
 @media (-moz-mac-yosemite-theme: 0) {
   .findbar-textbox,
   .findbar-find-next {
     border-radius: 10000px;
   }
--- a/toolkit/themes/osx/global/shared.inc
+++ b/toolkit/themes/osx/global/shared.inc
@@ -4,17 +4,17 @@
 %define focusRingShadow 0 0 0 1px -moz-mac-focusring inset, 0 0 0 1px -moz-mac-focusring
 
 %define roundButtonBorderWidth 1px
 %define roundButtonBorderStyle solid
 %define roundButtonBorderColor 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 roundButtonPressedBackground linear-gradient(#dadada, #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
 
 %define toolbarbuttonBackground linear-gradient(#FFF, #ADADAD) repeat-x
 %define toolbarbuttonPressedInnerShadow inset rgba(0, 0, 0, 0.3) 0 -6px 10px, inset #000 0 1px 3px, inset rgba(0, 0, 0, 0.2) 0 1px 3px