Bug 1629084 - Apply the themeableDialog menupopup rules menubuttons too. r=aleca
authorRichard Marti <richard.marti@gmail.com>
Sat, 11 Apr 2020 13:53:37 +0300
changeset 38776 14c42745d27ce2b544126b2d6c2867ce1fa76e33
parent 38775 055a8b65c4af34dd1db68469755105ee4ae926e1
child 38777 4759434bf8ce08e0d31c5dbc3d8aa2991af4b5d4
push id401
push userclokep@gmail.com
push dateMon, 01 Jun 2020 20:41:59 +0000
reviewersaleca
bugs1629084
Bug 1629084 - Apply the themeableDialog menupopup rules menubuttons too. r=aleca
mail/themes/linux/mail/themeableDialog.css
mail/themes/osx/mail/themeableDialog.css
mail/themes/shared/mail/themeableDialog.css
--- a/mail/themes/linux/mail/themeableDialog.css
+++ b/mail/themes/linux/mail/themeableDialog.css
@@ -6,16 +6,26 @@
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 button > .button-box {
   -moz-appearance: none;
   padding-block: 4px;
 }
 
+.button-menu-dropmarker {
+  -moz-appearance: none;
+  padding: 0;
+  border: none;
+  background-color: transparent;
+  list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
 menulist::part(dropmarker) {
   display: -moz-box;
 }
 
 html|input {
   padding: 4px;
 }
 
@@ -33,17 +43,22 @@ menulist[is="menulist-editable"][editabl
   width: initial;
   min-width: 0;
   margin-block: 0;
   margin-inline-end: 3px;
 }
 
 menulist menupopup menu,
 menulist menupopup menuitem {
-  padding-block: 3px;
+  padding-block: 5px;
+}
+
+button menupopup menu,
+button menupopup menuitem {
+  padding: 5px;
 }
 
 .menu-right {
   height: 1em;
   margin-inline-end: 3px;
 }
 
 .menu-right:-moz-locale-dir(ltr) {
--- a/mail/themes/osx/mail/themeableDialog.css
+++ b/mail/themes/osx/mail/themeableDialog.css
@@ -5,16 +5,20 @@
 @import url("chrome://messenger/skin/shared/themeableDialog.css");
 
 @namespace html url("http://www.w3.org/1999/xhtml");
 
 button > .button-box {
   padding-block: 3px;
 }
 
+.button-menu-dropmarker {
+  display: -moz-box;
+}
+
 menulist {
   padding-inline-end: 0;
 }
 
 menulist::part(dropmarker) {
   display: -moz-box;
 }
 
--- a/mail/themes/shared/mail/themeableDialog.css
+++ b/mail/themes/shared/mail/themeableDialog.css
@@ -178,49 +178,58 @@ menulist[is="menulist-editable"][editabl
 menulist menupopup,
 menupopup[is="folder-menupopup"] {
   -moz-appearance: none;
   border: 1px solid var(--box-border-color);
   border-radius: 2px;
   background-color: var(--box-background-color);
 }
 
+button menupopup menu,
+button menupopup menuitem,
 menulist menupopup menu,
 menulist menupopup menuitem {
   -moz-appearance: none;
   color: var(--box-text-color);
 }
 
+button menupopup > menu:not([disabled="true"])[_moz-menuactive="true"],
+button menupopup > menuitem:not([disabled="true"])[_moz-menuactive="true"],
 menulist menupopup > menu:not([disabled="true"])[_moz-menuactive="true"],
 menulist menupopup > menuitem:not([disabled="true"])[_moz-menuactive="true"] {
   color: var(--popup-item-hover-text);
   background-color: var(--popup-item-hover);
 }
 
+button menupopup > menu:not([disabled="true"])[selected="true"],
+button menupopup > menuitem:not([disabled="true"])[selected="true"],
 menulist menupopup > menu:not([disabled="true"])[selected="true"],
 menulist menupopup > menuitem:not([disabled="true"])[selected="true"] {
   color: var(--popup-selected-text);
   background-color: var(--popup-item-selected);
 }
 
+button menupopup > menu[disabled="true"],
+button menupopup > menuitem[disabled="true"],
 menulist menupopup > menu[disabled="true"],
 menulist menupopup > menuitem[disabled="true"] {
   color: #999;
   /* override the [_moz-menuactive="true"] background color from
      global/menu.css */
   background-color: transparent;
 }
 
 .menu-right {
   -moz-appearance: none;
   -moz-context-properties: fill;
   list-style-image: url("chrome://messenger/skin/icons/back-12.svg");
   fill: currentColor;
 }
 
+button menupopup menuseparator,
 menulist menupopup menuseparator {
   -moz-appearance: none;
   margin: 0;
   padding: 0;
   border-top: 1px solid var(--box-border-color);
   border-bottom: none;
 }