Commit 5067e9dc88b5bf4d1aae06a8c12bb05d082f4f74
1 parent
5f0b50db
Exists in
master
and in
4 other branches
Minor UI improve for dashboard events
Showing
4 changed files
with
17 additions
and
9 deletions
Show diff stats
app/assets/stylesheets/common.scss
| @@ -311,14 +311,17 @@ li.note { | @@ -311,14 +311,17 @@ li.note { | ||
| 311 | } | 311 | } |
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | -.error_message { | ||
| 315 | - @extend .cred; | ||
| 316 | - border-left: 4px solid #E99; | 314 | +.error-message { |
| 317 | padding: 10px; | 315 | padding: 10px; |
| 318 | - margin-bottom: 10px; | ||
| 319 | - background: #FEE; | 316 | + background: #C67; |
| 320 | padding-left: 20px; | 317 | padding-left: 20px; |
| 318 | + margin: 0; | ||
| 319 | + color: #FFF; | ||
| 321 | 320 | ||
| 321 | + a { | ||
| 322 | + color: #fff; | ||
| 323 | + text-decoration: underline; | ||
| 324 | + } | ||
| 322 | &.centered { | 325 | &.centered { |
| 323 | text-align: center; | 326 | text-align: center; |
| 324 | } | 327 | } |
app/assets/stylesheets/sections/events.scss
| @@ -99,7 +99,7 @@ | @@ -99,7 +99,7 @@ | ||
| 99 | margin-bottom: 5px; | 99 | margin-bottom: 5px; |
| 100 | .avatar { | 100 | .avatar { |
| 101 | width: 18px; | 101 | width: 18px; |
| 102 | - margin-top: 3px; | 102 | + margin: 2px 4px; |
| 103 | } | 103 | } |
| 104 | } | 104 | } |
| 105 | 105 | ||
| @@ -118,7 +118,12 @@ | @@ -118,7 +118,12 @@ | ||
| 118 | } | 118 | } |
| 119 | &.commits-stat { | 119 | &.commits-stat { |
| 120 | display: block; | 120 | display: block; |
| 121 | - margin-top: 5px; | 121 | + padding: 3px; |
| 122 | + margin-top: 3px; | ||
| 123 | + | ||
| 124 | + &:hover { | ||
| 125 | + background: none; | ||
| 126 | + } | ||
| 122 | } | 127 | } |
| 123 | } | 128 | } |
| 124 | } | 129 | } |
app/views/projects/notes/_form_errors.html.haml
app/views/shared/_no_ssh.html.haml
| 1 | - if current_user.require_ssh_key? | 1 | - if current_user.require_ssh_key? |
| 2 | - %p.error_message.centered | 2 | + %p.error-message.centered |
| 3 | You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile | 3 | You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_profile_key_path} to your profile |