From b50f33f4a7bf7b64a410aec5d837354d505f1974 Mon Sep 17 00:00:00 2001 From: Michael Parenteau Date: Fri, 13 Aug 2010 15:07:09 -0400 Subject: [PATCH] fixed weird send password button, changes language reffrencing 'sign up' in the devise.en.yml file, and styled some flash messages. Added warning icon. --- app/views/devise/passwords/new.html.haml | 2 +- config/locales/devise.en.yml | 2 +- public/stylesheets/application.css | 4 ++++ public/stylesheets/images/icons/warning.png | Bin 0 -> 674 bytes 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 public/stylesheets/images/icons/warning.png diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml index 2ea9284..8e22f03 100644 --- a/app/views/devise/passwords/new.html.haml +++ b/app/views/devise/passwords/new.html.haml @@ -5,4 +5,4 @@ = f.label :email = f.text_field :email - %div.send_password= f.submit "Send me reset password instructions" \ No newline at end of file + %div= f.submit "Send me reset password instructions" \ No newline at end of file diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml index 5e4e433..74e59a4 100644 --- a/config/locales/devise.en.yml +++ b/config/locales/devise.en.yml @@ -7,7 +7,7 @@ en: devise: failure: - unauthenticated: 'You need to sign in or sign up before continuing.' + unauthenticated: 'You need to sign in before continuing.' unconfirmed: 'You have to confirm your account before continuing.' locked: 'Your account is locked.' invalid: 'Invalid email or password.' diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e8351b7..01d1cd0 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -207,6 +207,10 @@ a.action { float: right; font-size: 0.9em;} } #flash-messages .notice, #flash-messages .success { background: transparent url(images/icons/success.png) 16px 50% no-repeat; } #flash-messages .error { background: transparent url(images/icons/error.png) 16px 50% no-repeat; } +#flash-messages .alert { + background: #ffc url(images/icons/warning.png) 10px 7px no-repeat; + border-color: #e4bb69; +} /* Forms */ form { diff --git a/public/stylesheets/images/icons/warning.png b/public/stylesheets/images/icons/warning.png new file mode 100644 index 0000000..18c9e14 Binary files /dev/null and b/public/stylesheets/images/icons/warning.png differ -- libgit2 0.21.2