Bug 965032 - [Australis] Fix layout of Sync preferences in signed-out state. r=ttaubert, a=sledru
authorMarco Bonardo <mbonardo@mozilla.com>
Thu, 27 Feb 2014 21:37:19 +0100
changeset 183071 a39943a3a1ad7b801fb3ebbc9b9c9895d8ff04bf
parent 183070 80c4933d97acd6294ca6cf888d138c0dd3a22994
child 183072 e2d7499fa0b5b704b2a5b22232dce3c8b26527e2
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersttaubert, sledru
bugs965032
milestone29.0a2
Bug 965032 - [Australis] Fix layout of Sync preferences in signed-out state. r=ttaubert, a=sledru
browser/components/preferences/sync.xul
browser/themes/linux/preferences/preferences.css
browser/themes/osx/preferences/preferences.css
browser/themes/windows/preferences/preferences.css
--- a/browser/components/preferences/sync.xul
+++ b/browser/components/preferences/sync.xul
@@ -181,28 +181,27 @@
         <!-- These panels are for the Firefox Accounts identity provider -->
         <vbox id="fxaDeterminingStatus" align="center">
           <spacer flex="1"/>
           <p>&determiningAcctStatus.label;</p>
           <spacer flex="1"/>
         </vbox>
 
         <vbox id="noFxaAccount">
-          <description>&welcome.description;</description>
+          <label value="&welcome.description;"/>
           <label class="text-link"
                  onclick="gSyncPane.signUp(); return false;"
                  value="&welcome.createAccount.label;"/>
           <label class="text-link"
                  onclick="gSyncPane.signIn(); return false;"
                  value="&welcome.signIn.label;"/>
-          <spacer flex="1"/>
+          <separator/>
           <label class="text-link"
                  onclick="gSyncPane.openOldSyncSupportPage(); return false;"
                  value="&welcome.useOldSync.label;"/>
-          <spacer flex="10"/>
         </vbox>
 
         <vbox id="hasFxaAccount">
           <groupbox id="fxaGroup">
             <caption label="&syncBrand.fxAccount.label;"/>
 
             <deck id="fxaLoginStatus">
 
--- a/browser/themes/linux/preferences/preferences.css
+++ b/browser/themes/linux/preferences/preferences.css
@@ -41,16 +41,20 @@ radio[pane=paneAdvanced] {
 }
 
 %ifdef MOZ_SERVICES_SYNC
 radio[pane=paneSync] {
   list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important;
 }
 %endif
 
+#tabPrefsBox {
+  margin: 5px;
+}
+
 /* Applications Pane */
 #BrowserPreferences[animated="true"] #handlersView {
   height: 25em;
 }
 
 #BrowserPreferences[animated="false"] #handlersView {
   -moz-box-flex: 1;
 }
@@ -143,9 +147,18 @@ radio[pane=paneSync] {
   list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
 }
 
 #syncAddDeviceLabel {
   margin-top: 1em;
   margin-bottom: 1em;
 }
 
+#noFxaAccount {
+  margin: 5px;
+  line-height: 1.2em;
+}
+
+#noFxaAccount > label:first-child {
+  margin-bottom: 0.6em;
+}
+
 %endif
--- a/browser/themes/osx/preferences/preferences.css
+++ b/browser/themes/osx/preferences/preferences.css
@@ -213,9 +213,18 @@ html|a.inline-link:-moz-focusring {
   margin-top: 1em;
   margin-bottom: 1em;
 }
 
 #fxaUnlinkButton {
   margin: 0;
 }
 
+#noFxaAccount {
+  margin: 12px 4px;
+  line-height: 1.2em;
+}
+
+#noFxaAccount > label:first-child {
+  margin-bottom: 0.6em;
+}
+
 %endif
--- a/browser/themes/windows/preferences/preferences.css
+++ b/browser/themes/windows/preferences/preferences.css
@@ -40,16 +40,20 @@ radio[pane=paneAdvanced] {
 }
 
 %ifdef MOZ_SERVICES_SYNC
 radio[pane=paneSync] {
   list-style-image: url("chrome://browser/skin/preferences/Options-sync.png") !important;
 }
 %endif
 
+#tabPrefsBox {
+  margin: 6px;
+}
+
 /* Applications Pane */
 #BrowserPreferences[animated="true"] #handlersView {
   height: 25em;
 }
 
 #BrowserPreferences[animated="false"] #handlersView {
   -moz-box-flex: 1;
 }
@@ -133,9 +137,18 @@ radio[pane=paneSync] {
   list-style-image: url("chrome://mozapps/skin/profile/profileicon.png");
 }
 
 #syncAddDeviceLabel {
   margin-top: 1em;
   margin-bottom: 1em;
 }
 
+#noFxaAccount {
+  margin: 6px;
+  line-height: 1.2em;
+}
+
+#noFxaAccount > label:first-child {
+  margin-bottom: 0.6em;
+}
+
 %endif