Bug 1418459 - Remove menuitem-iconic-desc-noaccel binding. r=Paolo
MozReview-Commit-ID: 3BjrOyJwBKA
--- a/toolkit/content/widgets/menu.xml
+++ b/toolkit/content/widgets/menu.xml
@@ -235,27 +235,16 @@
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" flex="1" xbl:inherits="value=label,crop,highlightable" crop="right"/>
<xul:label class="menu-iconic-highlightable-text" xbl:inherits="xbl:text=label,crop,highlightable" crop="right"/>
</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>
-
<binding id="menu-iconic"
extends="chrome://global/content/bindings/menu.xml#menu-base">
<content>
<xul:hbox class="menu-iconic-left" align="center" pack="center">
<xul:image class="menu-iconic-icon" xbl:inherits="src=image"/>
</xul:hbox>
<xul:label class="menu-iconic-text" flex="1" xbl:inherits="value=label,accesskey,crop,highlightable" crop="right"/>
<xul:label class="menu-iconic-highlightable-text" xbl:inherits="xbl:text=label,crop,accesskey,highlightable" crop="right"/>
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -376,20 +376,16 @@ menubar > menu:empty {
menuitem {
-moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem");
}
menuitem.menuitem-iconic {
-moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
}
-menuitem[description] {
- -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic-desc-noaccel");
-}
-
menuitem[type="checkbox"],
menuitem[type="radio"] {
-moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
}
menuitem.menuitem-non-iconic {
-moz-binding: url("chrome://global/content/bindings/menu.xml#menubutton-item");
}
--- a/toolkit/themes/linux/global/menu.css
+++ b/toolkit/themes/linux/global/menu.css
@@ -104,22 +104,16 @@ menulist > menupopup > menu {
font-weight: inherit;
}
menucaption > .menu-iconic-text {
margin-inline-start: 0 !important;
font-weight: bold;
}
-.menu-description {
- font-style: italic;
- color: GrayText;
- margin-inline-start: 1ex !important;
-}
-
.menu-accel,
.menu-iconic-accel {
margin-top: 0px !important;
margin-bottom: 0px !important;
margin-inline-start: 7px !important;
color: inherit;
}
--- a/toolkit/themes/osx/global/menu.css
+++ b/toolkit/themes/osx/global/menu.css
@@ -38,22 +38,16 @@ menuitem[_moz-menuactive="true"][disable
font-weight: inherit;
color: inherit;
}
menucaption > .menu-iconic-text {
font-weight: bold;
}
-.menu-description {
- font-style: italic;
- color: -moz-mac-menutextdisable;
- margin-inline-start: 1ex !important;
-}
-
.menu-iconic-icon {
height: 16px;
margin-top: -2px;
margin-bottom: -2px;
margin-inline-end: 5px;
/* Empty icons shouldn't take up room, so we need to compensate
* the 5px margin-end with a negative margin-start.
*/
--- a/toolkit/themes/windows/global/menu.css
+++ b/toolkit/themes/windows/global/menu.css
@@ -69,22 +69,16 @@ menuitem.spell-suggestion {
padding-inline-end: 2px;
}
menucaption > .menu-iconic-text {
font-weight: bold;
padding-inline-start: 0 !important;
}
-.menu-description {
- font-style: italic;
- color: GrayText;
- margin-inline-start: 1ex !important;
-}
-
.menu-accel,
.menu-iconic-accel {
color: inherit;
margin-inline-start: 0.74em !important;
margin-inline-end: 1.35em !important;
}
.menu-iconic-left {