Bug 1416502 - Remove the menulist-compact XBL binding from aw-menulist. r=alta88
--- a/mail/components/compose/content/messengercompose.xul
+++ b/mail/components/compose/content/messengercompose.xul
@@ -1083,17 +1083,17 @@
disableonsend="true">
<listcols>
<listcol id="typecol-addressingWidget" style="&headersSpace.style;"/>
<listcol id="textcol-addressingWidget" flex="1"/>
</listcols>
<listitem class="addressingWidgetItem" allowevents="true">
<listcell class="addressingWidgetCell" align="stretch">
<menulist id="addressCol1#1" disableonsend="true"
- class="aw-menulist menulist-compact" flex="1"
+ class="aw-menulist" flex="1"
oncommand="onAddressColCommand(this.id);">
<menupopup>
<menuitem value="addr_to" label="&toAddr.label;"/>
<menuitem value="addr_cc" label="&ccAddr.label;"/>
<menuitem value="addr_bcc" label="&bccAddr.label;"/>
<menuitem value="addr_reply" label="&replyAddr.label;"/>
<menuitem value="addr_newsgroups" label="&newsgroupsAddr.label;"/>
<menuitem value="addr_followup" label="&followupAddr.label;"/>
--- a/mail/themes/linux/mail/compose/messengercompose.css
+++ b/mail/themes/linux/mail/compose/messengercompose.css
@@ -319,17 +319,16 @@ treechildren::-moz-tree-image(subscribed
.textbox-addressingWidget[focused="true"],
.textbox-addressingWidget:hover {
background-color: -moz-field;
border-color: var(--toolbarbutton-hover-bordercolor) !important;
}
.aw-menulist {
- -moz-binding: url("chrome://messenger/content/messengercompose/menulistCompactBindings.xml#menulist-compact");
font: inherit;
margin: 0;
margin-inline-start: 5px;
margin-inline-end: 7px;
padding-inline-end: 0;
outline: 1px solid transparent;
outline-offset: -3px;
}
@@ -358,17 +357,17 @@ treechildren::-moz-tree-image(subscribed
margin: 0 3px !important;
text-align: end;
}
.aw-menulist > .menulist-label-box > .menulist-icon {
margin-inline-start: 2px;
}
-.aw-menulist > dropmarker {
+.aw-menulist > .menulist-dropmarker {
height: 11px;
}
#composeContentBox {
background-color: -moz-dialog;
box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.4) inset;
/*
--- a/mail/themes/osx/mail/compose/messengercompose.css
+++ b/mail/themes/osx/mail/compose/messengercompose.css
@@ -388,17 +388,16 @@ treechildren::-moz-tree-image(subscribed
.textbox-addressingWidget[focused="true"],
.textbox-addressingWidget:hover {
background-color: white;
background-image: none;
border-color: #C6C6C6 !important;
}
.aw-menulist {
- -moz-binding: url("chrome://messenger/content/messengercompose/menulistCompactBindings.xml#menulist-compact");
-moz-appearance: none;
-moz-box-align: center;
-moz-box-pack: center;
min-height: 18px;
margin: 1px;
margin-inline-end: 4px;
background-color: rgba(200, 200, 200, .4) !important;
border: rgba(149, 165, 166, .3) 1px solid;
@@ -431,16 +430,20 @@ treechildren::-moz-tree-image(subscribed
.aw-menulist > .menulist-label-box > .menulist-label {
font: icon;
margin: 1px 1px 0 !important;
font-size: 10px;
text-align: end;
}
+.aw-menulist > .menulist-dropmarker {
+ display: none;
+}
+
/* ::::: compose toolbar sizer ::::: */
#compose-toolbar-sizer {
position: relative;
margin-top: -2px;
min-height: 7px;
background-image: url("chrome://messenger/skin/messengercompose/osx-noise.png");
background-color: rgb(242, 242, 242);
--- a/mail/themes/windows/mail/compose/messengercompose.css
+++ b/mail/themes/windows/mail/compose/messengercompose.css
@@ -231,31 +231,34 @@
}
.addressingWidgetCell:first-child,
.dummy-row-cell:first-child {
border-bottom-color: transparent;
}
.aw-menulist {
- -moz-binding: url("chrome://messenger/content/messengercompose/menulistCompactBindings.xml#menulist-compact");
-moz-appearance: none;
-moz-box-align: center;
-moz-box-pack: center;
color: ButtonText;
}
.aw-menulist:-moz-focusring:not([open="true"]) > .menulist-label-box {
border: 1px dotted;
}
.aw-menulist > .menulist-label-box {
margin: 0;
}
+.aw-menulist > .menulist-dropmarker {
+ display: none;
+}
+
/* ::::: format toolbar ::::: */
#FormatToolbox {
-moz-appearance: none;
}
#FontFaceSelect {
max-width: 35ch;
@@ -887,16 +890,21 @@ treechildren::-moz-tree-image(subscribed
.aw-menulist:hover {
background-color: rgba(128, 128, 128, .45);
}
.aw-menulist:-moz-window-inactive {
opacity: .7;
}
+
+ .aw-menulist:focus:not([open="true"]) > .menulist-label-box {
+ background-color: inherit;
+ color: inherit;
+ }
}
.aw-menulist > .menulist-label-box {
margin: -1px 0;
}
.aw-menulist > .menulist-label-box > .menulist-icon {
margin-inline-start: 2px;
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -100,17 +100,19 @@ messenger.jar:
content/messenger/searchWidgets.xml (base/search/content/searchWidgets.xml)
content/messenger/viewLog.xul (base/search/content/viewLog.xul)
content/messenger/viewLog.js (base/search/content/viewLog.js)
content/messenger/messengercompose/askSendFormat.js (compose/content/askSendFormat.js)
content/messenger/messengercompose/askSendFormat.xul (compose/content/askSendFormat.xul)
content/messenger/messengercompose/sendProgress.xul (compose/content/sendProgress.xul)
content/messenger/messengercompose/sendProgress.js (compose/content/sendProgress.js)
content/messenger/messengercompose/mailComposeEditorOverlay.xul (compose/content/mailComposeEditorOverlay.xul)
+#ifndef MOZ_THUNDERBIRD
content/messenger/messengercompose/menulistCompactBindings.xml (compose/content/menulistCompactBindings.xml)
+#endif
content/messenger/importDialog.js (import/content/importDialog.js)
* content/messenger/importDialog.xul (import/content/importDialog.xul)
content/messenger/fieldMapImport.xul (import/content/fieldMapImport.xul)
content/messenger/fieldMapImport.js (import/content/fieldMapImport.js)
content/messenger/downloadheaders.js (news/content/downloadheaders.js)
content/messenger/downloadheaders.xul (news/content/downloadheaders.xul)
content/messenger/markByDate.js (base/content/markByDate.js)
content/messenger/markByDate.xul (base/content/markByDate.xul)