Bug 1038291 - Update General pane layout. r=jaws

--HG--
extra : rebase_source : 7c6e1ca8cf0bcdc79c21eea054d1a72c5ed1a6d9

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

@@ -4,7 +4,7 @@
 
 <!-- General panel -->
 
-<script type="application/javascript" 
+<script type="application/javascript"
         src="chrome://browser/content/preferences/in-content/main.js"/>
 
 <preferences id="mainPreferences" hidden="true" data-category="paneGeneral">
@@ -61,7 +61,7 @@
     <preference id="browser.download.dir"
                 name="browser.download.dir"
                 type="file"/>
-    <!-- Tab preferences 
+    <!-- Tab preferences
     Preferences:
 
     browser.link.open_newwindow
@@ -78,7 +78,7 @@
     - true if the user should be warned if he attempts to open a lot of tabs at
       once (e.g. a large folder of bookmarks), false otherwise
     browser.taskbar.previews.enable
-    - true if tabs are to be shown in the Windows 7 taskbar    
+    - true if tabs are to be shown in the Windows 7 taskbar
     -->
 
     <preference id="browser.link.open_newwindow"
@@ -153,54 +153,70 @@
     <separator class="thin"/>
   </vbox>
 #endif
-  <hbox align="center">
-    <label accesskey="&startupPage.accesskey;"
-           control="browserStartupPage">&startupPage.label;</label>
-    <menulist id="browserStartupPage"
-              preference="browser.startup.page">
-      <menupopup>
-      <menuitem label="&startupHomePage.label;"
-                value="1"
-                id="browserStartupHomePage"/>
-      <menuitem label="&startupBlankPage.label;"
-                value="0"
-                id="browserStartupBlank"/>
-      <menuitem label="&startupLastSession.label;"
-                value="3"
-                id="browserStartupLastSession"/>
-      </menupopup>
-    </menulist>
-  </hbox>
-  <separator class="thin"/>
-  <hbox align="center">
-    <label accesskey="&homepage.accesskey;"
-           control="browserHomePage">&homepage.label;</label>
-    <textbox id="browserHomePage"
-             class="padded uri-element"
-             flex="1"
-             type="autocomplete"
-             autocompletesearch="history"
-             onsyncfrompreference="return gMainPane.syncFromHomePref();"
-             onsynctopreference="return gMainPane.syncToHomePref(this.value);"
-             placeholder="&abouthome.pageTitle;"
-             preference="browser.startup.homepage"/>
-  </hbox>
-  <hbox align="center" pack="end">
-    <button label=""
-            accesskey="&useCurrentPage.accesskey;"
-            label1="&useCurrentPage.label;"
-            label2="&useMultiple.label;"
-            id="useCurrent"
-            preference="pref.browser.homepage.disable_button.current_page"/>
-    <button label="&chooseBookmark.label;"
-            accesskey="&chooseBookmark.accesskey;"
-            id="useBookmark"
-            preference="pref.browser.homepage.disable_button.bookmark_page"/>
-    <button label="&restoreDefault.label;"
-            accesskey="&restoreDefault.accesskey;"
-            id="restoreDefaultHomePage"
-            preference="pref.browser.homepage.disable_button.restore_default"/>
-  </hbox>
+
+  <html:table id="startupTable">
+    <html:tr>
+      <html:td class="label-cell">
+        <label accesskey="&startupPage.accesskey;"
+               control="browserStartupPage">&startupPage.label;</label>
+      </html:td>
+      <html:td class="content-cell">
+        <menulist id="browserStartupPage"
+                  class="content-cell-item"
+                  preference="browser.startup.page">
+          <menupopup>
+          <menuitem label="&startupHomePage.label;"
+                    value="1"
+                    id="browserStartupHomePage"/>
+          <menuitem label="&startupBlankPage.label;"
+                    value="0"
+                    id="browserStartupBlank"/>
+          <menuitem label="&startupLastSession.label;"
+                    value="3"
+                    id="browserStartupLastSession"/>
+          </menupopup>
+        </menulist>
+      </html:td>
+    </html:tr>
+    <html:tr>
+      <html:td class="label-cell">
+        <label accesskey="&homepage.accesskey;"
+               control="browserHomePage">&homepage.label;</label>
+      </html:td>
+      <html:td class="content-cell">
+        <textbox id="browserHomePage"
+                 class="padded uri-element content-cell-item"
+                 type="autocomplete"
+                 autocompletesearch="history"
+                 onsyncfrompreference="return gMainPane.syncFromHomePref();"
+                 onsynctopreference="return gMainPane.syncToHomePref(this.value);"
+                 placeholder="&abouthome.pageTitle;"
+                 preference="browser.startup.homepage"/>
+      </html:td>
+    </html:tr>
+    <html:tr>
+      <html:td class="label-cell" />
+      <html:td class="content-cell homepage-buttons">
+        <button id="useCurrent"
+                class="content-cell-item"
+                label=""
+                accesskey="&useCurrentPage.accesskey;"
+                label1="&useCurrentPage.label;"
+                label2="&useMultiple.label;"
+                preference="pref.browser.homepage.disable_button.current_page"/>
+        <button id="useBookmark"
+                class="content-cell-item"
+                label="&chooseBookmark.label;"
+                accesskey="&chooseBookmark.accesskey;"
+                preference="pref.browser.homepage.disable_button.bookmark_page"/>
+        <button id="restoreDefaultHomePage"
+                class="content-cell-item"
+                label="&restoreDefault.label;"
+                accesskey="&restoreDefault.accesskey;"
+                preference="pref.browser.homepage.disable_button.restore_default"/>
+      </html:td>
+    </html:tr>
+  </html:table>
 </groupbox>
 
 <!-- Downloads -->

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

@@ -122,6 +122,39 @@ treecol {
 
 /* General Pane */
 
+#startupTable {
+  border-collapse: collapse;
+}
+
+#startupTable > tr > td {
+  padding: 0; /* remove the padding from html.css */
+}
+
+#startupTable > tr:not(:first-child) > td {
+  padding-top: 0.5em; /* add a spacing between the rows */
+}
+
+#startupTable > tr > .label-cell {
+  text-align: end;
+  width: 0; /* make the column as small as possible */
+}
+
+#startupTable > tr > .label-cell > label {
+  white-space: nowrap;
+}
+
+#startupTable > tr > .content-cell {
+  display: flex;
+}
+
+#startupTable > tr > .homepage-buttons {
+  flex-wrap: wrap;
+}
+
+#startupTable > tr > td > .content-cell-item {
+  flex-grow: 1;
+}
+
 #useFirefoxSync  {
   font-size: 90%;
   -moz-margin-end: 8px !important;