Bug 1698405 - Move --arrowpanel-dimmed* definitions to toolkit. r=mconley
authorDão Gottwald <dao@mozilla.com>
Thu, 25 Mar 2021 17:40:20 +0000
changeset 573130 cc5403c8b7eda988a98a173a9ef17dcc76cc8e35
parent 573129 189f50d43aaf41355a866d1b0930d97e27ebcc1b
child 573131 e68bfdbcaf4d2202af80716b39054d50291d43ef
push id139484
push userdgottwald@mozilla.com
push dateThu, 25 Mar 2021 17:42:42 +0000
treeherderautoland@cc5403c8b7ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs1698405
milestone89.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 1698405 - Move --arrowpanel-dimmed* definitions to toolkit. r=mconley Differential Revision: https://phabricator.services.mozilla.com/D109505
browser/themes/shared/browser.inc.css
toolkit/themes/linux/global/global.css
toolkit/themes/osx/global/global.css
toolkit/themes/shared/global.inc.css
toolkit/themes/windows/global/global.css
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -27,20 +27,16 @@
   --button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
   --button-color: currentColor;
 
   --buttons-destructive-bgcolor: #e22850;
   --buttons-destructive-hover-bgcolor: #c50042;
   --buttons-destructive-active-bgcolor: #810220;
   --buttons-destructive-color: #fbfbfe;
 
-  --arrowpanel-dimmed: color-mix(in srgb, currentColor 17%, transparent);
-  --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 30%, transparent);
-  --arrowpanel-dimmed-even-further: color-mix(in srgb, currentColor 35%, transparent);
-
   --identity-box-margin-inline: 4px;
   --identity-box-label-opacity: .8;
   --urlbar-box-bgcolor: var(--button-bgcolor);
   --urlbar-box-hover-bgcolor: color-mix(in srgb, var(--urlbar-box-bgcolor), currentColor 12%);
   --urlbar-box-active-bgcolor: color-mix(in srgb, var(--urlbar-box-bgcolor), currentColor 21%);
 
   --urlbar-min-height: 32px;
   --urlbar-icon-padding: 6px; /* (32px - 2px border - 2px padding - 16px icon) / 2 */
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -10,27 +10,16 @@
 
 @media (-moz-menubar-drag) {
   xul|toolbar[type="menubar"] {
     -moz-window-dragging: drag;
   }
 }
 
 :root {
-  /* ::::: Variables ::::: */
-  --default-arrowpanel-background: Field;
-  --default-arrowpanel-color: FieldText;
-  --default-arrowpanel-border-color: ThreeDShadow;
-  --arrowpanel-background: var(--default-arrowpanel-background);
-  --arrowpanel-color: var(--default-arrowpanel-color);
-  --arrowpanel-border-color: var(--default-arrowpanel-border-color);
-  --arrowpanel-border-radius: 8px;
-  --panel-disabled-color: GrayText;
-  --panel-description-color: GrayText;
-  /* ::::: Styles ::::: */
   appearance: auto;
   -moz-default-appearance: dialog;
   background-color: -moz-Dialog;
   color: -moz-DialogText;
   font: message-box;
 }
 
 @supports not -moz-bool-pref("browser.proton.enabled") {
--- a/toolkit/themes/osx/global/global.css
+++ b/toolkit/themes/osx/global/global.css
@@ -4,21 +4,16 @@
 
 %include ../../shared/global.inc.css
 
 :root {
   /* ::::: Variables ::::: */
   --default-arrowpanel-background: #fff;
   --default-arrowpanel-color: hsl(0,0%,10%);
   --default-arrowpanel-border-color: hsla(210,4%,10%,.05);
-  --arrowpanel-background: var(--default-arrowpanel-background);
-  --arrowpanel-color: var(--default-arrowpanel-color);
-  --arrowpanel-border-color: var(--default-arrowpanel-border-color);
-  --arrowpanel-border-radius: 8px;
-  --panel-disabled-color: GrayText;
   --panel-description-color: hsl(0,0%,50%);
 
   --focus-ring-box-shadow: 0 0 0 1px -moz-mac-focusring inset, 0 0 0 1px -moz-mac-focusring;
   /* ::::: Styles ::::: */
   appearance: auto;
   -moz-default-appearance: dialog;
   background-color: #FFFFFF;
   color: -moz-DialogText;
--- a/toolkit/themes/shared/global.inc.css
+++ b/toolkit/themes/shared/global.inc.css
@@ -8,17 +8,32 @@
 
 @import url("close-icon.css");
 
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 :root {
   /* ::::: Variables ::::: */
+  --default-arrowpanel-background: Field;
+  --default-arrowpanel-color: FieldText;
+  --default-arrowpanel-border-color: ThreeDShadow;
+  --arrowpanel-background: var(--default-arrowpanel-background);
+  --arrowpanel-color: var(--default-arrowpanel-color);
+  --arrowpanel-border-color: var(--default-arrowpanel-border-color);
+  --arrowpanel-border-radius: 8px;
   --arrowpanel-padding: 16px;
+
+  --arrowpanel-dimmed: color-mix(in srgb, currentColor 17%, transparent);
+  --arrowpanel-dimmed-further: color-mix(in srgb, currentColor 30%, transparent);
+  --arrowpanel-dimmed-even-further: color-mix(in srgb, currentColor 35%, transparent);
+
+  --panel-description-color: GrayText;
+  --panel-disabled-color: GrayText;
+
   --popup-notification-body-width: calc(31em - calc(2 * var(--arrowpanel-padding)));
 }
 
 @supports not -moz-bool-pref("browser.proton.doorhangers.enabled") {
 :root {
   --popup-notification-body-width: 25em;
 }
 } /** END not Proton **/
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -4,28 +4,16 @@
 
 /* ===== global.css =====================================================
   == Styles that apply everywhere.
   ======================================================================= */
 
 %include ../../shared/global.inc.css
 
 :root {
-  /* ::::: Variables ::::: */
-  --default-arrowpanel-background: Field;
-  --default-arrowpanel-color: FieldText;
-  --default-arrowpanel-border-color: ThreeDShadow;
-  --arrowpanel-background: var(--default-arrowpanel-background);
-  --arrowpanel-color: var(--default-arrowpanel-color);
-  --arrowpanel-border-color: var(--default-arrowpanel-border-color);
-  --arrowpanel-border-radius: 8px;
-  --panel-disabled-color: GrayText;
-  --panel-description-color: GrayText;
-
-  /* ::::: Styles ::::: */
   background-color: -moz-Dialog;
   color: -moz-DialogText;
   font: message-box;
 }
 
 @supports not -moz-bool-pref("browser.proton.enabled") {
 :root {
   --arrowpanel-padding: 10px;