Bug 1468671 - Enable identity popup headlines to span multiple lines. r=Paolo
MozReview-Commit-ID: 8Y3Pql7n2U5
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -52,25 +52,23 @@
oncommand="gIdentityHandler.showSecuritySubView();"/>
</hbox>
<!-- Tracking Protection Section -->
<hbox id="tracking-protection-container"
class="identity-popup-section"
when-connection="not-secure secure secure-ev secure-cert-user-overridden file">
<vbox id="tracking-protection-content" flex="1">
- <hbox class="identity-popup-preferences-button-container">
+ <hbox>
<label id="tracking-protection-label-on"
class="identity-popup-headline"
- crop="end"
- value="&trackingProtection.on;" />
+ flex="1">&trackingProtection.on;</label>
<label id="tracking-protection-label-off"
class="identity-popup-headline"
- crop="end"
- value="&trackingProtection.off;" />
+ flex="1">&trackingProtection.off;</label>
<toolbarbutton id="tracking-protection-preferences-button"
class="identity-popup-preferences-button subviewbutton"
tooltiptext="&trackingProtection.tooltip;"
oncommand="TrackingProtection.openPreferences('identityPopup-TP-preferencesButton');" />
</hbox>
<description id="tracking-blocked"
crop="end">&trackingProtection.detectedBlocked3;</description>
@@ -103,19 +101,20 @@
oncommand="TrackingProtection.enableForCurrentPage();" />
</vbox>
</hbox>
<!-- Permissions Section -->
<hbox class="identity-popup-section"
when-connection="not-secure secure secure-ev secure-cert-user-overridden file extension">
<vbox id="identity-popup-permissions-content" flex="1">
- <hbox class="identity-popup-preferences-button-container">
+ <hbox>
<label id="identity-popup-permissions-headline"
class="identity-popup-headline"
+ flex="1"
value="&identity.permissions;"/>
<toolbarbutton id="identity-popup-permission-preferences-button"
class="identity-popup-preferences-button subviewbutton"
tooltiptext="&identity.permissionsPreferences.tooltip;"
oncommand="gIdentityHandler.openPermissionPreferences();" />
</hbox>
<vbox id="identity-popup-permission-list"/>
<description id="identity-popup-permission-reload-hint">&identity.permissionsReloadHint;</description>
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -130,21 +130,16 @@
.identity-popup-expander:hover:active {
background-color: var(--arrowpanel-dimmed-further);
box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
}
/* PREFERENCES BUTTON */
-.identity-popup-preferences-button-container {
- display: flex;
- justify-content: space-between;
-}
-
.identity-popup-preferences-button {
list-style-image: url(chrome://browser/skin/settings.svg);
padding: 5px 8px !important;
margin-bottom: 2px !important;
}
.identity-popup-preferences-button > .toolbarbutton-text {
display: none;