Bug 1444987 - Make the border-radius on the badges working again. r=clokep a=jorgk
--- a/mail/components/im/content/badgebutton.xml
+++ b/mail/components/im/content/badgebutton.xml
@@ -14,17 +14,19 @@
extends="chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton"
display="xul:button" role="xul:toolbarbutton">
<content>
<children includes="observes|template|menupopup|panel|tooltip"/>
<xul:stack>
<xul:hbox>
<xul:image class="toolbarbutton-icon" xbl:inherits="validate,src=image,label"/>
</xul:hbox>
- <xul:label class="badgeButton-badge" anonid="badge"/>
+ <xul:box class="badgeButton-badge">
+ <xul:label class="badgeButton-badgeLabel" anonid="badge"/>
+ </xul:box>
</xul:stack>
<xul:label class="toolbarbutton-text" crop="right" flex="1"
xbl:inherits="value=label,accesskey,crop"/>
</content>
<implementation>
<field name="_badgeCount">
0
</field>
--- a/mail/components/im/content/chat.css
+++ b/mail/components/im/content/chat.css
@@ -109,8 +109,12 @@ toolbar[mode="text"] #button-chat {
toolbar[mode="text"] .badgeButton-badge {
margin: 0;
margin-bottom: 3px;
}
#button-chat[showingBadge="true"] > stack > .badgeButton-badge {
display: block;
}
+
+.badgeButton-badgeLabel {
+ margin: 0;
+}
--- a/mail/components/im/content/imconv.xml
+++ b/mail/components/im/content/imconv.xml
@@ -25,19 +25,21 @@
</xul:stack>
<xul:hbox flex="1" class="conv-hbox" mousethrough="always">
<xul:label crop="end" flex="1" mousethrough="always"
anonid="displayname" class="convDisplayName blistDisplayName"
xbl:inherits="value=displayname,status"/>
<xul:label anonid="unreadCount" class="convUnreadCount"
crop="end" mousethrough="never"
xbl:inherits="value=unreadCount"/>
- <xul:label anonid="unreadTargetedCount" class="convUnreadTargetedCount"
- crop="end" mousethrough="never"
- xbl:inherits="value=unreadTargetedCount"/>
+ <xul:box class="convUnreadTargetedCount">
+ <xul:label anonid="unreadTargetedCount" class="convUnreadTargetedCountLabel"
+ crop="end" mousethrough="never"
+ xbl:inherits="value=unreadTargetedCount"/>
+ </xul:box>
<xul:spacer flex="1000000"/>
</xul:hbox>
</content>
<implementation implements="nsIObserver">
<constructor>
<![CDATA[
new MutationObserver(aMutations => {
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -213,16 +213,20 @@ imconv:not(:hover) > .closeConversationB
%else
padding: 2px 7px;
%endif
border-radius: 50px;
margin: 1px 3px;
margin-inline-start: 1ch;
}
+.convUnreadTargetedCountLabel {
+ margin: 0;
+}
+
imcontact[aliasing] .contactDisplayName {
-moz-binding: url("chrome://global/content/bindings/textbox.xml#textbox");
}
.contactStatusText,
.convStatusText {
margin-inline-start: 0;
}