Commit b50f33f4a7bf7b64a410aec5d837354d505f1974
1 parent
338e40a9
Exists in
master
and in
1 other branch
fixed weird send password button, changes language reffrencing 'sign up' in the …
…devise.en.yml file, and styled some flash messages. Added warning icon.
Showing
4 changed files
with
6 additions
and
2 deletions
Show diff stats
app/views/devise/passwords/new.html.haml
| @@ -5,4 +5,4 @@ | @@ -5,4 +5,4 @@ | ||
| 5 | = f.label :email | 5 | = f.label :email |
| 6 | = f.text_field :email | 6 | = f.text_field :email |
| 7 | 7 | ||
| 8 | - %div.send_password= f.submit "Send me reset password instructions" | ||
| 9 | \ No newline at end of file | 8 | \ No newline at end of file |
| 9 | + %div= f.submit "Send me reset password instructions" | ||
| 10 | \ No newline at end of file | 10 | \ No newline at end of file |
config/locales/devise.en.yml
| @@ -7,7 +7,7 @@ en: | @@ -7,7 +7,7 @@ en: | ||
| 7 | 7 | ||
| 8 | devise: | 8 | devise: |
| 9 | failure: | 9 | failure: |
| 10 | - unauthenticated: 'You need to sign in or sign up before continuing.' | 10 | + unauthenticated: 'You need to sign in before continuing.' |
| 11 | unconfirmed: 'You have to confirm your account before continuing.' | 11 | unconfirmed: 'You have to confirm your account before continuing.' |
| 12 | locked: 'Your account is locked.' | 12 | locked: 'Your account is locked.' |
| 13 | invalid: 'Invalid email or password.' | 13 | invalid: 'Invalid email or password.' |
public/stylesheets/application.css
| @@ -207,6 +207,10 @@ a.action { float: right; font-size: 0.9em;} | @@ -207,6 +207,10 @@ a.action { float: right; font-size: 0.9em;} | ||
| 207 | } | 207 | } |
| 208 | #flash-messages .notice, #flash-messages .success { background: transparent url(images/icons/success.png) 16px 50% no-repeat; } | 208 | #flash-messages .notice, #flash-messages .success { background: transparent url(images/icons/success.png) 16px 50% no-repeat; } |
| 209 | #flash-messages .error { background: transparent url(images/icons/error.png) 16px 50% no-repeat; } | 209 | #flash-messages .error { background: transparent url(images/icons/error.png) 16px 50% no-repeat; } |
| 210 | +#flash-messages .alert { | ||
| 211 | + background: #ffc url(images/icons/warning.png) 10px 7px no-repeat; | ||
| 212 | + border-color: #e4bb69; | ||
| 213 | +} | ||
| 210 | 214 | ||
| 211 | /* Forms */ | 215 | /* Forms */ |
| 212 | form { | 216 | form { |
674 Bytes