Download as
Browse Code »

Commit 338e40a94136b3fe2b2515bf65acbd242d7c12bf

Authored by Michael Parenteau
1 parent 0c314215
Exists in master and in 1 other branch production

adding the user and right-arrow icons, fixing some button styles in some forms

Showing 7 changed files with 53 additions and 5 deletions   Show diff stats
app/views/apps/new.html.haml
  Diff comments   View file @338e40a
@@ -5,4 +5,4 @@ @@ -5,4 +5,4 @@
5 5
6 = render 'fields', :f => f 6 = render 'fields', :f => f
7 7
8 - %div= f.submit 'Add'  
9 \ No newline at end of file 8 \ No newline at end of file
  9 + %div.add_app= f.submit 'Add'
10 \ No newline at end of file 10 \ No newline at end of file
app/views/devise/passwords/edit.html.haml
  Diff comments   View file @338e40a
@@ -9,4 +9,4 @@ @@ -9,4 +9,4 @@
9 .required 9 .required
10 = f.label :password_confirmation, 'One more time' 10 = f.label :password_confirmation, 'One more time'
11 = f.password_field :password_confirmation 11 = f.password_field :password_confirmation
12 - %div= f.submit "Change my password"  
13 \ No newline at end of file 12 \ No newline at end of file
  13 + %div.change_password= f.submit "Change my password"
14 \ No newline at end of file 14 \ No newline at end of file
app/views/devise/passwords/new.html.haml
  Diff comments   View file @338e40a
@@ -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= f.submit "Send me reset password instructions"  
9 \ No newline at end of file 8 \ No newline at end of file
  9 + %div.send_password= f.submit "Send me reset password instructions"
10 \ No newline at end of file 10 \ No newline at end of file
app/views/devise/sessions/new.html.haml
  Diff comments   View file @338e40a
@@ -14,4 +14,5 @@ @@ -14,4 +14,5 @@
14 = f.check_box :remember_me, :tabindex => 3 14 = f.check_box :remember_me, :tabindex => 3
15 = f.label :remember_me 15 = f.label :remember_me
16 16
17 - %div= f.submit "Sign in"  
18 \ No newline at end of file 17 \ No newline at end of file
  18 + %div.sign_in
  19 + %button{:type => 'submit'}= "Sign in"
19 \ No newline at end of file 20 \ No newline at end of file
public/stylesheets/application.css
  Diff comments   View file @338e40a
@@ -18,7 +18,7 @@ body { @@ -18,7 +18,7 @@ body {
18 18
19 /* Headings */ 19 /* Headings */
20 h1, h2, h3, h4, h5, h6 { padding: 0.2em 0; margin-bottom: 1em; border-bottom: 1px solid #E2E2E2;} 20 h1, h2, h3, h4, h5, h6 { padding: 0.2em 0; margin-bottom: 1em; border-bottom: 1px solid #E2E2E2;}
21 -h1 { font-size: 2.0em; line-height: 1.2em; } 21 +h1 { font-size: 2.0em; line-height: 1.2em; text-shadow: 1px 1px 0px #FFF; -webkit-text-shadow: 1px 1px 0px #FFF;}
22 h2 { font-size: 1.7em; line-height: 1.2em; } 22 h2 { font-size: 1.7em; line-height: 1.2em; }
23 h3 { font-size: 1.5em; line-height: 1.2em; } 23 h3 { font-size: 1.5em; line-height: 1.2em; }
24 h4 { font-size: 1.3em; line-height: 1.2em; } 24 h4 { font-size: 1.3em; line-height: 1.2em; }
@@ -115,6 +115,7 @@ a.action { float: right; font-size: 0.9em;} @@ -115,6 +115,7 @@ a.action { float: right; font-size: 0.9em;}
115 #nav-bar li a:hover { color: #666;} 115 #nav-bar li a:hover { color: #666;}
116 #nav-bar li.apps a { background-image: url(images/icons/briefcase.png); } 116 #nav-bar li.apps a { background-image: url(images/icons/briefcase.png); }
117 #nav-bar li.errs a { background-image: url(images/icons/error.png); } 117 #nav-bar li.errs a { background-image: url(images/icons/error.png); }
  118 +#nav-bar li.users a { background-image: url(images/icons/user.png); }
118 #nav-bar li:hover { 119 #nav-bar li:hover {
119 box-shadow: 0 0 3px #69c; 120 box-shadow: 0 0 3px #69c;
120 -moz-box-shadow: 0 0 3px #69c; 121 -moz-box-shadow: 0 0 3px #69c;
@@ -252,6 +253,52 @@ form input[type=submit] { @@ -252,6 +253,52 @@ form input[type=submit] {
252 font-size: 1.2em; line-height: 1em; text-transform: uppercase; 253 font-size: 1.2em; line-height: 1em; text-transform: uppercase;
253 border: none; color: #FFF; background-color: #387fc1; 254 border: none; color: #FFF; background-color: #387fc1;
254 } 255 }
  256 +form div.send_password input[type=submit],
  257 +form div.change_password input[type=submit],
  258 +form div.add_app input[type=submit],
  259 +input#user_submit[type=submit] {
  260 + color: #666;
  261 + display: block;
  262 + padding: 0 20px 0 20px;
  263 + font-size: 12px; font-weight: bold; line-height: 30px; text-decoration: none;
  264 + text-shadow: 1px 1px 0px #FFF;
  265 + -webkit-text-shadow: 1px 1px 0px #FFF;
  266 + background: transparent no-repeat;
  267 + border: none;
  268 +}
  269 +form div.sign_in,
  270 +form div.send_password,
  271 +form div.change_password,
  272 +form div.add_app,
  273 +input#user_submit[type=submit] {
  274 + color: #666;
  275 + background: #FFF url(images/button-bg.png) 0 bottom repeat-x;
  276 + border-radius: 50px;
  277 + -moz-border-radius: 50px;
  278 + -webkit-border-radius: 50px;
  279 + border: 1px solid #bbb;
  280 + display: inline-block;
  281 +}
  282 +form div.sign_in:hover,
  283 +form div.send_password:hover,
  284 +form div.change_password:hover,
  285 +form div.add_app:hover,
  286 +input#user_submit[type=submit]:hover {
  287 + color: #666;
  288 + box-shadow: 0 0 3px #69c;
  289 + -moz-box-shadow: 0 0 3px #69c;
  290 + -webkit-box-shadow: 0 0 3px #69c;
  291 +}
  292 +form div.sign_in button {
  293 + color: #666;
  294 + display: block;
  295 + padding: 0 20px 0 40px;
  296 + font-size: 14px; font-weight: bold; line-height: 39px; text-decoration: none;
  297 + text-shadow: 1px 1px 0px #FFF;
  298 + -webkit-text-shadow: 1px 1px 0px #FFF;
  299 + background: transparent url(images/icons/right-arrow.png) 5px 5px no-repeat;
  300 + border: none;
  301 +}
255 form > div > span { 302 form > div > span {
256 display: block; margin-top: 0.5em; 303 display: block; margin-top: 0.5em;
257 font-size: 0.85em; 304 font-size: 0.85em;
public/stylesheets/images/icons/right-arrow.png 0 → 100644
View file @338e40a

1.11 KB
public/stylesheets/images/icons/user.png 0 → 100644
View file @338e40a

877 Bytes