Bug 1468671 - Enable identity popup headlines to span multiple lines. r=Paolo
authorJohann Hofmann <jhofmann@mozilla.com>
Sun, 17 Jun 2018 19:24:17 -0700
changeset 477542 6fd500bb5dd80e0695920b6ecf343eab05ec46fc
parent 477541 6e0fc38940b484f165c4e76551d1bc91ded92ab7
child 477543 db11d8b0ea4651c00eed270420fda3b282c13ca7
push id9385
push userdluca@mozilla.com
push dateFri, 22 Jun 2018 15:47:18 +0000
treeherdermozilla-beta@82a9a1027e2b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPaolo
bugs1468671
milestone62.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1468671 - Enable identity popup headlines to span multiple lines. r=Paolo MozReview-Commit-ID: 8Y3Pql7n2U5
browser/components/controlcenter/content/panel.inc.xul
browser/themes/shared/controlcenter/panel.inc.css
--- 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 extension">
         <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.detectedBlocked4;</description>
@@ -107,19 +105,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;