diff options
| author | Alexander Randa <randa.alex@active.by> | 2011-11-17 01:19:00 +0300 |
|---|---|---|
| committer | Alexander Randa <randa.alex@active.by> | 2011-11-17 01:19:00 +0300 |
| commit | c3eac16fe97d33f3296e2c8ce870855345df446d (patch) | |
| tree | e3f192bfa0d4ca74fa80e935c25dbb131ea05810 | |
| parent | 4dee4bdb57c483bffa8d11025dface563d24869c (diff) | |
| download | gitlab-ce-c3eac16fe97d33f3296e2c8ce870855345df446d.tar.gz | |
update notice and show-info view
| -rw-r--r-- | app/assets/stylesheets/style.scss | 13 | ||||
| -rw-r--r-- | app/views/admin/projects/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/team_members/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/users/show.html.haml | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/app/assets/stylesheets/style.scss b/app/assets/stylesheets/style.scss index 801bac38a1a..7947a293340 100644 --- a/app/assets/stylesheets/style.scss +++ b/app/assets/stylesheets/style.scss @@ -316,6 +316,19 @@ body.login-page{background-color: #f1f1f1; padding-top: 10%} } /* eo Errors */ +/* Notices */ +#notice{background: #dfffe1; padding: 20px; margin-bottom: 20px; border-radius: 5px; color: green; font-size: 1.3em;} +/* eo Notices */ + +/* InfoBlock */ +#infoblock{ + background: #eeeeee; + padding: 20px; + margin-bottom: 20px; + border-radius: 5px; +} +/* eo InfoBlock */ + /* General */ #container{background-color: white; overflow: hidden; } 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)} diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index fc2e63241ae..2266eb804cf 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -1,6 +1,6 @@ %p#notice= notice -.span-8.colborder +#infoblock %h2= @admin_project.name %p diff --git a/app/views/admin/team_members/show.html.haml b/app/views/admin/team_members/show.html.haml index 29d1160ce5f..dd42dee7a26 100644 --- a/app/views/admin/team_members/show.html.haml +++ b/app/views/admin/team_members/show.html.haml @@ -1,6 +1,6 @@ %p#notice= notice -.span-10 +#infoblock %p %b Name: = @admin_team_member.user_name @@ -11,7 +11,7 @@ %b Since: = @admin_team_member.updated_at -.span-10 +#infoblock .span-6 %b Access: .span-8 diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 5bc5bf9ab83..dc7e21d05be 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -1,6 +1,6 @@ %p#notice= notice -.span-8.colborder +#infoblock %p %b Name: = @admin_user.name |