Bug 1673447 - Remove toolkit/themes/osx/global/shared.inc and inline its contents. r=dao
authorTim Nguyen <ntim.bugs@gmail.com>
Wed, 28 Oct 2020 01:48:19 +0000
changeset 554839 ae315341bc721084298fd39f6669bc47456a0fc5
parent 554838 8ac1218f9be33dd5a003590a17bff85022353f22
child 554840 9836b528717f4b4bcd776cfab3062e4082c50e02
push id129600
push userncsoregi@mozilla.com
push dateWed, 28 Oct 2020 01:50:40 +0000
treeherderautoland@ae315341bc72 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1673447
milestone84.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 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
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
@@ -1,13 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 {
   background-image: linear-gradient(#e8e8e8, #d0d0d0);
   border-top-color: #888;
 }
 
 .findbar-container {
@@ -30,45 +32,45 @@ label.findbar-find-fast:-moz-lwtheme {
   border: none;
   /* make sure the closebutton is displayed as the first element in the bar: */
   -moz-box-ordinal-group: 0;
 }
 
 .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;
 }
 
 .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;
   background-image: url("chrome://global/skin/icons/search-textbox.svg");
   background-repeat: no-repeat;
   background-position: 5px center;
   margin: 0;
   padding-inline-start: 19px;
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -1,13 +1,12 @@
 % This Source Code Form is subject to the terms of the Mozilla Public
 % 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 {
   /* ::::: Variables ::::: */
   --arrowpanel-padding: 16px;
   --default-arrowpanel-background: #fff;
   --default-arrowpanel-color: hsl(0,0%,10%);
   --default-arrowpanel-border-color: hsla(210,4%,10%,.05);
deleted file mode 100644
--- a/toolkit/themes/osx/global/shared.inc
+++ /dev/null
@@ -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)