Commit c3eac16fe97d33f3296e2c8ce870855345df446d
1 parent
4dee4bdb
Exists in
master
and in
4 other branches
update notice and show-info view
Showing
4 changed files
with
17 additions
and
4 deletions
Show diff stats
app/assets/stylesheets/style.scss
| @@ -316,6 +316,19 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} | @@ -316,6 +316,19 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} | ||
| 316 | } | 316 | } |
| 317 | /* eo Errors */ | 317 | /* eo Errors */ |
| 318 | 318 | ||
| 319 | +/* Notices */ | ||
| 320 | +#notice{background: #dfffe1; padding: 20px; margin-bottom: 20px; border-radius: 5px; color: green; font-size: 1.3em;} | ||
| 321 | +/* eo Notices */ | ||
| 322 | + | ||
| 323 | +/* InfoBlock */ | ||
| 324 | +#infoblock{ | ||
| 325 | + background: #eeeeee; | ||
| 326 | + padding: 20px; | ||
| 327 | + margin-bottom: 20px; | ||
| 328 | + border-radius: 5px; | ||
| 329 | +} | ||
| 330 | +/* eo InfoBlock */ | ||
| 331 | + | ||
| 319 | /* General */ | 332 | /* General */ |
| 320 | #container{background-color: white; overflow: hidden; } | 333 | #container{background-color: white; overflow: hidden; } |
| 321 | body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)} | 334 | body.collapsed #container{margin: auto; width: 980px; border: 1px solid rgba(0,0,0,.22); border-top: 0; box-shadow: 0 0 0px 4px rgba(0,0,0,.04)} |
app/views/admin/projects/show.html.haml
app/views/admin/team_members/show.html.haml
| 1 | %p#notice= notice | 1 | %p#notice= notice |
| 2 | 2 | ||
| 3 | -.span-10 | 3 | +#infoblock |
| 4 | %p | 4 | %p |
| 5 | %b Name: | 5 | %b Name: |
| 6 | = @admin_team_member.user_name | 6 | = @admin_team_member.user_name |
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | %b Since: | 11 | %b Since: |
| 12 | = @admin_team_member.updated_at | 12 | = @admin_team_member.updated_at |
| 13 | 13 | ||
| 14 | -.span-10 | 14 | +#infoblock |
| 15 | .span-6 | 15 | .span-6 |
| 16 | %b Access: | 16 | %b Access: |
| 17 | .span-8 | 17 | .span-8 |