From fed5a12b92f37cd6da8baf1a0df91fcb519a86ce Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Wed, 17 Oct 2012 12:45:45 -0400
Subject: [PATCH 1/3] reworked log in page to emphasize sign up

---
 cms/static/sass/_login.scss | 39 ++++++++++++++++++++++++++++++++-----
 cms/templates/login.html    | 10 ++++------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/cms/static/sass/_login.scss b/cms/static/sass/_login.scss
index 1ff7c6d40d..6abae6f8ce 100644
--- a/cms/static/sass/_login.scss
+++ b/cms/static/sass/_login.scss
@@ -40,6 +40,7 @@
 
 	label {
 		display: block;
+		margin-bottom: 5px;
 		font-size: 13px;
 		font-weight: 700;
 	}
@@ -67,17 +68,45 @@
 	}
 
 	.form-actions {
-		margin-bottom: 0;
+		@include clearfix;
+		margin-top: 32px;
+		margin-bottom: 5px;
+		text-align: center;
 	}
 
-	input[type="submit"] {
+	.log-in-button {
 		@include blue-button;
-		margin-right: 10px;
-		padding: 8px 20px 10px;
+		padding: 8px 0 10px;
+		font-family: $sans-serif;
+	}
+
+	.sign-up-button {
+		@include white-button;
+		padding: 7px 0 9px;
+	}
+
+	.log-in-button,
+	.sign-up-button {
+		@include box-sizing(border-box);
+		float: left;
+		width: 45%;
+	}
+
+	.or {
+		float: left;
+		display: inline-block;
+		width: 10%;
+		font-size: 15px;
+		line-height: 36px;
+		color: $darkGrey;
+		text-align: center;
 	}
 
 	.forgot-button {
-		font-size: 13px;
+		float: right;
+		font-size: 11px;
+		font-weight: 400;
+		line-height: 21px;
 	}
 
 	.log-in-extra {
diff --git a/cms/templates/login.html b/cms/templates/login.html
index 3c834bb299..8372971e08 100644
--- a/cms/templates/login.html
+++ b/cms/templates/login.html
@@ -17,17 +17,15 @@
         <input name="email" type="email" class="email-field">
       </div>
       <div class="row">
-        <label>Password</label>
+        <label>Password <a href="#" class="forgot-button">Forgot password?</a></label>
         <input name="password" type="password" class="password-field">
       </div>
       <div class="row form-actions">
         <input name="submit" type="submit" value="Log In" class="log-in-button">
-        <a href="#" class="forgot-button">Forgot password?</a>
-      </div>      
+        <span class="or">or</span>
+        <a href="${reverse('signup')}" class="sign-up-button">Sign up</a>        
+      </div>
     </form>
-    <div class="log-in-extra">
-      <p>Not enrolled? <a href="${reverse('signup')}">Sign up.</a></p>
-    </div>
   </article>
 
 <script type="text/javascript">

From a961ac93316ca7ff4f22a2e9189df8e78541e159 Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Wed, 17 Oct 2012 12:51:48 -0400
Subject: [PATCH 2/3] more prominent log in link on sign up form

---
 cms/static/sass/_login.scss | 12 +++++++++++-
 cms/templates/signup.html   |  6 ++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cms/static/sass/_login.scss b/cms/static/sass/_login.scss
index 6abae6f8ce..22bf845315 100644
--- a/cms/static/sass/_login.scss
+++ b/cms/static/sass/_login.scss
@@ -74,12 +74,22 @@
 		text-align: center;
 	}
 
-	.log-in-button {
+	.log-in-button,
+	.create-account-button {
 		@include blue-button;
 		padding: 8px 0 10px;
 		font-family: $sans-serif;
 	}
 
+	.create-account-button {
+		padding: 10px 40px 12px;
+		margin-bottom: 10px;
+	}
+
+	.enrolled {
+		font-size: 14px;
+	}
+
 	.sign-up-button {
 		@include white-button;
 		padding: 7px 0 9px;
diff --git a/cms/templates/signup.html b/cms/templates/signup.html
index 150658b75e..2c60b758e6 100644
--- a/cms/templates/signup.html
+++ b/cms/templates/signup.html
@@ -52,12 +52,10 @@
       <input name="honor_code" type="checkbox" value="true" checked="true" hidden="true">
 
     <div class="row form-actions submit">
-      <input name="submit" type="submit" value="Create My Account">
+      <input name="submit" type="submit" value="Create My Account" class="create-account-button">
+      <p class="enrolled">Already enrolled? <a href="/">Log In.</a></p>
     </div>
   </form>
-  <div class="log-in-extra">
-    <p>Already enrolled? <a href="/">Log In.</a></p>
-  </div>
 </article>
 
 <script type="text/javascript">

From 4772bf68d606d4878d93d5218eae9798154503ff Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Wed, 17 Oct 2012 12:55:53 -0400
Subject: [PATCH 3/3] transition added to log in button

---
 cms/static/sass/_login.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cms/static/sass/_login.scss b/cms/static/sass/_login.scss
index 22bf845315..c2bff74638 100644
--- a/cms/static/sass/_login.scss
+++ b/cms/static/sass/_login.scss
@@ -79,6 +79,7 @@
 		@include blue-button;
 		padding: 8px 0 10px;
 		font-family: $sans-serif;
+		@include transition(all .15s);
 	}
 
 	.create-account-button {