Bug 1417198 - Fix TB after landing of
bug 1416368: Remove unused statusbarpanel-* bindings. r=jorgk
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -3482,17 +3482,19 @@
#endif
</toolbar>
<toolbarset id="customToolbars" context="toolbar-context-menu"/>
</toolbox>
<statusbar class="chromeclass-status" id="status-bar">
<hbox insertbefore="unreadMessageCount" id="statusTextBox" ondblclick="openActivityMgr();" flex="1">
- <statusbarpanel id="offline-status" class="statusbarpanel-iconic" oncommand="MailOfflineMgr.toggleOfflineStatus();"/>
+ <statusbarpanel>
+ <toolbarbutton id="offline-status" oncommand="MailOfflineMgr.toggleOfflineStatus();"/>
+ </statusbarpanel>
<statusbarpanel id="statusText" label="&statusText.label;" flex="1"/>
<statusbarpanel class="statusbarpanel-progress" collapsed="true" id="statusbar-progresspanel">
<progressmeter class="progressmeter-statusbar" id="statusbar-icon" mode="normal" value="0"/>
</statusbarpanel>
<statusbarpanel class="statusbarpanel-progress"
id="quotaPanel" hidden="true">
<stack>
<progressmeter class="progressmeter-statusbar"
--- a/mail/extensions/smime/content/msgCompSMIMEOverlay.xul
+++ b/mail/extensions/smime/content/msgCompSMIMEOverlay.xul
@@ -60,19 +60,23 @@
accesskey="&menu_securityStatus.accesskey;"
oncommand="setNextCommand('show');"/>
</menupopup>
</toolbarbutton>
</toolbarpalette>
<statusbar id="status-bar">
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic" collapsed="true"
- id="signing-status" oncommand="showMessageComposeSecurityStatus();"/>
+ id="signing-status" oncommand="showMessageComposeSecurityStatus();">
+ <image/>
+ </statusbarpanel>
<statusbarpanel insertbefore="offline-status" class="statusbarpanel-iconic" collapsed="true"
- id="encryption-status" oncommand="showMessageComposeSecurityStatus();"/>
+ id="encryption-status" oncommand="showMessageComposeSecurityStatus();">
+ <image/>
+ </statusbarpanel>
</statusbar>
<commandset id="composeCommands">
<command id="cmd_viewSecurityStatus" oncommand="showMessageComposeSecurityStatus();"/>
</commandset>
<menupopup id="menu_View_Popup">
<menuseparator id="viewMenuBeforeSecurityStatusSeparator"/>
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -577,16 +577,20 @@ treechildren::-moz-tree-cell-text {
/* Fix to show the menulist-dropmarker under newer GTK3 versions */
menulist[editable="true"] > .menulist-dropmarker {
min-width: 2em;
}
/* Status panel */
+.statusbarpanel-iconic {
+ padding: 0 1px;
+}
+
.statuspanel-label {
margin: 0;
padding: 2px 4px;
background-color: -moz-dialog;
border: 1px none ThreeDShadow;
border-top-style: solid;
color: -moz-dialogText;
text-shadow: none;
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -351,17 +351,17 @@ toolbar[mode="icons"] .toolbarbutton-1 >
#offline-status[offline="true"] {
list-style-image: url("chrome://messenger/skin/icons/offline@2x.png");
}
#offline-status {
list-style-image: url("chrome://messenger/skin/icons/online@2x.png");
}
- #offline-status > .statusbarpanel-icon {
+ #offline-status > .toolbarbutton-icon {
width: 16px;
height: 16px;
}
}
/* ::::: directional button icons ::::: */
.up {
@@ -496,16 +496,20 @@ button[type="menu-button"] > button {
}
button[type="menu-button"] > dropmarker {
margin-inline-end: -2px;
}
/* Status panel */
+.statusbarpanel-iconic {
+ padding: 0;
+}
+
.statuspanel-label {
margin: 0;
padding: 2px 4px;
background-color: #f9f9fa;
border: 1px none #ddd;
border-top-style: solid;
color: #444;
text-shadow: none;
--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@@ -50,23 +50,24 @@ toolbar[printpreview="true"] {
#status-bar:-moz-lwtheme {
background-color: var(--toolbar-bgcolor);
color: var(--toolbar-color, inherit);
}
/* ::::: online/offline icons ::::: */
-#offline-status[offline="true"] {
- list-style-image: url("chrome://messenger/skin/icons/offline.png");
-}
-
#offline-status {
padding: 0 2px;
list-style-image: url("chrome://messenger/skin/icons/online.png");
+ -moz-appearance: none;
+}
+
+#offline-status[offline="true"] {
+ list-style-image: url("chrome://messenger/skin/icons/offline.png");
}
/* ::::: Notifications ::::: */
notification {
padding-bottom: 2px;
}
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -453,16 +453,20 @@ menulist > menupopup:not([type="folder"]
#task-addition-box {
border-top: none;
background-color: -moz-dialog;
}
}
/* Status panel */
+.statusbarpanel-iconic {
+ padding: 0 1px;
+}
+
.statuspanel-label {
margin: 0;
padding: 2px 4px;
background-color: -moz-dialog;
border: 1px none ThreeDLightShadow;
border-top-style: solid;
color: -moz-dialogText;
text-shadow: none;