Bug 1861648 - Use less !important in menu styling. r=desktop-theme-re…

…viewers,dao

It just forces everything that needs to override it to be !important,
which is not great.

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

browser/themes/linux/browser.css

@@ -250,12 +250,6 @@ menuitem.bookmark-item {
   margin-bottom: -10px;
 }
 
-#context-navigation > .menuitem-iconic > .menu-iconic-left {
-  /* override toolkit/themes/linux/global/menu.css */
-  padding-inline-end: 0 !important;
-  margin-inline-end: 0 !important;
-}
-
 /* The button box must appear on top of the navigator-toolbox in order for
  * click and hover mouse events to work properly for the button in the restored
  * window state. Otherwise, elements in the navigator-toolbox, like the menubar,

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

@@ -273,18 +273,18 @@ toolbarseparator + .panel-subview-body {
   .menu-right {
     /* Reset every spacing and appearance set by the platforms' menu.css
      * and set the ones we need in the following rules. */
-    margin: 0 !important;
-    padding: 0 !important;
-    appearance: none !important;
+    margin: 0;
+    padding: 0;
+    appearance: none;
   }
 
   :is(.menu-iconic, .menuitem-iconic) > .menu-iconic-left {
-    margin-inline-end: 8px !important;
+    margin-inline-end: 8px;
   }
 
   .menu-accel,
   .menu-iconic-accel {
-    margin-inline-start: 16px !important;
+    margin-inline-start: 16px;
   }
 
   menu > .menu-right {
@@ -310,7 +310,7 @@ toolbarseparator + .panel-subview-body {
 }
 
 :is(.toolbar-menupopup, .toolbar-menupopup menupopup)[emptyplacesresult] > menuitem > .menu-accel-container > .menu-accel {
-  margin: 0 !important;
+  margin: 0;
 }
 
 #confirmation-hint {

toolkit/themes/linux/global/menu.css

@@ -44,23 +44,21 @@ menulist > menupopup > :is(menuitem, menucaption, menu) {
 
 .menu-text,
 .menu-iconic-left,
-.menu-iconic-text {
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
-  margin-inline-start: 0 !important;
-  margin-inline-end: 2px !important;
+.menu-iconic-text,
+.menubar-left {
+  margin-block: 0;
+  margin-inline: 0 2px;
 }
 
 .menu-text {
   /* This is (18 + the size of end-padding on .menu-iconic-left)px */
-  margin-inline-start: 21px !important;
+  margin-inline-start: 21px;
 }
 
 .menu-accel,
 .menu-iconic-accel {
-  margin-top: 0 !important;
-  margin-bottom: 0 !important;
-  margin-inline-start: 7px !important;
+  margin-block: 0;
+  margin-inline-start: 7px;
 }
 
 .menu-accel-container {
@@ -70,23 +68,16 @@ menulist > menupopup > :is(menuitem, menucaption, menu) {
 .menu-iconic-left {
   min-width: 16px;
   /* We can only hardcode this, to make the default GTK icon<->label spacing */
-  padding-inline-end: 3px !important;
+  padding-inline-end: 3px;
 }
 
 .menu-iconic-icon {
   width: 16px;
   height: 16px;
 }
 
-.menubar-left {
-  margin-top: 0;
-  margin-bottom: 0;
-  margin-inline-start: 0;
-  margin-inline-end: 2px;
-}
-
 .menubar-text {
-  margin: 0 1px !important;
+  margin: 0 1px;
 }
 
 menulist > menupopup > :is(menuitem, menucaption, menu) > .menu-iconic-left {

toolkit/themes/osx/global/menu.css

@@ -12,7 +12,7 @@
 .menu-iconic-text,
 .menu-accel,
 .menu-iconic-accel {
-  margin: 0 !important;
+  margin: 0;
 }
 
 .menu-iconic-icon {
@@ -68,7 +68,7 @@ menubar > menu[_moz-menuactive="true"][open="true"] {
 }
 
 .menubar-text {
-  margin: 0 1px !important;
+  margin: 0 1px;
 }
 
 /* menu/menuitems in popups */

toolkit/themes/windows/global/menu.css

@@ -22,13 +22,13 @@ menubar > menu:-moz-window-inactive {
 .menu-iconic-accel,
 .menu-text,
 .menu-iconic-text {
-  margin: 0 !important;
+  margin: 0;
   padding: 1px 0;
 }
 
 .menu-accel,
 .menu-iconic-accel {
-  margin-inline: 0.74em 1.35em !important;
+  margin-inline: 0.74em 1.35em;
 }
 
 .menu-iconic-icon {
@@ -69,7 +69,7 @@ menubar > menu:-moz-lwtheme[_moz-menuactive="true"]:not([disabled="true"]) {
 /* ..... internal content .... */
 
 .menubar-text {
-  margin: 1px 6px 2px !important;
+  margin: 1px 6px 2px;
 }
 
 /* ::::: menu/menuitems in menulist popups ::::: */
@@ -102,7 +102,7 @@ menulist > menupopup > menuitem[_moz-menuactive="true"][disabled="true"] {
 }
 
 menulist > menupopup > :is(menuitem, menucaption):not(.menuitem-iconic) > .menu-iconic-text {
-  margin: 0 !important;
+  margin: 0;
 }
 
 /* ::::: checkbox and radio menuitems ::::: */