Merge branch 'ui-updates'

Michael Parenteau
2 parents 2673e597 b50f33f4
Showing 4 changed files with 6 additions and 2 deletions Show diff stats
app/views/devise/passwords/new.html.haml
config/locales/devise.en.yml
public/stylesheets/application.css
public/stylesheets/images/icons/warning.png
@@ -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
@@ -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.'
@@ -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 {
...	...	@@ -5,4 +5,4 @@
5	5	= f.label :email
6	6	= f.text_field :email
7	7
8		- %div.send_password= f.submit "Send me reset password instructions"
9	8	\ No newline at end of file
	9	+ %div= f.submit "Send me reset password instructions"
10	10	\ No newline at end of file
...	...
...	...	@@ -7,7 +7,7 @@ en:
7	7
8	8	devise:
9	9	failure:
10		- unauthenticated: 'You need to sign in or sign up before continuing.'
	10	+ unauthenticated: 'You need to sign in before continuing.'
11	11	unconfirmed: 'You have to confirm your account before continuing.'
12	12	locked: 'Your account is locked.'
13	13	invalid: 'Invalid email or password.'
...	...
...	...	@@ -207,6 +207,10 @@ a.action { float: right; font-size: 0.9em;}
207	207	}
208	208	#flash-messages .notice, #flash-messages .success { background: transparent url(images/icons/success.png) 16px 50% no-repeat; }
209	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	215	/* Forms */
212	216	form {
...	...