checkbox labels should now be where they're supposed to (they were color:#CCC before, I left them #222 for now)
also labels are font-weight:normal and a little smaller since they seemed very dominant compared to the input fields (if not desireable, just remove font-size:.96em) are there any more inputs I don't (yet) know about...?
This commit is contained in:
parent
363ca8c07e
commit
729f815736
3 changed files with 11 additions and 5 deletions
|
|
@ -38,7 +38,7 @@
|
||||||
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :tabindex => 5
|
= link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :tabindex => 5
|
||||||
|
|
||||||
%br
|
%br
|
||||||
%p#controls
|
%p#controls.checkbox_select
|
||||||
%span#remember_me
|
%span#remember_me
|
||||||
- if devise_mapping.rememberable?
|
- if devise_mapping.rememberable?
|
||||||
= f.check_box :remember_me, :tabindex => 3
|
= f.check_box :remember_me, :tabindex => 3
|
||||||
|
|
|
||||||
|
|
@ -853,6 +853,7 @@ form.new_comment
|
||||||
input:not([type='submit']):not([type='reset']):not([type='hidden']):not(.as-input),
|
input:not([type='submit']):not([type='reset']):not([type='hidden']):not(.as-input),
|
||||||
textarea
|
textarea
|
||||||
@include border-radius(2px)
|
@include border-radius(2px)
|
||||||
|
:margin-top 1px
|
||||||
|
|
||||||
:font
|
:font
|
||||||
:family 'Arial', 'Helvetica', sans-serif
|
:family 'Arial', 'Helvetica', sans-serif
|
||||||
|
|
@ -881,6 +882,8 @@ form p.checkbox_select
|
||||||
label
|
label
|
||||||
:left 25px
|
:left 25px
|
||||||
:top 3px
|
:top 3px
|
||||||
|
:position absolute
|
||||||
|
:font-size 1em
|
||||||
img
|
img
|
||||||
:position relative
|
:position relative
|
||||||
:top 6px
|
:top 6px
|
||||||
|
|
@ -894,6 +897,11 @@ form p.checkbox_select
|
||||||
//:position absolute
|
//:position absolute
|
||||||
//:top 3px
|
//:top 3px
|
||||||
//:left 0.48em
|
//:left 0.48em
|
||||||
|
label
|
||||||
|
:font
|
||||||
|
:size .96em
|
||||||
|
:weight normal
|
||||||
|
|
||||||
|
|
||||||
.placeholder
|
.placeholder
|
||||||
@include placeholder_styles
|
@include placeholder_styles
|
||||||
|
|
|
||||||
|
|
@ -15,9 +15,6 @@
|
||||||
form {
|
form {
|
||||||
input,
|
input,
|
||||||
label {
|
label {
|
||||||
font: {
|
|
||||||
size: 14px;
|
|
||||||
};
|
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -34,6 +31,7 @@
|
||||||
box-shadow: 0 1px 0px white, 0 -1px 0px #888888;
|
box-shadow: 0 1px 0px white, 0 -1px 0px #888888;
|
||||||
width: 180px;
|
width: 180px;
|
||||||
max-width: 180px;
|
max-width: 180px;
|
||||||
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
p {
|
p {
|
||||||
|
|
@ -68,7 +66,7 @@
|
||||||
text-align: left;
|
text-align: left;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 205px;
|
left: 205px;
|
||||||
top: 12px;
|
top: 2em;
|
||||||
width: 150px;
|
width: 150px;
|
||||||
color: #aaa;
|
color: #aaa;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue