From 097241493c9d54622581acab5f3c43d7c2f9d7d3 Mon Sep 17 00:00:00 2001
From: Andromeda Yelton <andromeda.yelton@gmail.com>
Date: Wed, 7 Nov 2012 15:56:37 -0500
Subject: [PATCH] separating out rest of hijax vs non-hijax styling

---
 frontend/templates/home.html                    |  4 ++--
 frontend/templates/registration/login.html      |  2 +-
 frontend/templates/registration/login_form.html |  1 +
 static/css/landingpage.css                      | 10 +++++-----
 static/css/registration.css                     |  8 ++++----
 static/css/sitewide.css                         | 13 +++++++------
 static/less/landingpage.less                    |  2 +-
 static/less/registration.less                   | 10 ++++------
 static/less/sitewide.less                       |  5 +++--
 9 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/frontend/templates/home.html b/frontend/templates/home.html
index 195f6893..24538eea 100755
--- a/frontend/templates/home.html
+++ b/frontend/templates/home.html
@@ -67,7 +67,7 @@
                         	<input type="submit" class="signup" value="Sign Up" />
                         </div>
                         </form>
-                        <div class="google_signup_div">
+                        <div class="google_signup">
                             <a href="/socialauth/login/google?next={{request.build_absolute_uri}}"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png" alt="google" /></a><div>Or: <a href="/socialauth/login/google?next={{request.build_absolute_uri}}">Sign Up With Google</a></div>
                         </div>
                     {% else %}
@@ -142,7 +142,7 @@
 						<div class="button">
                         	<input type="submit" class="signup" value="sign up" />
                         </div>
-                        <div class="google_signup_div">
+                        <div class="google_signup">
                             <a href="/socialauth/login/google?next={{request.build_absolute_uri}}"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png" alt="google" /></a><div><a href="/socialauth/login/google?next={{request.build_absolute_uri}}">Sign Up With Google</a></div>
                         </div>
                       </form>
diff --git a/frontend/templates/registration/login.html b/frontend/templates/registration/login.html
index 6954910f..347fb299 100644
--- a/frontend/templates/registration/login.html
+++ b/frontend/templates/registration/login.html
@@ -17,7 +17,7 @@ Make sure the username box has your <b>username, not your email</b> -- some brow
 
 
 <br /><br />
-<div class="google_signup_div">
+<div class="google_signup">
 	<a href="/socialauth/login/google?next=/next/"><img src="{{ STATIC_URL }}images/auth/google_32_noborder.png" alt="google" /></a><div>Or: <a href="/socialauth/login/google?next=/next/">Sign in with Google</a></div>
 </div>
 {% else %}
diff --git a/frontend/templates/registration/login_form.html b/frontend/templates/registration/login_form.html
index 91e702fe..0b12417d 100644
--- a/frontend/templates/registration/login_form.html
+++ b/frontend/templates/registration/login_form.html
@@ -4,6 +4,7 @@
     {{ form.username }}
     {{ form.password.label_tag }}
     {{ form.password }}
+    <br />
     <input type="submit" value="Sign In" />
 
 <input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />
diff --git a/static/css/landingpage.css b/static/css/landingpage.css
index c9d41b1e..7e26b364 100644
--- a/static/css/landingpage.css
+++ b/static/css/landingpage.css
@@ -360,11 +360,11 @@
   clear: both;
   padding: 10px 0 5px 16px;
 }
-.google_signup_div {
+.google_signup {
   padding: 14px 0;
   padding: 14px 0;
 }
-.google_signup_div div {
+.google_signup div {
   height: 24px;
   line-height: 24px;
   height: 24px;
@@ -373,12 +373,12 @@
   padding-left: 5px;
   font-size: 15px;
 }
-.google_signup_div img {
+.google_signup img {
   float: left;
   height: 24px;
   width: 24px;
 }
-.google_signup_div div {
+.google_signup div {
   height: 24px;
   line-height: 24px;
   height: 24px;
@@ -387,7 +387,7 @@
   padding-left: 5px;
   font-size: 15px;
 }
-.google_signup_div img {
+.google_signup img {
   float: left;
   height: 24px;
   width: 24px;
diff --git a/static/css/registration.css b/static/css/registration.css
index d94e6f22..7611eb30 100644
--- a/static/css/registration.css
+++ b/static/css/registration.css
@@ -87,10 +87,6 @@
   font-size: 13px;
   line-height: 18px;
 }
-#registration input[type="submit"] {
-  margin: 0 auto;
-  padding: 5px 0;
-}
 #login {
   border: solid 3px #d6dde0;
   -moz-border-radius: 5px;
@@ -116,6 +112,10 @@
   height: 32px;
   width: 32px;
 }
+#login input[type="text"],
+#login input[type="password"] {
+  width: 90%;
+}
 .actionbutton {
   width: auto;
   height: 36px;
diff --git a/static/css/sitewide.css b/static/css/sitewide.css
index 8a988d66..444f772a 100644
--- a/static/css/sitewide.css
+++ b/static/css/sitewide.css
@@ -744,9 +744,10 @@ ul.menu {
 }
 form.login label {
   display: block;
+  line-height: 18px;
 }
 form.login input {
-  width: 90%;
+  width: 50%;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
   border-radius: 5px;
@@ -810,11 +811,11 @@ form.login span.helptext {
   font-style: italic;
   font-size: 13px;
 }
-#lightbox_content .google_signup_div {
+#lightbox_content .google_signup {
   padding: 14px 0;
   padding: 14px 0;
 }
-#lightbox_content .google_signup_div div {
+#lightbox_content .google_signup div {
   height: 36px;
   line-height: 36px;
   height: 36px;
@@ -823,12 +824,12 @@ form.login span.helptext {
   padding-left: 5px;
   font-size: 15px;
 }
-#lightbox_content .google_signup_div img {
+#lightbox_content .google_signup img {
   float: left;
   height: 36px;
   width: 36px;
 }
-#lightbox_content .google_signup_div div {
+#lightbox_content .google_signup div {
   height: 36px;
   line-height: 36px;
   height: 36px;
@@ -837,7 +838,7 @@ form.login span.helptext {
   padding-left: 5px;
   font-size: 15px;
 }
-#lightbox_content .google_signup_div img {
+#lightbox_content .google_signup img {
   float: left;
   height: 36px;
   width: 36px;
diff --git a/static/less/landingpage.less b/static/less/landingpage.less
index 7297a3fa..96aca136 100644
--- a/static/less/landingpage.less
+++ b/static/less/landingpage.less
@@ -135,7 +135,7 @@
 	}
 }
 
-.google_signup_div {
+.google_signup {
     .google_signup_div(24px);
 }
 
diff --git a/static/less/registration.less b/static/less/registration.less
index 99c34392..f68eba01 100644
--- a/static/less/registration.less
+++ b/static/less/registration.less
@@ -14,11 +14,6 @@
 	line-height: 18px;
 }
 
-#registration input[type="submit"] {
-    margin: 0 auto;
-    padding: 5px 0;
-}
-
 #login {
 	border: solid 3px @blue-grey;
 	.one-border-radius(5px);
@@ -26,11 +21,14 @@
 	float: left;
 	padding: 10px;
 	width: 50%;	
-
 	
 	.google_signup {
 		.google_signup_div(32px);
 	}
+	
+	input[type="text"], input[type="password"] {
+	    width: 90%;
+	}
 }
 
 .actionbutton {
diff --git a/static/less/sitewide.less b/static/less/sitewide.less
index 5fe0f6f7..27ee6abb 100644
--- a/static/less/sitewide.less
+++ b/static/less/sitewide.less
@@ -411,10 +411,11 @@ ul.menu{
 form.login {
     label {
         display: block;
+        line-height: 18px;
     }
     
     input {
-        width: 90%;
+        width: 50%;
         .one-border-radius(5px);
         border: 1px solid @blue-grey;
         .height(18px);
@@ -438,7 +439,7 @@ form.login {
     }
 }
 
-#lightbox_content .google_signup_div {
+#lightbox_content .google_signup {
     .google_signup_div(36px);
 }