Bug 1437315 - Restore the "menuitem-iconic-desc-noaccel" binding after the removal in bug 1418459. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Sat, 10 Feb 2018 21:35:02 +0100
changeset 31081 dbaae0514e5e5f7e855b4bd028a679b21a8c9eb9
parent 31080 9b23f29d39df9143fb0854e9883a25c0ca615176
child 31082 42bf9c98f0865fed58eaab2f753b88a627c3c9b7
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersjorgk
bugs1437315, 1418459
Bug 1437315 - Restore the "menuitem-iconic-desc-noaccel" binding after the removal in bug 1418459. r=jorgk
mail/base/content/bindings.css
mail/base/content/mailWidgets.xml
mail/themes/linux/mail/compose/messengercompose.css
mail/themes/osx/mail/compose/messengercompose.css
mail/themes/windows/mail/compose/messengercompose.css
--- a/mail/base/content/bindings.css
+++ b/mail/base/content/bindings.css
@@ -23,16 +23,20 @@ toolbar[type="menubar"][autohide="true"]
   -moz-binding: url("chrome://messenger/content/toolbar.xml#toolbar-menubar-autohide");
 }
 %endif
 
 menulist[type="description"] {
   -moz-binding: url("chrome://messenger/content/mailWidgets.xml#menulist-description");
 }
 
+menuitem[description] {
+  -moz-binding: url("chrome://messenger/content/mailWidgets.xml#menuitem-iconic-desc-noaccel");
+}
+
 datepicker[type="popup"] {
   -moz-binding: url('chrome://messenger/content/datetimepicker.xml#datepicker-popup');
 }
 
 datepicker[type="grid"] {
   -moz-binding: url('chrome://messenger/content/datetimepicker.xml#datepicker-grid');
 }
 
--- a/mail/base/content/mailWidgets.xml
+++ b/mail/base/content/mailWidgets.xml
@@ -2858,9 +2858,20 @@
         <xul:image class="menulist-icon" xbl:inherits="src=image,src"/>
         <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
         <xul:label class="menulist-label menulist-description" xbl:inherits="value=description" crop="right" flex="10000"/>
       </xul:hbox>
       <xul:dropmarker class="menulist-dropmarker" type="menu" xbl:inherits="disabled,open"/>
       <children includes="menupopup"/>
     </content>
   </binding>
+
+  <binding id="menuitem-iconic-desc-noaccel" extends="chrome://global/content/bindings/menu.xml#menuitem">
+    <content>
+      <xul:hbox class="menu-iconic-left" align="center" pack="center"
+                xbl:inherits="selected,disabled,checked">
+        <xul:image class="menu-iconic-icon" xbl:inherits="src=image,validate,src"/>
+      </xul:hbox>
+      <xul:label class="menu-iconic-text" xbl:inherits="value=label,accesskey,crop" crop="right" flex="1"/>
+      <xul:label class="menu-iconic-text menu-description" xbl:inherits="value=description" crop="right" flex="10000"/>
+    </content>
+  </binding>
 </bindings>
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -466,16 +466,22 @@ menulist:-moz-locale-dir(rtl) > .menulis
   display: none;
 }
 
 #msgIdentityPopup > menuitem[_moz-menuactive="true"] > .menu-description {
   color: HighlightText;
   opacity: .7;
 }
 
+.menu-description {
+  font-style: italic;
+  color: GrayText;
+  margin-inline-start: 1ex !important;
+}
+
 .menulist-description {
   font-style: italic;
   color: GrayText;
   margin-inline-start: 1ex !important;
 }
 
 /* ::::: format toolbar ::::: */
 
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -208,16 +208,22 @@ toolbar[nowindowdrag="true"] {
   margin-inline-start: initial;
 }
 
 #msgIdentityPopup > menuitem[_moz-menuactive="true"] > .menu-description {
   color: HighlightText;
   opacity: .7;
 }
 
+.menu-description {
+  font-style: italic;
+  color: GrayText;
+  margin-inline-start: 1ex !important;
+}
+
 .menulist-description {
   font-style: italic;
   color: GrayText;
   margin-inline-start: 1ex !important;
 }
 
 #addresses-box {
   margin: 4px 6px;
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -112,16 +112,22 @@
   }
 }
 
 #msgIdentityPopup > menuitem[_moz-menuactive="true"] > .menu-description {
   color: HighlightText;
   opacity: .7;
 }
 
+.menu-description {
+  font-style: italic;
+  color: GrayText;
+  margin-inline-start: 1ex !important;
+}
+
 .menulist-description {
   font-style: italic;
   color: GrayText;
   margin-inline-start: 1ex !important;
 }
 
 /* ::::: attachment reminder ::::: */