Bug 1368281 - Consistently use label and description in the tracking protection section of the identity popup. r=Paolo
MozReview-Commit-ID: F7f9XQapoRP
--- a/browser/components/controlcenter/content/panel.inc.xul
+++ b/browser/components/controlcenter/content/panel.inc.xul
@@ -52,26 +52,26 @@
oncommand="gIdentityHandler.toggleSubView('security', this)"/>
</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">
- <description class="identity-popup-headline"
- crop="end"
- value="&trackingProtection.title;" />
+ <label class="identity-popup-headline"
+ crop="end"
+ value="&trackingProtection.title;" />
- <label id="tracking-blocked"
- crop="end">&trackingProtection.detectedBlocked3;</label>
- <label id="tracking-loaded"
- crop="end">&trackingProtection.detectedNotBlocked3;</label>
- <label id="tracking-not-detected"
- crop="end">&trackingProtection.notDetected3;</label>
+ <description id="tracking-blocked"
+ crop="end">&trackingProtection.detectedBlocked3;</description>
+ <description id="tracking-loaded"
+ crop="end">&trackingProtection.detectedNotBlocked3;</description>
+ <description id="tracking-not-detected"
+ crop="end">&trackingProtection.notDetected3;</description>
<button id="tracking-action-unblock"
label="&trackingProtection.unblock.label;"
accesskey="&trackingProtection.unblock.accesskey;"
oncommand="TrackingProtection.disableForCurrentPage();" />
<button id="tracking-action-unblock-private"
label="&trackingProtection.unblockPrivate.label;"
accesskey="&trackingProtection.unblockPrivate.accesskey;"
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -163,17 +163,17 @@
.identity-popup-permission-label,
.identity-popup-permission-state-label,
#identity-popup-security-content > description,
#identity-popup-security-descriptions > description,
#identity-popup-securityView-header > description,
#identity-popup-securityView-body > description,
#identity-popup-permissions-content > description,
-#tracking-protection-content > label {
+#tracking-protection-content > description {
white-space: pre-wrap;
font-size: 110%;
margin: 0;
}
.identity-popup-headline {
margin: 3px 0 4px;
font-size: 150%;
@@ -348,16 +348,17 @@ description#identity-popup-content-verif
#tracking-protection-content:not([state]) > #tracking-actions {
display: none;
}
/* PERMISSIONS */
#identity-popup-permissions-content {
background-image: url(chrome://browser/skin/controlcenter/permissions.svg);
+ padding-bottom: 1.5em;
}
#identity-popup-permissions-headline {
/* Make sure the label is as tall as the icon so that the permission list
which is aligned with the icon doesn't cover it up. */
min-height: 24px;
}