diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 587346f303a8ad1eb8b4afd2ae31ec94d5e748dd..fb53459c52f679601ffec044797912c31dc36899 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -31,7 +31,7 @@ = f.password_field :password, :tabindex => 2 - if devise_mapping.recoverable? && controller_name != 'passwords' - = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :class => 'hidden', :tabindex => 5 + = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name), :id => "forgot_password_link", :tabindex => 5 %br %p#controls @@ -48,5 +48,5 @@ %br %br = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name) - + diff --git a/public/javascripts/login.js b/public/javascripts/login.js index 0c0b891902b03466643dd1706ac79ce28ec2bc15..1f1dcae3e2477f19733777600405d68924bba489 100644 --- a/public/javascripts/login.js +++ b/public/javascripts/login.js @@ -14,7 +14,7 @@ $(document).ready( function(){ var contentFilled = function(){ return($('#user_username').val() != "" && $('#user_password').val() != ""); } - + var checkSubmitAvailability = function() { if(contentFilled()){ controls.removeClass('hidden'); @@ -42,13 +42,5 @@ $(document).ready( function(){ // Check it again setTimeout(checkSubmitAvailability, 1000); - - password - .focus(function(){ - forgotPass.removeClass('hidden'); - }) - .blur(function(){ - forgotPass.addClass('hidden'); - }); }); diff --git a/public/stylesheets/sass/login.scss b/public/stylesheets/sass/login.scss index 90cafd055550c98d9b2f01b9f832cb02d9985142..5d20a9ee5801c5575af6c5768aa8df12ff928d33 100644 --- a/public/stylesheets/sass/login.scss +++ b/public/stylesheets/sass/login.scss @@ -65,11 +65,6 @@ } #forgot_password_link { - @include transition(opacity, 0.2s); - &.hidden { - display: block; - @include opacity(0); - } text-align: left; position: absolute; left: 205px; @@ -114,4 +109,4 @@ -moz-animation-duration: 5s; -moz-animation-iteration-count: infinite; -} \ No newline at end of file +}