Bug 1118888 - Remove extra space around Tracking Protection preferences. r=jaws
authorRichard Marti <richard.marti@gmail.com>
Thu, 08 Jan 2015 22:14:14 +0100
changeset 248741 76b4e802be978a693f6781a0ad8e2e678b65d859
parent 248740 72ee3f94b5f8d471ccb48db5c9699dbe628434ce
child 248742 4d9cadf294342e7053d61e95b35013d732c7b4ca
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws
bugs1118888
milestone37.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 1118888 - Remove extra space around Tracking Protection preferences. r=jaws
browser/components/preferences/in-content/privacy.xul
browser/components/preferences/privacy.xul
--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -83,31 +83,35 @@
   <vbox id="trackingprotectionbox" hidden="true">
     <hbox align="center">
       <checkbox id="trackingProtection"
                 preference="privacy.trackingprotection.enabled"
                 accesskey="&trackingProtection.accesskey;"
                 label="&trackingProtection.label;" />
       <image id="trackingProtectionImage"/>
     </hbox>
-    <label id="trackingProtectionLearnMore"
-           class="text-link"
-           value="&trackingProtectionLearnMore.label;"/>
-    <separator/>
+    <hbox align="center"
+          class="indent">
+      <label id="trackingProtectionLearnMore"
+             class="text-link"
+             value="&trackingProtectionLearnMore.label;"/>
+    </hbox>
   </vbox>
-  <checkbox id="privacyDoNotTrackCheckbox"
-            label="&dntTrackingNotOkay.label2;"
-            accesskey="&dntTrackingNotOkay.accesskey;"
-            preference="privacy.donottrackheader.enabled"/>
-  <separator class="thin"/>
   <vbox>
-    <hbox pack="end">
-      <spacer flex="1"/>
-      <label class="text-link" id="doNotTrackInfo"
-            href="https://www.mozilla.org/dnt">
+    <hbox align="center">
+      <checkbox id="privacyDoNotTrackCheckbox"
+                label="&dntTrackingNotOkay.label2;"
+                accesskey="&dntTrackingNotOkay.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;
       </label>
     </hbox>
   </vbox>
 </groupbox>
 
 <!-- History -->
 <groupbox id="historyGroup" data-category="panePrivacy" hidden="true">
--- a/browser/components/preferences/privacy.xul
+++ b/browser/components/preferences/privacy.xul
@@ -90,34 +90,40 @@
     <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="&trackingProtection.accesskey;"
                     label="&trackingProtection.label;" />
-          <image id="trackingProtectionImage" src="chrome://browser/skin/bad-content-blocked-16.png"/>
+          <image id="trackingProtectionImage"
+                 src="chrome://browser/skin/bad-content-blocked-16.png"/>
         </hbox>
-        <label id="trackingProtectionLearnMore"
-               class="text-link"
-               value="&trackingProtectionLearnMore.label;"/>
-        <separator/>
+        <hbox align="center"
+              class="indent">
+          <label id="trackingProtectionLearnMore"
+                 class="text-link"
+                 value="&trackingProtectionLearnMore.label;"/>
+        </hbox>
       </vbox>
-      <checkbox id="privacyDoNotTrackCheckbox"
-                label="&dntTrackingNotOkay.label2;"
-                accesskey="&dntTrackingNotOkay.accesskey;"
-                preference="privacy.donottrackheader.enabled"/>
-      <separator class="thin"/>
       <vbox>
-        <hbox pack="end">
-          <spacer flex="1"/>
-          <label class="text-link" id="doNotTrackInfo"
-                href="https://www.mozilla.org/dnt"
-                value="&doNotTrackInfo.label;"/>
+        <hbox align="center">
+          <checkbox id="privacyDoNotTrackCheckbox"
+                    label="&dntTrackingNotOkay.label2;"
+                    accesskey="&dntTrackingNotOkay.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;
+          </label>
         </hbox>
       </vbox>
 
     </groupbox>
 
     <!-- History -->
     <groupbox id="historyGroup">
       <caption label="&history.label;"/>