diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 52a73479d..68cb3e1f7 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -38,7 +38,7 @@ = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :tabindex => 5 %br - %p#controls + %p#controls.checkbox_select %span#remember_me - if devise_mapping.rememberable? = f.check_box :remember_me, :tabindex => 3 diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 351d5ec7e..eacf00c85 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -853,6 +853,7 @@ form.new_comment input:not([type='submit']):not([type='reset']):not([type='hidden']):not(.as-input), textarea @include border-radius(2px) + :margin-top 1px :font :family 'Arial', 'Helvetica', sans-serif @@ -881,6 +882,8 @@ form p.checkbox_select label :left 25px :top 3px + :position absolute + :font-size 1em img :position relative :top 6px @@ -894,6 +897,11 @@ form p.checkbox_select //:position absolute //:top 3px //:left 0.48em +label + :font + :size .96em + :weight normal + .placeholder @include placeholder_styles diff --git a/public/stylesheets/sass/login.scss b/public/stylesheets/sass/login.scss index c9f8890ff..b4cd1c859 100644 --- a/public/stylesheets/sass/login.scss +++ b/public/stylesheets/sass/login.scss @@ -15,9 +15,6 @@ form { input, label { - font: { - size: 14px; - }; display: inline; } @@ -34,6 +31,7 @@ box-shadow: 0 1px 0px white, 0 -1px 0px #888888; width: 180px; max-width: 180px; + font-size: 14px; } p { @@ -68,7 +66,7 @@ text-align: left; position: absolute; left: 205px; - top: 12px; + top: 2em; width: 150px; color: #aaa; }