Bug 1512857 - Remove the additional padding in .button-box/.menulist-label-box from common.css buttons/menulists. r=dao
authorRichard Marti <richard.marti@gmail.com>
Wed, 12 Dec 2018 10:12:12 +0100
changeset 450236 eed399e61358541ebab0e313f60c0433be9aea4e
parent 450235 a2df400cb88c79664cd8ba5fcf6b640373a85524
child 450237 641880884f98180856dda37677824e6b959d64b0
push id35193
push userrmaries@mozilla.com
push dateWed, 12 Dec 2018 16:32:59 +0000
treeherdermozilla-central@9954761576ff [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1512857
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1512857 - Remove the additional padding in .button-box/.menulist-label-box from common.css buttons/menulists. r=dao
toolkit/themes/shared/in-content/common.inc.css
toolkit/themes/windows/global/button.css
toolkit/themes/windows/global/in-content/common.css
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -258,22 +258,16 @@ xul|button.primary:not([disabled="true"]
   background-color: var(--in-content-primary-button-background-active);
 }
 
 html|input[type="color"] {
   padding: 6px;
   width: 50px;
 }
 
-xul|button > xul|*.button-box,
-xul|menulist > xul|*.menulist-label-box {
-  padding-right: 10px !important;
-  padding-left: 10px !important;
-}
-
 xul|menulist > xul|*.menulist-label-box > xul|*.menulist-icon[src] {
   margin-inline-end: 5px;
 }
 
 xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker {
   -moz-appearance: none;
   margin: 1px 0;
   margin-inline-start: 10px;
--- a/toolkit/themes/windows/global/button.css
+++ b/toolkit/themes/windows/global/button.css
@@ -48,27 +48,16 @@ button:-moz-focusring {
        the active, disabled, open or checked state, the appearance reverts back
        to the default background. */
     button:-moz-any([default="true"],:hover,:focus):not(:-moz-any(:active,[disabled="true"],[open="true"],[checked="true"])) {
       color: HighlightText;
     }
   }
 }
 
-/* .......... active/open/checked state .......... */
-
-@media (-moz-windows-classic) {
-  button:-moz-any(:hover:active,[open="true"],[checked="true"]):not([disabled="true"]) > .button-box {
-    padding-top: 3px;
-    padding-bottom: 2px;
-    padding-inline-start: 5px;
-    padding-inline-end: 4px;
-  }
-}
-
 /* .......... disabled state .......... */
 
 button[disabled="true"] {
   color: GrayText;
 }
 
 @media (-moz-windows-classic) {
   button[disabled="true"] {
--- a/toolkit/themes/windows/global/in-content/common.css
+++ b/toolkit/themes/windows/global/in-content/common.css
@@ -39,8 +39,13 @@ html|input[type="checkbox"]:-moz-focusri
      border: 2px dotted Highlight;
   }
 }
 
 html|button {
   /* XUL button min-width */
   min-width: 6.3em;
 }
+
+xul|button > xul|*.button-box {
+  padding-right: 0;
+  padding-left: 0;
+}