separating out rest of hijax vs non-hijax styling

pull/1/head
Andromeda Yelton 2012-11-07 15:56:37 -05:00
parent c5ed14b6dc
commit 097241493c
9 changed files with 28 additions and 27 deletions

View File

@ -67,7 +67,7 @@
<input type="submit" class="signup" value="Sign Up" /> <input type="submit" class="signup" value="Sign Up" />
</div> </div>
</form> </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> <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> </div>
{% else %} {% else %}
@ -142,7 +142,7 @@
<div class="button"> <div class="button">
<input type="submit" class="signup" value="sign up" /> <input type="submit" class="signup" value="sign up" />
</div> </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> <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> </div>
</form> </form>

View File

@ -17,7 +17,7 @@ Make sure the username box has your <b>username, not your email</b> -- some brow
<br /><br /> <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> <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> </div>
{% else %} {% else %}

View File

@ -4,6 +4,7 @@
{{ form.username }} {{ form.username }}
{{ form.password.label_tag }} {{ form.password.label_tag }}
{{ form.password }} {{ form.password }}
<br />
<input type="submit" value="Sign In" /> <input type="submit" value="Sign In" />
<input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" /> <input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}/{% endif %}" />

View File

@ -360,11 +360,11 @@
clear: both; clear: both;
padding: 10px 0 5px 16px; padding: 10px 0 5px 16px;
} }
.google_signup_div { .google_signup {
padding: 14px 0; padding: 14px 0;
padding: 14px 0; padding: 14px 0;
} }
.google_signup_div div { .google_signup div {
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
height: 24px; height: 24px;
@ -373,12 +373,12 @@
padding-left: 5px; padding-left: 5px;
font-size: 15px; font-size: 15px;
} }
.google_signup_div img { .google_signup img {
float: left; float: left;
height: 24px; height: 24px;
width: 24px; width: 24px;
} }
.google_signup_div div { .google_signup div {
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
height: 24px; height: 24px;
@ -387,7 +387,7 @@
padding-left: 5px; padding-left: 5px;
font-size: 15px; font-size: 15px;
} }
.google_signup_div img { .google_signup img {
float: left; float: left;
height: 24px; height: 24px;
width: 24px; width: 24px;

View File

@ -87,10 +87,6 @@
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
} }
#registration input[type="submit"] {
margin: 0 auto;
padding: 5px 0;
}
#login { #login {
border: solid 3px #d6dde0; border: solid 3px #d6dde0;
-moz-border-radius: 5px; -moz-border-radius: 5px;
@ -116,6 +112,10 @@
height: 32px; height: 32px;
width: 32px; width: 32px;
} }
#login input[type="text"],
#login input[type="password"] {
width: 90%;
}
.actionbutton { .actionbutton {
width: auto; width: auto;
height: 36px; height: 36px;

View File

@ -744,9 +744,10 @@ ul.menu {
} }
form.login label { form.login label {
display: block; display: block;
line-height: 18px;
} }
form.login input { form.login input {
width: 90%; width: 50%;
-moz-border-radius: 5px; -moz-border-radius: 5px;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
border-radius: 5px; border-radius: 5px;
@ -810,11 +811,11 @@ form.login span.helptext {
font-style: italic; font-style: italic;
font-size: 13px; font-size: 13px;
} }
#lightbox_content .google_signup_div { #lightbox_content .google_signup {
padding: 14px 0; padding: 14px 0;
padding: 14px 0; padding: 14px 0;
} }
#lightbox_content .google_signup_div div { #lightbox_content .google_signup div {
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
height: 36px; height: 36px;
@ -823,12 +824,12 @@ form.login span.helptext {
padding-left: 5px; padding-left: 5px;
font-size: 15px; font-size: 15px;
} }
#lightbox_content .google_signup_div img { #lightbox_content .google_signup img {
float: left; float: left;
height: 36px; height: 36px;
width: 36px; width: 36px;
} }
#lightbox_content .google_signup_div div { #lightbox_content .google_signup div {
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
height: 36px; height: 36px;
@ -837,7 +838,7 @@ form.login span.helptext {
padding-left: 5px; padding-left: 5px;
font-size: 15px; font-size: 15px;
} }
#lightbox_content .google_signup_div img { #lightbox_content .google_signup img {
float: left; float: left;
height: 36px; height: 36px;
width: 36px; width: 36px;

View File

@ -135,7 +135,7 @@
} }
} }
.google_signup_div { .google_signup {
.google_signup_div(24px); .google_signup_div(24px);
} }

View File

@ -14,11 +14,6 @@
line-height: 18px; line-height: 18px;
} }
#registration input[type="submit"] {
margin: 0 auto;
padding: 5px 0;
}
#login { #login {
border: solid 3px @blue-grey; border: solid 3px @blue-grey;
.one-border-radius(5px); .one-border-radius(5px);
@ -26,11 +21,14 @@
float: left; float: left;
padding: 10px; padding: 10px;
width: 50%; width: 50%;
.google_signup { .google_signup {
.google_signup_div(32px); .google_signup_div(32px);
} }
input[type="text"], input[type="password"] {
width: 90%;
}
} }
.actionbutton { .actionbutton {

View File

@ -411,10 +411,11 @@ ul.menu{
form.login { form.login {
label { label {
display: block; display: block;
line-height: 18px;
} }
input { input {
width: 90%; width: 50%;
.one-border-radius(5px); .one-border-radius(5px);
border: 1px solid @blue-grey; border: 1px solid @blue-grey;
.height(18px); .height(18px);
@ -438,7 +439,7 @@ form.login {
} }
} }
#lightbox_content .google_signup_div { #lightbox_content .google_signup {
.google_signup_div(36px); .google_signup_div(36px);
} }