Commit 7b538e16f28556e32eb1a87676494783684ba88b
1 parent
51d753f6
Exists in
master
and in
1 other branch
styles
Showing
3 changed files
with
22 additions
and
8 deletions
Show diff stats
app/views/users/show.html.haml
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | = link_to 'edit', edit_user_path(@user), :class => 'button' | 3 | = link_to 'edit', edit_user_path(@user), :class => 'button' |
| 4 | = link_to 'destroy', user_path(@user), :method => :delete, :confirm => 'Seriously?', :class => 'button' | 4 | = link_to 'destroy', user_path(@user), :method => :delete, :confirm => 'Seriously?', :class => 'button' |
| 5 | 5 | ||
| 6 | -%table | 6 | +%table.single_user |
| 7 | %tr | 7 | %tr |
| 8 | %th Email | 8 | %th Email |
| 9 | %td.main= @user.email | 9 | %td.main= @user.email |
public/stylesheets/application.css
| @@ -205,8 +205,18 @@ a.action { float: right; font-size: 0.9em;} | @@ -205,8 +205,18 @@ a.action { float: right; font-size: 0.9em;} | ||
| 205 | background-color: #F9F9F9; | 205 | background-color: #F9F9F9; |
| 206 | line-height: 1em; | 206 | line-height: 1em; |
| 207 | } | 207 | } |
| 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; } | 208 | +#flash-messages .notice { |
| 209 | + background-color: #b5eeff; | ||
| 210 | + border: 1px solid #6cf; | ||
| 211 | +} | ||
| 212 | +#flash-messages li.success { | ||
| 213 | + background: #cfc url(images/icons/success.png) 16px 50% no-repeat; | ||
| 214 | + border: 1px solid #6c3; | ||
| 215 | +} | ||
| 216 | +#flash-messages li.error { | ||
| 217 | + background: #fcc url(images/icons/error.png) 16px 50% no-repeat; | ||
| 218 | + border: 1px solid #f99; | ||
| 219 | +} | ||
| 210 | #flash-messages .alert { | 220 | #flash-messages .alert { |
| 211 | background: #ffc url(images/icons/warning.png) 10px 7px no-repeat; | 221 | background: #ffc url(images/icons/warning.png) 10px 7px no-repeat; |
| 212 | border-color: #e4bb69; | 222 | border-color: #e4bb69; |
| @@ -231,7 +241,7 @@ form label { | @@ -231,7 +241,7 @@ form label { | ||
| 231 | } | 241 | } |
| 232 | form label.inline { display: inline; } | 242 | form label.inline { display: inline; } |
| 233 | form .checkbox label { display: inline; } | 243 | form .checkbox label { display: inline; } |
| 234 | -form .required label { color: #BF3838;} | 244 | +form .required label { color: #990000;} |
| 235 | form input[type=text], form input[type=password] { | 245 | form input[type=text], form input[type=password] { |
| 236 | width: 96%; padding: 0.8em; | 246 | width: 96%; padding: 0.8em; |
| 237 | font-size: 1em; | 247 | font-size: 1em; |
| @@ -329,7 +339,7 @@ form legend + .nested { | @@ -329,7 +339,7 @@ form legend + .nested { | ||
| 329 | /* Tables */ | 339 | /* Tables */ |
| 330 | table { | 340 | table { |
| 331 | width: 100%; | 341 | width: 100%; |
| 332 | - border: 1px solid #C6C6C6; | 342 | + border: 1px solid #C6C6C6; |
| 333 | margin-bottom: 1.5em; | 343 | margin-bottom: 1.5em; |
| 334 | border-collapse: separate; | 344 | border-collapse: separate; |
| 335 | } | 345 | } |
| @@ -349,6 +359,9 @@ table th { background-color: #E2E2E2; font-weight: bold; text-transform: upperca | @@ -349,6 +359,9 @@ table th { background-color: #E2E2E2; font-weight: bold; text-transform: upperca | ||
| 349 | table tbody tr:nth-child(odd) td { background-color: #F9F9F9; } | 359 | table tbody tr:nth-child(odd) td { background-color: #F9F9F9; } |
| 350 | table .main { width: 100%; } | 360 | table .main { width: 100%; } |
| 351 | 361 | ||
| 362 | +table.single_user { | ||
| 363 | + border-top: none; | ||
| 364 | +} | ||
| 352 | /* Code */ | 365 | /* Code */ |
| 353 | pre { | 366 | pre { |
| 354 | padding: 0.8em; | 367 | padding: 0.8em; |
| @@ -443,10 +456,11 @@ a.button { | @@ -443,10 +456,11 @@ a.button { | ||
| 443 | line-height: 30px; | 456 | line-height: 30px; |
| 444 | } | 457 | } |
| 445 | a:hover.button { | 458 | a:hover.button { |
| 446 | - box-shadow: 0px 0px 4px #69C; | ||
| 447 | - -moz-box-shadow: 0px 0px 4px #69C; | ||
| 448 | - -webkit-box-shadow: 0px 0px 4px #69C; | 459 | + box-shadow: 0px 0px 4px #ccc; |
| 460 | + -moz-box-shadow: 0px 0px 4px #ccc; | ||
| 461 | + -webkit-box-shadow: 0px 0px 4px #ccc; | ||
| 449 | text-decoration: none; | 462 | text-decoration: none; |
| 463 | + background-color: #eee; | ||
| 450 | } | 464 | } |
| 451 | a.button.active { | 465 | a.button.active { |
| 452 | border-color: #fff; | 466 | border-color: #fff; |
