From d742d2f41fd7035ef040a1b76bd5bcd93ae9b0ac Mon Sep 17 00:00:00 2001 From: "tim@chromium.org" Date: Thu, 15 Oct 2009 21:52:28 +0000 Subject: Facelifts to sync UI BUG=23136,24858,21596 TEST=SyncSetupWizardTest Review URL: http://codereview.chromium.org/270081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29197 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/sync/resources/gaia_login.html | 13 +++-- chrome/browser/sync/resources/merge_and_sync.html | 57 +++++++++++++--------- chrome/browser/sync/resources/setup_done.html | 59 +++++++++++++++++++++++ chrome/browser/sync/resources/setup_flow.html | 7 +++ 4 files changed, 110 insertions(+), 26 deletions(-) create mode 100644 chrome/browser/sync/resources/setup_done.html (limited to 'chrome/browser/sync/resources') diff --git a/chrome/browser/sync/resources/gaia_login.html b/chrome/browser/sync/resources/gaia_login.html index 478dce7..7f16c7c 100644 --- a/chrome/browser/sync/resources/gaia_login.html +++ b/chrome/browser/sync/resources/gaia_login.html @@ -34,6 +34,9 @@ text-align: left; margin: 5px; } + #gaia_loginform { + margin-bottom: 0.5em; + } -->
- +
@@ -313,7 +316,8 @@ + onclick="sendCredentialsAndClose();" + style="width:85" />
@@ -346,7 +350,8 @@
- +
diff --git a/chrome/browser/sync/resources/merge_and_sync.html b/chrome/browser/sync/resources/merge_and_sync.html index 8af2fc1..f350ae0 100644 --- a/chrome/browser/sync/resources/merge_and_sync.html +++ b/chrome/browser/sync/resources/merge_and_sync.html @@ -3,8 +3,20 @@ - -
- -
-

-
- - -
+ + + - + + -
+ +
+ +
+

+
+
- + onclick="Close();" style="width:85"/>
diff --git a/chrome/browser/sync/resources/setup_done.html b/chrome/browser/sync/resources/setup_done.html new file mode 100644 index 0000000..897f191 --- /dev/null +++ b/chrome/browser/sync/resources/setup_done.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + +
+

+
+ +
+
+

+
+

+
+
+ +
+ + diff --git a/chrome/browser/sync/resources/setup_flow.html b/chrome/browser/sync/resources/setup_flow.html index f818787..9bec21a 100644 --- a/chrome/browser/sync/resources/setup_flow.html +++ b/chrome/browser/sync/resources/setup_flow.html @@ -8,6 +8,11 @@ document.getElementById("login").style.display = "none"; document.getElementById("merge").style.display = "block"; } + function showSetupDone() { + document.getElementById("login").style.display = "none"; + document.getElementById("merge").style.display = "none"; + document.getElementById("done").style.display = "block"; + } @@ -15,5 +20,7 @@ src="chrome://syncresources/gaialogin"> + -- cgit v1.1