From 54851950e37ddec77467f3b8deb0be41b17369b8 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Tue, 26 Jan 2021 02:51:24 +0000
Subject: [PATCH] Bug 1688744 - Add some preliminary styles for the Proton
 AppMenu. r=jaws

Differential Revision: https://phabricator.services.mozilla.com/D102977
---
 .../shared/customizableui/panelUI.inc.css     | 51 ++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 1b3e52d5beab3..4b4c0e53c7479 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -26,6 +26,38 @@
 %define appmenuWarningBackgroundColorActiveBrightText hsla(55,100%,50%,.2)
 %define appmenuWarningColorBrightText #F9F9FA
 
+:root {
+  --arrowpanel-menuitem-margin: 0;
+  --arrowpanel-menuitem-padding: 4px 12px;
+  --arrowpanel-menuitem-border-radius: unset;
+
+  --panelview-toolbarbutton-hover-bgcolor: var(--arrowpanel-dimmed);
+  --panelview-toolbarbutton-hover-color: inherit;
+  --panelview-toolbarbutton-active-bgcolor: var(--arrowpanel-dimmed-further);
+  --panelview-toolbarbutton-active-color: inherit;
+}
+
+@supports -moz-bool-pref("browser.proton.appmenu.enabled") {
+:root {
+  --panelview-toolbarbutton-hover-bgcolor: #0250BB;
+  --panelview-toolbarbutton-hover-color: #FFFFFF;
+  --panelview-toolbarbutton-active-bgcolor: #053E94;
+  --panelview-toolbarbutton-active-color: #FFFFFF;
+
+  --arrowpanel-menuitem-margin: 0 8px;
+  --arrowpanel-menuitem-padding: 8px 12px;
+  --arrowpanel-menuitem-border-radius: 4px;
+}
+
+:root[lwt-popup-brighttext] {
+  --panelview-toolbarbutton-hover-bgcolor: #00B4F5;
+  --panelview-toolbarbutton-hover-color: #FFFFFF;
+  --panelview-toolbarbutton-active-bgcolor: #008DEB;
+  --panelview-toolbarbutton-active-color: #FFFFFF;
+}
+
+} /*** END proton ***/
+
 :root:not([uidensity=compact], [chromehidden~="toolbar"]) #PanelUI-button {
   margin-inline-start: 3px;
   border-inline-start: 1px solid;
@@ -1073,9 +1105,10 @@ panelview .toolbarbutton-1,
 .subviewbutton,
 .widget-overflow-list .toolbarbutton-1 {
   appearance: none;
-  margin: 0;
+  margin: var(--arrowpanel-menuitem-margin);
   min-height: 24px;
-  padding: 4px 12px;
+  padding: var(--arrowpanel-menuitem-padding);
+  border-radius: var(--arrowpanel-menuitem-border-radius);
   background-color: transparent;
 }
 
@@ -1132,6 +1165,12 @@ panelview .toolbarbutton-1,
   fill: currentColor;
 }
 
+@supports -moz-bool-pref("browser.proton.appmenu.enabled") {
+.subviewbutton-iconic:not(.subviewbutton-back) > .toolbarbutton-icon {
+  display: none;
+}
+} /*** END proton ***/
+
 /* We don't always display: none this item, and if it has forced width (like above)
  * or margin, that impacts the position of the label. Fix:
  */
@@ -1327,8 +1366,8 @@ menu.subviewbutton@menuStateHover@,
 menuitem.subviewbutton@menuStateHover@,
 .widget-overflow-list .toolbarbutton-1@buttonStateHover@,
 .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateHover@ {
-  color: inherit;
-  background-color: var(--arrowpanel-dimmed);
+  color: var(--panelview-toolbarbutton-hover-color);
+  background-color: var(--panelview-toolbarbutton-hover-bgcolor);
 }
 
 panelview .toolbarbutton-1@buttonStateActive@,
@@ -1338,8 +1377,8 @@ menu.subviewbutton@menuStateActive@,
 menuitem.subviewbutton@menuStateActive@,
 .widget-overflow-list .toolbarbutton-1@buttonStateActive@,
 .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateActive@ {
-  color: inherit;
-  background-color: var(--arrowpanel-dimmed-further);
+  color: var(--panelview-toolbarbutton-active-color);
+  background-color: var(--panelview-toolbarbutton-active-bgcolor);
   box-shadow: 0 1px 0 hsla(210,4%,10%,.03) inset;
 }