Bug 1184188 - Add spacing before "Learn More" links in Privacy prefs. r=jaws
authorJustin Dolske <dolske@mozilla.com>
Fri, 31 Jul 2015 18:39:56 -0700
changeset 287388 1b022f0cb2883fb54ee3db4986a40ce31cf5b13c
parent 287387 61ab62f2fa33e4cfd32f948bfeb3db3b65800d11
child 287389 f5e6063c37fa3d4cd624e977f2e0b29faffde00d
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1184188
milestone42.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 1184188 - Add spacing before "Learn More" links in Privacy prefs. r=jaws
browser/components/preferences/in-content/privacy.xul
browser/components/preferences/privacy.xul
browser/locales/en-US/chrome/browser/preferences/privacy.dtd
browser/themes/shared/incontentprefs/preferences.inc.css
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -84,43 +84,43 @@
 </hbox>
 
 <!-- Tracking -->
 <groupbox id="trackingGroup" data-category="panePrivacy" hidden="true" align="start">
   <caption><label>&tracking.label;</label></caption>
   <vbox>
     <hbox align="center">
       <checkbox id="privacyDoNotTrackCheckbox"
-                label="&dntTrackingNotOkay3.label;"
-                accesskey="&dntTrackingNotOkay3.accesskey;"
+                label="&dntTrackingNotOkay4.label;"
+                accesskey="&dntTrackingNotOkay4.accesskey;"
                 preference="privacy.donottrackheader.enabled"/>
       <label id="doNotTrackInfo"
              class="text-link"
              href="https://www.mozilla.org/dnt">
         &doNotTrackInfo.label;
       </label>
     </hbox>
   </vbox>
   <vbox id="trackingprotectionbox" hidden="true">
     <hbox align="center">
       <checkbox id="trackingProtection"
                 preference="privacy.trackingprotection.enabled"
-                accesskey="&trackingProtection3.accesskey;"
-                label="&trackingProtection3.label;" />
+                accesskey="&trackingProtection4.accesskey;"
+                label="&trackingProtection4.label;" />
       <label id="trackingProtectionLearnMore"
              class="text-link"
              value="&trackingProtectionLearnMore.label;"/>
     </hbox>
   </vbox>
   <vbox id="trackingprotectionpbmbox">
     <hbox align="center">
       <checkbox id="trackingProtectionPBM"
                 preference="privacy.trackingprotection.pbmode.enabled"
-                accesskey="&trackingProtectionPBM3.accesskey;"
-                label="&trackingProtectionPBM3.label;" />
+                accesskey="&trackingProtectionPBM4.accesskey;"
+                label="&trackingProtectionPBM4.label;" />
       <label id="trackingProtectionPBMLearnMore"
              class="text-link"
              value="&trackingProtectionPBMLearnMore.label;"/>
     </hbox>
   </vbox>
 </groupbox>
 
 <!-- History -->
--- a/browser/components/preferences/privacy.xul
+++ b/browser/components/preferences/privacy.xul
@@ -91,33 +91,33 @@
 
     <!-- Tracking -->
     <groupbox id="trackingGroup" align="start">
       <caption label="&tracking.label;"/>
       <vbox id="trackingprotectionbox" hidden="true">
         <hbox align="center">
           <checkbox id="trackingProtection"
                     preference="privacy.trackingprotection.enabled"
-                    accesskey="&trackingProtection3.accesskey;"
-                    label="&trackingProtection3.label;" />
+                    accesskey="&trackingProtection4.accesskey;"
+                    label="&trackingProtection4.label;" />
           <image id="trackingProtectionImage"
                  src="chrome://browser/skin/bad-content-blocked-16.png"/>
         </hbox>
         <hbox align="center"
               class="indent">
           <label id="trackingProtectionLearnMore"
                  class="text-link"
                  value="&trackingProtectionLearnMore.label;"/>
         </hbox>
       </vbox>
       <vbox>
         <hbox align="center">
           <checkbox id="privacyDoNotTrackCheckbox"
-                    label="&dntTrackingNotOkay3.label;"
-                    accesskey="&dntTrackingNotOkay3.accesskey;"
+                    label="&dntTrackingNotOkay4.label;"
+                    accesskey="&dntTrackingNotOkay4.accesskey;"
                     preference="privacy.donottrackheader.enabled"/>
         </hbox>
         <hbox align="center"
               class="indent">
           <label id="doNotTrackInfo"
                  class="text-link"
                  href="https://www.mozilla.org/dnt">
             &doNotTrackInfo.label;
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -1,22 +1,22 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY tracking.label                 "Tracking">
 
-<!ENTITY dntTrackingNotOkay3.label     "Request that sites not track you.">
-<!ENTITY dntTrackingNotOkay3.accesskey "n">
+<!ENTITY dntTrackingNotOkay4.label     "Request that sites not track you">
+<!ENTITY dntTrackingNotOkay4.accesskey "n">
 <!ENTITY doNotTrackInfo.label          "Learn More">
-<!ENTITY trackingProtection3.label     "Stop sites from tracking you.">
-<!ENTITY trackingProtection3.accesskey "m">
+<!ENTITY trackingProtection4.label     "Stop sites from tracking you">
+<!ENTITY trackingProtection4.accesskey "m">
 <!ENTITY trackingProtectionLearnMore.label "Learn more">
-<!ENTITY trackingProtectionPBM3.label         "Stop sites from tracking you in Private Windows.">
-<!ENTITY trackingProtectionPBM3.accesskey     "y">
+<!ENTITY trackingProtectionPBM4.label         "Stop sites from tracking you in Private Windows">
+<!ENTITY trackingProtectionPBM4.accesskey     "y">
 <!ENTITY trackingProtectionPBMLearnMore.label "Learn more">
 
 <!ENTITY  history.label                 "History">
 
 <!ENTITY  locationBar.label             "Location Bar">
 
 <!ENTITY  locbar.suggest.label          "When using the location bar, suggest:">
 <!ENTITY  locbar.history.label          "History">
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -195,16 +195,17 @@ treecol {
   -moz-margin-end: 8px !important;
 }
 
 /* Privacy pane */
 
 #doNotTrackInfo,
 #trackingProtectionPBMLearnMore,
 #trackingProtectionLearnMore {
+  -moz-margin-start: 1.5em !important;
   margin-top: 0;
 }
 
 /* Collapse the non-active vboxes in decks to use only the height the
    active vbox needs */
 #historyPane:not([selectedIndex="1"]) > #historyDontRememberPane,
 #historyPane:not([selectedIndex="2"]) > #historyCustomPane,
 #weavePrefsDeck:not([selectedIndex="1"]) > #hasAccount,