Bug 659578 - Remember Password notification is cut off at the bottom.

r=dolske
This commit is contained in:
Marco Bonardo 2011-06-23 14:35:11 +02:00
parent 5194a945ed
commit 04758d0fea
3 changed files with 17 additions and 13 deletions

View File

@ -1305,9 +1305,9 @@
<xul:hbox align="center" flex="1">
<xul:image class="panel-promo-icon"/>
<xul:description anonid="promo-message" class="panel-promo-message" flex="1">
placeholder <xul:description anonid="promo-link"
class="plain text-link inline-link"
onclick="document.getBindingParent(this).onLinkClick();"/>
<xul:description anonid="promo-link"
class="plain text-link inline-link"
onclick="document.getBindingParent(this).onLinkClick();"/>
</xul:description>
</xul:hbox>
<xul:toolbarbutton class="panel-promo-closebutton"
@ -1369,7 +1369,7 @@
<property name="_notificationMessage">
<getter><![CDATA[
return gNavigatorBundle.getFormattedString(
"syncPromoNotification." + this._notificationType + ".label",
"syncPromoNotification." + this._notificationType + ".description",
[this._brandBundle.GetStringFromName("syncBrandShortName")]
);
]]></getter>
@ -1424,12 +1424,15 @@
// HACK: The description element doesn't wrap correctly in panels,
// thus set a width on it, based on the available space, before
// setting its textContent.
// setting its textContent. Then set its height as well, to
// fix wrong height calculation on Linux (bug 659578).
let self = this;
this._panel.addEventListener("popupshown", function (evt) {
this._panel.removeEventListener("popupshown", arguments.callee, true);
this._promomessage.width = this._promomessage.getBoundingClientRect().width;
this._promomessage.firstChild.textContent = this._notificationMessage;
}.bind(this), true);
self._panel.removeEventListener("popupshown", arguments.callee, true);
self._promomessage.width = self._promomessage.getBoundingClientRect().width;
self._promomessage.firstChild.textContent = self._notificationMessage;
self._promomessage.height = self._promomessage.getBoundingClientRect().height;
}, true);
}
]]></body>
</method>

View File

@ -318,8 +318,10 @@ browser.menu.showCharacterEncoding=false
# LOCALIZATION NOTE (syncPromoNotification.bookmarks.label): This appears in
# the add bookmark star panel. %S will be replaced by syncBrandShortName.
syncPromoNotification.bookmarks.label=You can access your bookmarks on all your devices with %S.
# The final space separates this text from the Learn More link.
syncPromoNotification.bookmarks.description=You can access your bookmarks on all your devices with %S.\u0020
# LOCALIZATION NOTE (syncPromoNotification.passwords.label): This appears in
# the remember password panel. %S will be replaced by syncBrandShortName.
syncPromoNotification.passwords.label=You can access your passwords on all your devices with %S.
# The final space separates this text from the Learn More link.
syncPromoNotification.passwords.description=You can access your passwords on all your devices with %S.\u0020
syncPromoNotification.learnMoreLinkText=Learn More

View File

@ -1406,7 +1406,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
.panel-promo-box {
margin: 8px -10px -10px -10px;
padding: 8px 16px;
padding: 8px 10px;
border-top: 1px solid ThreeDShadow;
background-image: -moz-linear-gradient(hsla(0,0%,0%,.15), hsla(0,0%,0%,.08) 6px);
}
@ -1421,7 +1421,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
list-style-image: url("moz-icon://stock/gtk-close?size=menu");
margin-top: 0;
margin-bottom: 0;
-moz-margin-end: -6px;
}
.panel-promo-closebutton > .toolbarbutton-text {