Bug 1699158 - Rename variables related to non-default/non-primary buttons. r=harry

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

browser/themes/addons/proton-dark/manifest.json

@@ -37,9 +37,9 @@
       "sidebar": "#38383D",
       "sidebar_text": "rgb(249, 249, 250)",
       "sidebar_border": "rgba(255, 255, 255, 0.1)",
-      "buttons_secondary": "rgb(43,42,51)",
-      "buttons_secondary_hover": "rgb(82,82,94)",
-      "buttons_secondary_active": "rgb(91,91,102)",
+      "button": "rgb(43,42,51)",
+      "button_hover": "rgb(82,82,94)",
+      "button_active": "rgb(91,91,102)",
       "checkbox_border_color": "rgb(143, 143, 157)",
       "checkbox_unchecked_background": "rgb(43, 42, 51)",
       "checkbox_unchecked_background_hover": "rgb(82, 82, 94)",
@@ -65,9 +65,9 @@
   "theme_experiment": {
     "stylesheet": "experiment.css",
     "colors": {
-      "buttons_secondary": "--buttons-secondary-bgcolor",
-      "buttons_secondary_hover": "--buttons-secondary-hover-bgcolor",
-      "buttons_secondary_active": "--buttons-secondary-active-bgcolor",
+      "button": "--button-bgcolor",
+      "button_hover": "--button-hover-bgcolor",
+      "button_active": "--button-active-bgcolor",
       "checkbox_border_color": "--checkbox-border-color",
       "checkbox_unchecked_background": "--checkbox-unchecked-bgcolor",
       "checkbox_unchecked_background_hover": "--checkbox-unchecked-hover-bgcolor",

browser/themes/addons/proton-light/manifest.json

@@ -37,9 +37,9 @@
       "ntp_background": "#F9F9FA",
       "ntp_text": "rgb(12, 12, 13)",
       "popup_action_color": "rgb(21,20,26)",
-      "buttons_secondary": "rgb(240,240,244)",
-      "buttons_secondary_hover": "rgb(224,224,230)",
-      "buttons_secondary_active": "rgb(207,207,216)",
+      "button": "rgb(240,240,244)",
+      "button_hover": "rgb(224,224,230)",
+      "button_active": "rgb(207,207,216)",
       "panel_hover": "rgb(224,224,230)",
       "panel_active": "rgb(207,207,21)",
       "panel_active_darker": "rgb(191,191,201)",
@@ -56,9 +56,9 @@
     "stylesheet": "experiment.css",
     "colors": {
       "popup_action_color": "--urlbar-popup-action-color",
-      "buttons_secondary": "--buttons-secondary-bgcolor",
-      "buttons_secondary_hover": "--buttons-secondary-hover-bgcolor",
-      "buttons_secondary_active": "--buttons-secondary-active-bgcolor",
+      "button": "--button-bgcolor",
+      "button_hover": "--button-hover-bgcolor",
+      "button_active": "--button-active-bgcolor",
       "urlbar_result_hover": "--urlbar-result-hover-bgcolor"
     },
     "properties": {

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

@@ -9,10 +9,10 @@
     --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);
-    --buttons-secondary-bgcolor: rgb(240,240,244);
-    --buttons-secondary-hover-bgcolor: rgb(224,224,230);
-    --buttons-secondary-active-bgcolor: rgb(207,207,216);
-    --buttons-secondary-color: rgb(21,20,26);
+    --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);
     --buttons-box-shadow: transparent;
 
     --focus-outline-color: var(--buttons-primary-button-bgcolor);

browser/themes/shared/browser.inc.css

@@ -22,10 +22,10 @@
   --short-notification-background: #0250BB;
   --short-notification-gradient: #9059FF;
 
-  --buttons-secondary-bgcolor: color-mix(in srgb, currentColor 13%, transparent);
-  --buttons-secondary-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent);
-  --buttons-secondary-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
-  --buttons-secondary-color: currentColor;
+  --button-bgcolor: color-mix(in srgb, currentColor 13%, transparent);
+  --button-hover-bgcolor: color-mix(in srgb, currentColor 17%, transparent);
+  --button-active-bgcolor: color-mix(in srgb, currentColor 30%, transparent);
+  --button-color: currentColor;
 
   --buttons-destructive-bgcolor: #e22850;
   --buttons-destructive-hover-bgcolor: #c50042;
@@ -38,7 +38,7 @@
 
   --identity-box-margin-inline: 4px;
   --identity-box-label-opacity: .8;
-  --urlbar-box-bgcolor: var(--buttons-secondary-bgcolor);
+  --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%);
 

browser/themes/shared/customizableui/panelUI.inc.css

@@ -779,17 +779,17 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton
 
   #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2 {
     padding: 6px 12px;
-    background-color: var(--buttons-secondary-bgcolor);
+    background-color: var(--button-bgcolor);
     font-size: 11px;
     font-weight: 600;
   }
 
   #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2:hover {
-    background-color: var(--buttons-secondary-hover-bgcolor);
+    background-color: var(--button-hover-bgcolor);
   }
 
   #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2:active {
-    background-color: var(--buttons-secondary-active-bgcolor);
+    background-color: var(--button-active-bgcolor);
   }
 
   :root[fxadisabled=true] #appMenu-fxa-status2,
@@ -1313,7 +1313,7 @@ panelview .toolbarbutton-1,
 #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon,
 #appMenu-fullscreen-button2 > .toolbarbutton-icon {
   -moz-context-properties: fill;
-  fill: var(--buttons-secondary-color);
+  fill: var(--button-color);
 }
 
 #appMenu-zoomReduce-button2 > .toolbarbutton-icon,
@@ -1334,21 +1334,21 @@ panelview .toolbarbutton-1,
 #appMenu-zoomReduce-button2 > .toolbarbutton-icon,
 #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon,
 #appMenu-fullscreen-button2 > .toolbarbutton-icon {
-  background-color: var(--zoom-controls-bgcolor, var(--buttons-secondary-bgcolor, ButtonFace));
+  background-color: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace));
 }
 
 #appMenu-zoomReduce-button2@buttonStateHover@ > .toolbarbutton-icon,
 #appMenu-zoomReset-button2@buttonStateHover@ > .toolbarbutton-text,
 #appMenu-zoomEnlarge-button2@buttonStateHover@ > .toolbarbutton-icon,
 #appMenu-fullscreen-button2@buttonStateHover@ > .toolbarbutton-icon {
-  background-color: var(--buttons-secondary-hover-bgcolor);
+  background-color: var(--button-hover-bgcolor);
 }
 
 #appMenu-zoomReduce-button2@buttonStateActive@ > .toolbarbutton-icon,
 #appMenu-zoomReset-button2@buttonStateActive@ > .toolbarbutton-text,
 #appMenu-zoomEnlarge-button2@buttonStateActive@ > .toolbarbutton-icon,
 #appMenu-fullscreen-button2@buttonStateActive@ > .toolbarbutton-icon {
-  background-color: var(--buttons-secondary-active-bgcolor);
+  background-color: var(--button-active-bgcolor);
 }
 
 #appMenu-zoomReduce-button2@buttonStateFocus@ > .toolbarbutton-icon,
@@ -1857,13 +1857,13 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after {
 }
 
 .subviewradio@buttonStateHoverOrFocus@ {
-  background-color: var(--buttons-secondary-hover-bgcolor);
+  background-color: var(--button-hover-bgcolor);
 }
 
 .subviewradio[selected],
 .subviewradio[selected]:hover,
 .subviewradio@buttonStateActive@ {
-  background-color: var(--buttons-secondary-active-bgcolor);
+  background-color: var(--button-active-bgcolor);
 }
 
 @supports not -moz-bool-pref("browser.proton.enabled") {
@@ -1976,8 +1976,8 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after {
 }
 
 #panic-button-success-closebutton {
-  background-color: var(--buttons-secondary-bgcolor);
-  color: var(--buttons-secondary-color);
+  background-color: var(--button-bgcolor);
+  color: var(--button-color);
   margin: 5px 0 0;
   border: 1px solid transparent;
   border-radius: 4px;
@@ -1987,11 +1987,11 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after {
 }
 
 #panic-button-success-closebutton:hover {
-  background-color: var(--buttons-secondary-hover-bgcolor);
+  background-color: var(--button-hover-bgcolor);
 }
 
 #panic-button-success-closebutton:hover:active {
-  background-color: var(--buttons-secondary-active-bgcolor);
+  background-color: var(--button-active-bgcolor);
 }
 
 @supports not -moz-bool-pref("browser.proton.enabled") {

browser/themes/shared/toolbarbuttons.inc.css

@@ -9,8 +9,8 @@
   --toolbarbutton-outer-padding: 2px;
   --toolbarbutton-inner-padding: 8px;
 
-  --toolbarbutton-hover-background: var(--buttons-secondary-hover-bgcolor);
-  --toolbarbutton-active-background: var(--buttons-secondary-active-bgcolor);
+  --toolbarbutton-hover-background: var(--button-hover-bgcolor);
+  --toolbarbutton-active-background: var(--button-active-bgcolor);
 
   --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent);
 

toolkit/themes/shared/findBar.inc.css

@@ -104,12 +104,12 @@ html|input.findbar-textbox.minimal {
 
 .findbar-find-previous:not([disabled]):hover,
 .findbar-find-next:not([disabled]):hover {
-  background: var(--buttons-secondary-hover-bgcolor, rgba(190,190,190,.2));
+  background: var(--button-hover-bgcolor, rgba(190,190,190,.2));
 }
 
 .findbar-find-previous:not([disabled]):hover:active,
 .findbar-find-next:not([disabled]):hover:active {
-  background: var(--buttons-secondary-active-bgcolor, rgba(23,50,76,.2));
+  background: var(--button-active-bgcolor, rgba(23,50,76,.2));
 }
 
 .findbar-find-previous {

toolkit/themes/shared/menulist.inc.css

@@ -7,8 +7,8 @@
 @supports -moz-bool-pref("browser.proton.enabled") {
 :host(:not([native])) {
   appearance: none;
-  background-color: var(--buttons-secondary-bgcolor, ButtonFace);
-  color: var(--buttons-secondary-color, ButtonText);
+  background-color: var(--button-bgcolor, ButtonFace);
+  color: var(--button-color, ButtonText);
   border-radius: 4px;
   padding: 4px 8px 4px 12px;
   margin: 5px 2px 3px;
@@ -23,11 +23,11 @@
 }
 
 :host(:not([native]):hover) {
-  background-color: var(--buttons-secondary-hover-bgcolor, color-mix(in srgb, currentColor 10%, ButtonFace));
+  background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 10%, ButtonFace));
 }
 
 :host(:not([native]):hover:active) {
-  background-color: var(--buttons-secondary-active-bgcolor, color-mix(in srgb, currentColor 20%, ButtonFace));
+  background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 20%, ButtonFace));
 }
 
 :host(:not([native]):-moz-focusring) {

toolkit/themes/shared/popupnotification.inc.css

@@ -167,11 +167,11 @@ popupnotification {
 }
 
 .panel-footer > button {
-  color: var(--buttons-secondary-color);
+  color: var(--button-color);
 }
 
 .panel-footer:not(.panel-footer-menulike) > button {
-  background-color: var(--buttons-secondary-bgcolor, color-mix(in srgb, currentColor 13%, transparent));
+  background-color: var(--button-bgcolor, color-mix(in srgb, currentColor 13%, transparent));
 }
 
 .panel-footer:not(.panel-footer-menulike) > button[disabled] {
@@ -179,7 +179,7 @@ popupnotification {
 }
 
 .panel-footer > button:not([disabled]):hover {
-  background-color: var(--buttons-secondary-hover-bgcolor, color-mix(in srgb, currentColor 17%, transparent));
+  background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 17%, transparent));
 }
 
 .panel-footer > button:not([disabled]):hover:active {
@@ -187,8 +187,8 @@ popupnotification {
    * We override the colour here because on macOS, buttons default to
    * having :hover:active buttons have color -moz-mac-buttonactivetext
    */
-  color: var(--buttons-secondary-color);
-  background-color: var(--buttons-secondary-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent));
+  color: var(--button-color);
+  background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent));
 }
 
 .panel-footer > button:not([disabled])[default] {