From 5b9b9f729b12dfd0602187c9cedd4170e3937bf7 Mon Sep 17 00:00:00 2001
From: Philipp von Weitershausen <philipp@weitershausen.de>
Date: Thu, 20 Jan 2011 13:54:20 -0800
Subject: [PATCH] Bug 626099 - Sync setup wizard: No space between links on
 manual sign in page. r+a=mconnor

---
 browser/base/content/syncSetup.xul               | 13 ++++++++-----
 browser/themes/gnomestripe/browser/syncSetup.css |  4 ++++
 browser/themes/pinstripe/browser/syncSetup.css   |  4 ++++
 browser/themes/winstripe/browser/syncSetup.css   |  4 ++++
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/browser/base/content/syncSetup.xul b/browser/base/content/syncSetup.xul
index 2b921db6783..b43d0efdee7 100644
--- a/browser/base/content/syncSetup.xul
+++ b/browser/base/content/syncSetup.xul
@@ -320,7 +320,7 @@
             <label class="text-link"
                    value="&resetPassword.label;"
                    onclick="gSyncUtils.resetPassword(); return false;"/>
-	  </row>
+          </row>
           <row align="center">
             <label control="existingServer"
                    value="&server.label;"/>
@@ -370,11 +370,14 @@
       <description>
         &existingSyncKey.description;
         <label class="text-link"
-               value="&addDevice.showMeHow.label;"
-               href="https://services.mozilla.com/sync/help/manual-setup"/>
+               href="https://services.mozilla.com/sync/help/manual-setup">
+          &addDevice.showMeHow.label;
+        </label>
+        <spacer id="passphraseHelpSpacer"/>
         <label class="text-link"
-               value="&resetSyncKey.label;"
-               onclick="gSyncUtils.resetPassphrase(); return false;"/>
+               onclick="gSyncUtils.resetPassphrase(); return false;">
+          &resetSyncKey.label;
+        </label>
       </description>
     </vbox>
   </wizardpage>
diff --git a/browser/themes/gnomestripe/browser/syncSetup.css b/browser/themes/gnomestripe/browser/syncSetup.css
index 28eb8c9e4fa..aadd7ba20ed 100644
--- a/browser/themes/gnomestripe/browser/syncSetup.css
+++ b/browser/themes/gnomestripe/browser/syncSetup.css
@@ -105,6 +105,10 @@ description > .text-link:focus {
   text-align: center; 
 }
 
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
 #add-device-throbber > image,
 #login-throbber > image {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
diff --git a/browser/themes/pinstripe/browser/syncSetup.css b/browser/themes/pinstripe/browser/syncSetup.css
index 3ff7785cb5b..2e15308b8f2 100644
--- a/browser/themes/pinstripe/browser/syncSetup.css
+++ b/browser/themes/pinstripe/browser/syncSetup.css
@@ -104,6 +104,10 @@ description > .text-link:focus {
   text-align: center; 
 }
 
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
 #add-device-throbber > image,
 #login-throbber > image {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");
diff --git a/browser/themes/winstripe/browser/syncSetup.css b/browser/themes/winstripe/browser/syncSetup.css
index 28eb8c9e4fa..aadd7ba20ed 100644
--- a/browser/themes/winstripe/browser/syncSetup.css
+++ b/browser/themes/winstripe/browser/syncSetup.css
@@ -105,6 +105,10 @@ description > .text-link:focus {
   text-align: center; 
 }
 
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
 #add-device-throbber > image,
 #login-throbber > image {
   list-style-image: url("chrome://global/skin/icons/loading_16.png");