Bug 1468080 - Clean up menulist icon and label spacing on Windows. r=jaws
authorDão Gottwald <dao@mozilla.com>
Thu, 19 Jul 2018 14:39:56 +0200
changeset 427491 694fd83d0e639a602d552760e38f11b2b0cbc428
parent 427490 b5b413fbb173a909ab5d2e7e808ee8162d5e5b96
child 427492 e56a701fc960ad035011da615ec13907d4f693a1
push id34306
push usercsabou@mozilla.com
push dateFri, 20 Jul 2018 21:41:18 +0000
treeherdermozilla-central@d6a5e8aea651 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1468080
milestone63.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 1468080 - Clean up menulist icon and label spacing on Windows. r=jaws MozReview-Commit-ID: 2GOtaeMqPUz
browser/themes/osx/places/editBookmark.css
toolkit/content/widgets/menulist.xml
toolkit/themes/windows/global/menulist.css
--- a/browser/themes/osx/places/editBookmark.css
+++ b/browser/themes/osx/places/editBookmark.css
@@ -18,20 +18,16 @@
 }
 
 .folder-icon {
   list-style-image: url("chrome://browser/skin/places/folder.svg") !important;
   -moz-context-properties: fill;
   fill: currentColor;
 }
 
-.menulist-icon {
-  margin: 0 !important;
-}
-
 /**** expanders ****/
 
 .expander-up,
 .expander-down {
   margin: 0 4px 1px 8px;
   padding: 0;
 }
 
--- a/toolkit/content/widgets/menulist.xml
+++ b/toolkit/content/widgets/menulist.xml
@@ -9,17 +9,17 @@
    xmlns:html="http://www.w3.org/1999/xhtml"
    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:xbl="http://www.mozilla.org/xbl">
 
   <binding id="menulist" display="xul:menu"
            extends="chrome://global/content/bindings/general.xml#basecontrol">
     <content sizetopopup="pref">
       <xul:hbox class="menulist-label-box" flex="1">
-        <xul:image class="menulist-icon" xbl:inherits="src=image,src"/>
+        <xul:image class="menulist-icon" xbl:inherits="src=image"/>
         <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey,highlightable" crop="right" flex="1"/>
         <xul:label class="menulist-highlightable-label" xbl:inherits="xbl:text=label,crop,accesskey,highlightable" crop="right" flex="1"/>
       </xul:hbox>
       <xul:dropmarker class="menulist-dropmarker" type="menu" xbl:inherits="disabled,open"/>
       <children includes="menupopup"/>
     </content>
 
     <handlers>
--- a/toolkit/themes/windows/global/menulist.css
+++ b/toolkit/themes/windows/global/menulist.css
@@ -16,31 +16,23 @@ menulist {
   margin: 2px 4px;
   color: -moz-FieldText;
   text-shadow: none;
 }
 
 .menulist-label-box {
   -moz-box-align: center;
   -moz-box-pack: center;
-  margin: 1px;
   border: 1px solid transparent;
   background-color: transparent;
   color: inherit;
 }
 
-.menulist-icon[src] {
-  margin: 0px 2px 0px 2px;
-}
-
 .menulist-label {
-  margin-top: 0 !important;
-  margin-inline-end: 0 !important;
-  margin-bottom: 0 !important;
-  margin-inline-start: 1px !important;
+  margin: 0 3px !important;
 }
 
 /* ..... focused state ..... */
 
 menulist:focus:not([open="true"]) > .menulist-label-box {
   background-color: Highlight;
   color: HighlightText;
 }
@@ -74,25 +66,20 @@ html|*.menulist-editable-input {
 }
 
 @media (-moz-windows-default-theme) {
   .menulist-label-box {
     background-color: transparent !important;
     color: inherit !important;
   }
 
+  .menulist-icon,
   .menulist-label {
     margin-top: -1px !important;
     margin-bottom: -1px !important;
-    margin-inline-start: 0 !important;
   }
 
   menulist:not([editable="true"]) > .menulist-dropmarker {
     margin-top: -2px;
     margin-inline-start: 3px;
     margin-inline-end: -3px;
   }
-
-  .menulist-icon {
-    margin-top: -1px;
-    margin-bottom: -1px;
-  }
 }