Bug 1673447 - Remove toolkit/themes/osx/global/shared.inc and inline its contents. r=dao

Differential Revision: https://phabricator.services.mozilla.com/D94771

toolkit/themes/osx/global/findBar.css

@@ -2,7 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-%include shared.inc
+%filter substitution
+%define findUiDefaultBorderColor rgba(0,0,0,.35)
+
 %include ../../shared/findBar.inc.css
 
 findbar {
@@ -35,15 +37,15 @@ 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-image: @roundButtonBackgroundImage@;
+  border-style: solid;
+  border-color: @findUiDefaultBorderColor@;
+  color: black;
+  background-image: linear-gradient(#f6f6f6, #e9e9e9);
 }
 
 .findbar-button {
   appearance: none;
-  border-width: @roundButtonBorderWidth@;
+  border-width: 1px;
   margin-inline-end: 5px;
   padding: 2px 9px;
   border-radius: 10000px;
@@ -51,19 +53,19 @@ label.findbar-find-fast:-moz-lwtheme {
 
 .findbar-find-next:-moz-lwtheme,
 .findbar-find-previous:-moz-lwtheme {
-  border-color: var(--lwt-toolbar-field-border-color, @roundButtonBorderColor@);
+  border-color: var(--lwt-toolbar-field-border-color, @findUiDefaultBorderColor@);
 }
 
 .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-image: @roundButtonPressedBackgroundImage@;
-  box-shadow: @roundButtonPressedShadow@;
+  background-image: linear-gradient(#dadada, #dadada);
+  box-shadow: 0 1px rgba(255,255,255,.4), inset 0 1px 3px rgba(0,0,0,.2);
 }
 
 html|input.findbar-textbox {
-  border: @roundButtonBorderWidth@ @roundButtonBorderStyle@ var(--lwt-toolbar-field-border-color, @roundButtonBorderColor@);
+  border: 1px solid var(--lwt-toolbar-field-border-color, @findUiDefaultBorderColor@);
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
   fill-opacity: 0.8;

toolkit/themes/osx/global/global.css

@@ -2,7 +2,6 @@
 % License, v. 2.0. If a copy of the MPL was not distributed with this
 % file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-%include shared.inc
 %include ../../shared/global.inc.css
 
 :root {

toolkit/themes/osx/global/shared.inc

@@ -1,10 +0,0 @@
-%filter substitution
-
-%define roundButtonBorderWidth 1px
-%define roundButtonBorderStyle solid
-%define roundButtonBorderColor rgba(0,0,0,.35)
-%define roundButtonColor black
-%define roundButtonBackgroundImage linear-gradient(#f6f6f6, #e9e9e9)
-%define roundButtonShadow 0 1px rgba(255,255,255,.5), inset 0 1px 1px rgba(255,255,255,.5)
-%define roundButtonPressedBackgroundImage linear-gradient(#dadada, #dadada)
-%define roundButtonPressedShadow 0 1px rgba(255,255,255,.4), inset 0 1px 3px rgba(0,0,0,.2)