diff --git a/frontend/templates/home.html b/frontend/templates/home.html index 714af745..195f6893 100755 --- a/frontend/templates/home.html +++ b/frontend/templates/home.html @@ -67,7 +67,7 @@ -
+
google
Or: Sign Up With Google
{% else %} @@ -142,8 +142,8 @@
-
- google
Or: Sign Up With Google
+
diff --git a/frontend/templates/registration/login.html b/frontend/templates/registration/login.html index 347fb299..6954910f 100644 --- a/frontend/templates/registration/login.html +++ b/frontend/templates/registration/login.html @@ -17,7 +17,7 @@ Make sure the username box has your username, not your email -- some brow

-
+ {% else %} diff --git a/static/css/landingpage.css b/static/css/landingpage.css index 97a5d83a..c9d41b1e 100644 --- a/static/css/landingpage.css +++ b/static/css/landingpage.css @@ -360,6 +360,38 @@ clear: both; padding: 10px 0 5px 16px; } +.google_signup_div { + padding: 14px 0; + padding: 14px 0; +} +.google_signup_div div { + height: 24px; + line-height: 24px; + height: 24px; + line-height: 24px; + float: left; + padding-left: 5px; + font-size: 15px; +} +.google_signup_div img { + float: left; + height: 24px; + width: 24px; +} +.google_signup_div div { + height: 24px; + line-height: 24px; + height: 24px; + line-height: 24px; + float: left; + padding-left: 5px; + font-size: 15px; +} +.google_signup_div img { + float: left; + height: 24px; + width: 24px; +} .js-rightcol-padd { padding: 0; } diff --git a/static/css/registration.css b/static/css/registration.css index 6d4ccf53..d94e6f22 100644 --- a/static/css/registration.css +++ b/static/css/registration.css @@ -101,6 +101,21 @@ padding: 10px; width: 50%; } +#login .google_signup { + padding: 14px 0; +} +#login .google_signup div { + height: 32px; + line-height: 32px; + float: left; + padding-left: 5px; + font-size: 15px; +} +#login .google_signup img { + float: left; + height: 32px; + width: 32px; +} .actionbutton { width: auto; height: 36px; diff --git a/static/css/sitewide.css b/static/css/sitewide.css index 74de40f1..8a988d66 100644 --- a/static/css/sitewide.css +++ b/static/css/sitewide.css @@ -810,6 +810,38 @@ form.login span.helptext { font-style: italic; font-size: 13px; } +#lightbox_content .google_signup_div { + padding: 14px 0; + padding: 14px 0; +} +#lightbox_content .google_signup_div div { + height: 36px; + line-height: 36px; + height: 36px; + line-height: 36px; + float: left; + padding-left: 5px; + font-size: 15px; +} +#lightbox_content .google_signup_div img { + float: left; + height: 36px; + width: 36px; +} +#lightbox_content .google_signup_div div { + height: 36px; + line-height: 36px; + height: 36px; + line-height: 36px; + float: left; + padding-left: 5px; + font-size: 15px; +} +#lightbox_content .google_signup_div img { + float: left; + height: 36px; + width: 36px; +} .js-search { float: left; padding-top: 25px; diff --git a/static/less/landingpage.less b/static/less/landingpage.less index 27ec7075..7297a3fa 100644 --- a/static/less/landingpage.less +++ b/static/less/landingpage.less @@ -121,10 +121,6 @@ padding: 0 31px 0 11px; width: 111px; } - - .google_signup(24px) { - .google_signup_div; - } } div.button { @@ -139,6 +135,10 @@ } } +.google_signup_div { + .google_signup_div(24px); +} + .js-rightcol-padd { padding:0; } diff --git a/static/less/sitewide.less b/static/less/sitewide.less index 2e9cb394..5fe0f6f7 100644 --- a/static/less/sitewide.less +++ b/static/less/sitewide.less @@ -438,8 +438,8 @@ form.login { } } -.google_signup(36px) { - .google_signup_div; +#lightbox_content .google_signup_div { + .google_signup_div(36px); } .js-search {