Bug 1151252 - Back out content part of the restyle of about:preferences. r=jaws, a=sledru
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 07 Apr 2015 17:50:52 +0100
changeset 258390 fa50c9c02b3c
parent 258389 1f70f2dba807
child 258391 89de3c04af8b
push id4657
push userryanvm@gmail.com
push date2015-04-08 20:55 +0000
treeherdermozilla-beta@bfff2ca94766 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjaws, sledru
bugs1151252
milestone38.0
Bug 1151252 - Back out content part of the restyle of about:preferences. r=jaws, a=sledru
browser/components/preferences/in-content/content.xul
--- a/browser/components/preferences/in-content/content.xul
+++ b/browser/components/preferences/in-content/content.xul
@@ -82,56 +82,70 @@
       </row>
     </rows>
   </grid>
 </groupbox>
 
 <!-- Fonts and Colors -->
 <groupbox id="fontsGroup" data-category="paneContent" hidden="true">
   <caption><label>&fontsAndColors.label;</label></caption>
-  <hbox align="center">
-    <label control="defaultFont" accesskey="&defaultFont.accesskey;">&defaultFont.label;</label>
-    <menulist id="defaultFont" flex="1"/>
-    <label control="defaultFontSize" accesskey="&defaultSize.accesskey;">&defaultSize.label;</label>
-    <menulist id="defaultFontSize">
-      <menupopup>
-        <menuitem value="9" label="9"/>
-        <menuitem value="10" label="10"/>
-        <menuitem value="11" label="11"/>
-        <menuitem value="12" label="12"/>
-        <menuitem value="13" label="13"/>
-        <menuitem value="14" label="14"/>
-        <menuitem value="15" label="15"/>
-        <menuitem value="16" label="16"/>
-        <menuitem value="17" label="17"/>
-        <menuitem value="18" label="18"/>
-        <menuitem value="20" label="20"/>
-        <menuitem value="22" label="22"/>
-        <menuitem value="24" label="24"/>
-        <menuitem value="26" label="26"/>
-        <menuitem value="28" label="28"/>
-        <menuitem value="30" label="30"/>
-        <menuitem value="32" label="32"/>
-        <menuitem value="34" label="34"/>
-        <menuitem value="36" label="36"/>
-        <menuitem value="40" label="40"/>
-        <menuitem value="44" label="44"/>
-        <menuitem value="48" label="48"/>
-        <menuitem value="56" label="56"/>
-        <menuitem value="64" label="64"/>
-        <menuitem value="72" label="72"/>
-      </menupopup>
-    </menulist>
-    <button id="advancedFonts" icon="select-font"
-            label="&advancedFonts.label;"
-            accesskey="&advancedFonts.accesskey;"/>
-    <button id="colors" icon="select-color"
-            label="&colors.label;"
-            accesskey="&colors.accesskey;"/>
-  </hbox>
+
+  <grid id="fontsGrid">
+    <columns>
+      <column flex="1"/>
+      <column/>
+    </columns>
+    <rows id="fontsRows">
+      <row id="fontRow">
+        <hbox align="center">
+          <label control="defaultFont" accesskey="&defaultFont.accesskey;">&defaultFont.label;</label>
+          <menulist id="defaultFont" />
+          <label control="defaultFontSize" accesskey="&defaultSize.accesskey;">&defaultSize.label;</label>
+          <menulist id="defaultFontSize">
+            <menupopup>
+              <menuitem value="9" label="9"/>
+              <menuitem value="10" label="10"/>
+              <menuitem value="11" label="11"/>
+              <menuitem value="12" label="12"/>
+              <menuitem value="13" label="13"/>
+              <menuitem value="14" label="14"/>
+              <menuitem value="15" label="15"/>
+              <menuitem value="16" label="16"/>
+              <menuitem value="17" label="17"/>
+              <menuitem value="18" label="18"/>
+              <menuitem value="20" label="20"/>
+              <menuitem value="22" label="22"/>
+              <menuitem value="24" label="24"/>
+              <menuitem value="26" label="26"/>
+              <menuitem value="28" label="28"/>
+              <menuitem value="30" label="30"/>
+              <menuitem value="32" label="32"/>
+              <menuitem value="34" label="34"/>
+              <menuitem value="36" label="36"/>
+              <menuitem value="40" label="40"/>
+              <menuitem value="44" label="44"/>
+              <menuitem value="48" label="48"/>
+              <menuitem value="56" label="56"/>
+              <menuitem value="64" label="64"/>
+              <menuitem value="72" label="72"/>
+            </menupopup>
+          </menulist>
+        </hbox>
+        <button id="advancedFonts" icon="select-font"
+                label="&advancedFonts.label;"
+                accesskey="&advancedFonts.accesskey;"/>
+      </row>
+      <row id="colorsRow">
+        <hbox/>
+        <button id="colors" icon="select-color"
+                label="&colors.label;"
+                accesskey="&colors.accesskey;"/>
+      </row>
+    </rows>
+  </grid>
 </groupbox>
 
 <!-- Languages -->
 <groupbox id="languagesGroup" data-category="paneContent" hidden="true">
   <caption><label>&languages.label;</label></caption>
 
   <hbox id="languagesBox" align="center">
     <description flex="1" control="chooseLanguage">&chooseLanguage.label;</description>