Bug 1709367 - Clean up primary button variables. r=harry

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

browser/themes/addons/dark/manifest.json

@@ -79,10 +79,10 @@
       "button": "--button-bgcolor",
       "button_hover": "--button-hover-bgcolor",
       "button_active": "--button-active-bgcolor",
-      "button_primary": "--buttons-primary-button-bgcolor",
-      "button_primary_hover": "--buttons-primary-button-hover-bgcolor",
-      "button_primary_active": "--buttons-primary-button-active-bgcolor",
-      "button_primary_color": "--buttons-primary-button-color",
+      "button_primary": "--button-primary-bgcolor",
+      "button_primary_hover": "--button-primary-hover-bgcolor",
+      "button_primary_active": "--button-primary-active-bgcolor",
+      "button_primary_color": "--button-primary-color",
       "checkbox_border_color": "--checkbox-border-color",
       "checkbox_unchecked_background": "--checkbox-unchecked-bgcolor",
       "checkbox_unchecked_background_hover": "--checkbox-unchecked-hover-bgcolor",

browser/themes/addons/light/manifest.json

@@ -75,10 +75,10 @@
       "button": "--button-bgcolor",
       "button_hover": "--button-hover-bgcolor",
       "button_active": "--button-active-bgcolor",
-      "button_primary": "--buttons-primary-button-bgcolor",
-      "button_primary_hover": "--buttons-primary-button-hover-bgcolor",
-      "button_primary_active": "--buttons-primary-button-active-bgcolor",
-      "button_primary_color": "--buttons-primary-button-color",
+      "button_primary": "--button-primary-bgcolor",
+      "button_primary_hover": "--button-primary-hover-bgcolor",
+      "button_primary_active": "--button-primary-active-bgcolor",
+      "button_primary_color": "--button-primary-color",
       "checkbox_border_color": "--checkbox-border-color",
       "checkbox_unchecked_background": "--checkbox-unchecked-bgcolor",
       "checkbox_unchecked_background_hover": "--checkbox-unchecked-hover-bgcolor",

browser/themes/shared/browser-custom-colors.inc.css

@@ -5,16 +5,16 @@
 @media not (prefers-contrast) {
   @media (-moz-proton) {
   :root:not(:-moz-lwtheme) {
-    --buttons-primary-button-bgcolor: rgb(0,97,224);
-    --buttons-primary-button-hover-bgcolor: rgb(2,80,187);
-    --buttons-primary-button-active-bgcolor: rgb(5,62,148);
-    --buttons-primary-button-color: rgb(251,251,254);
+    --button-primary-bgcolor: rgb(0,97,224);
+    --button-primary-hover-bgcolor: rgb(2,80,187);
+    --button-primary-active-bgcolor: rgb(5,62,148);
+    --button-primary-color: rgb(251,251,254);
     --button-bgcolor: rgb(240,240,244);
     --button-hover-bgcolor: rgb(224,224,230);
     --button-active-bgcolor: rgb(207,207,216);
     --button-color: rgb(21,20,26);
 
-    --focus-outline-color: var(--buttons-primary-button-bgcolor);
+    --focus-outline-color: var(--button-primary-bgcolor);
     --focus-outline-offset: 2px;
 
     --checkbox-border-color: rgb(143,143,157);

browser/themes/shared/browser.inc.css

@@ -25,6 +25,10 @@
   --button-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent);
   --button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
   --button-color: currentColor;
+  --button-primary-bgcolor: -moz-accent-color;
+  --button-primary-hover-bgcolor: color-mix(in srgb, black 10%, -moz-accent-color);
+  --button-primary-active-bgcolor: color-mix(in srgb, black 20%, -moz-accent-color);
+  --button-primary-color: -moz-accent-color-foreground;
 
   --buttons-destructive-bgcolor: #e22850;
   --buttons-destructive-hover-bgcolor: #c50042;

browser/themes/shared/urlbarView.inc.css

@@ -493,18 +493,18 @@
 }
 
 .urlbarView-tip-button[selected] {
-  color: var(--buttons-primary-button-color, white);
-  background-color: var(--buttons-primary-button-bgcolor, -moz-accent-color);
+  color: var(--button-primary-color);
+  background-color: var(--button-primary-bgcolor);
   outline: var(--focus-outline);
   outline-offset: 2px;
 }
 
 .urlbarView-tip-button[selected]:hover {
-  background-color: var(--buttons-primary-button-hover-bgcolor, color-mix(in srgb, black 10%, -moz-accent-color));
+  background-color: var(--button-primary-hover-bgcolor);
 }
 
 .urlbarView-tip-button[selected]:hover:active {
-  background-color: var(--buttons-primary-button-active-bgcolor, color-mix(in srgb, black 20%, -moz-accent-color));
+  background-color: var(--button-primary-active-bgcolor);
 }
 
 .urlbarView-tip-button-spacer {

browser/themes/windows/browser.css

@@ -574,10 +574,6 @@ menuitem.bookmark-item {
   :root:not(:-moz-lwtheme) {
     --urlbar-popup-action-color: -moz-nativehyperlinktext;
   }
-
-  :root:not(:-moz-lwtheme) .urlbarView-tip-button[selected] {
-    color: var(--buttons-primary-button-color, highlighttext);
-  }
 }
 
 @media not (-moz-proton) {

toolkit/mozapps/extensions/default-theme/manifest.json

@@ -81,10 +81,10 @@
       "button": "--button-bgcolor",
       "button_hover": "--button-hover-bgcolor",
       "button_active": "--button-active-bgcolor",
-      "button_primary": "--buttons-primary-button-bgcolor",
-      "button_primary_hover": "--buttons-primary-button-hover-bgcolor",
-      "button_primary_active": "--buttons-primary-button-active-bgcolor",
-      "button_primary_color": "--buttons-primary-button-color",
+      "button_primary": "--button-primary-bgcolor",
+      "button_primary_hover": "--button-primary-hover-bgcolor",
+      "button_primary_active": "--button-primary-active-bgcolor",
+      "button_primary_color": "--button-primary-color",
       "checkbox_border_color": "--checkbox-border-color",
       "checkbox_unchecked_background": "--checkbox-unchecked-bgcolor",
       "checkbox_unchecked_background_hover": "--checkbox-unchecked-hover-bgcolor",

toolkit/themes/shared/popupnotification.inc.css

@@ -199,16 +199,16 @@ popupnotification {
 }
 
 .panel-footer > button:not([disabled])[default] {
-  color: var(--buttons-primary-button-color, -moz-accent-color-foreground);
-  background-color: var(--buttons-primary-button-bgcolor, -moz-accent-color);
+  color: var(--button-primary-color);
+  background-color: var(--button-primary-bgcolor);
 }
 
 .panel-footer > button:not([disabled])[default]:hover {
-  background-color: var(--buttons-primary-button-hover-bgcolor, color-mix(in srgb, black 10%, -moz-accent-color));
+  background-color: var(--button-primary-hover-bgcolor);
 }
 
 .panel-footer > button:not([disabled])[default]:hover:active {
-  background-color: var(--buttons-primary-button-active-bgcolor, color-mix(in srgb, black 20%, -moz-accent-color));
+  background-color: var(--button-primary-active-bgcolor);
 }
 
 .panel-footer:not(.panel-footer-menulike) > button > .button-box {