Bug 1363960 - Fix horizontal overflow for about:preferences pane r=jaws

MozReview-Commit-ID: DBDXvX5qR79

--HG--
extra : rebase_source : 09437ed5bd81e9b4dc91ad8e333ba78a64da2153

browser/components/preferences/in-content-new/main.xul

@@ -457,9 +457,9 @@
 
   <vbox>
     <hbox id="fontSettings">
-      <hbox align="center">
+      <hbox align="center" flex="1">
         <label control="defaultFont" accesskey="&defaultFont2.accesskey;">&defaultFont2.label;</label>
-        <menulist id="defaultFont" delayprefsave="true" onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
+        <menulist id="defaultFont" flex="1" delayprefsave="true" onsyncfrompreference="return FontBuilder.readFontSelection(this);"/>
         <label id="defaultFontSizeLabel" control="defaultFontSize" accesskey="&defaultSize2.accesskey;">&defaultSize2.label;</label>
         <menulist id="defaultFontSize" delayprefsave="true">
           <menupopup>
@@ -827,7 +827,9 @@
                 disabled="true"/>
       </hbox>
       <hbox id="unsupportedSystem" align="center">
+        <description flex="1">
           <label>&update.unsupported.start;</label><label id="unsupportedLink" class="text-link">&update.unsupported.linkText;</label><label>&update.unsupported.end;</label>
+        </description>
         <spacer flex="1"/>
         <button label="&update.checkForUpdatesButton.label;"
                 accesskey="&update.checkForUpdatesButton.accesskey;"

browser/components/preferences/in-content-new/privacy.js

@@ -1224,7 +1224,7 @@ var gPrivacyPane = {
         if (!prefStrBundle.getFormattedString) {
           return;
         }
-        actualSizeLabel.value = prefStrBundle.getFormattedString("actualDiskCacheSize", size);
+        actualSizeLabel.textContent = prefStrBundle.getFormattedString("actualDiskCacheSize", size);
       },
 
       QueryInterface: XPCOMUtils.generateQI([
@@ -1233,7 +1233,7 @@ var gPrivacyPane = {
       ])
     };
 
-    actualSizeLabel.value = prefStrBundle.getString("actualDiskCacheSizeCalculated");
+    actualSizeLabel.textContent = prefStrBundle.getString("actualDiskCacheSizeCalculated");
 
     try {
       var cacheService =

browser/components/preferences/in-content-new/privacy.xul

@@ -412,14 +412,12 @@
   <caption><label>&siteData.label;</label></caption>
 
   <hbox align="baseline">
+    <vbox flex="1">
+      <description flex="1">
         <label id="totalSiteDataSize"></label>
         <label id="siteDataLearnMoreLink" class="learnMore text-link" value="&siteDataLearnMoreLink.label;"></label>
-    <spacer flex="1" />
-    <button id="clearSiteDataButton"
-            class="accessory-button"
-            icon="clear"
-            label="&clearSiteData.label;" accesskey="&clearSiteData.accesskey;"/>
-  </hbox>
+      </description>
+    </vbox>
     <vbox align="end">
       <button id="siteDataSettings"
               class="accessory-button"
@@ -429,7 +427,12 @@
                               &hostCol.label;
                               &statusCol.label;
                               &usageCol.label;"/>
+      <button id="clearSiteDataButton"
+          class="accessory-button"
+          icon="clear"
+          label="&clearSiteData.label;" accesskey="&clearSiteData.accesskey;"/>
     </vbox>
+  </hbox>
 </groupbox>
 
 <!-- Tracking -->
@@ -520,11 +523,11 @@
     </columns>
     <rows>
       <row id="notificationsPolicyRow" align="center">
-        <hbox flex="1">
+        <description flex="1">
           <label id="notificationsPolicy">&notificationsPolicyDesc3.label;</label>
           <label id="notificationsPolicyLearnMore"
                  class="learnMore text-link">&notificationsPolicyLearnMore.label;</label>
-        </hbox>
+        </description>
         <hbox pack="end">
           <button id="notificationsPolicyButton"
                   class="accessory-button"
@@ -593,12 +596,12 @@
   </description>
 
   <vbox>
-    <hbox align="center">
+    <description flex="1">
       <checkbox id="submitHealthReportBox" label="&enableHealthReport1.label;"
                 accesskey="&enableHealthReport1.accesskey;"/>
       <label id="FHRLearnMore"
              class="learnMore text-link">&healthReportLearnMore.label;</label>
-    </hbox>
+    </description>
 #ifndef MOZ_TELEMETRY_REPORTING
     <description id="TelemetryDisabledDesc" class="indent" control="telemetryGroup">&healthReportingDisabled.label;</description>
 #endif

browser/themes/shared/incontentprefs/preferences.inc.css

@@ -279,6 +279,10 @@ description > html|a {
   cursor: pointer;
 }
 
+description > checkbox {
+  vertical-align: middle;
+}
+
 #weavePrefsDeck > vbox > label,
 #weavePrefsDeck > vbox > groupbox,
 #weavePrefsDeck > vbox > description,