diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-09 11:49:22 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-09 11:49:22 -0600 |
| commit | 7b96b93b12a855958f9d891624cec960e46307c7 (patch) | |
| tree | 491ed6804e6ca78b7a32612cadaf85ec8def9d97 | |
| parent | ffbba55bc822c6cd019ff6b1495335cc1426def0 (diff) | |
| download | gitlab-ce-7b96b93b12a855958f9d891624cec960e46307c7.tar.gz | |
Replace CSS border'd check icon with real icon.
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 10 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_note.html.haml | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index b8405c4be72..f44fc1e879b 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -430,8 +430,7 @@ ul.notes { height: 14px; padding: 0; background-color: transparent; - border: 1px solid #c3c3c3; - border-radius: 50%; + border: none; outline: 0; vertical-align: middle; @@ -442,17 +441,14 @@ ul.notes { &:not(.is-disabled):hover, &.is-active { color: $gl-text-green; - border-color: $gl-text-green; - .fa { + svg { color: $gl-text-green; } } - .fa { + svg { position: relative; - top: 2px; - font-size: 8px; color: $notes-action-color; vertical-align: top; } diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index e6ba2453ef1..b261ef0ee75 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -69,7 +69,7 @@ ":class" => "{ 'has-next-btn': !loggedOut && resolvedDiscussionCount !== discussionCount }" } %span.line-resolve-btn.is-disabled{ type: "button", ":class" => "{ 'is-active': resolvedDiscussionCount === discussionCount }" } - = icon("check") + = render "shared/icons/icon_status_success.svg" %span.line-resolve-text {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved = render "discussions/jump_to_next" diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index 17c5ef18cd9..d2ac1ce2b9a 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -46,7 +46,7 @@ "v-show" => "!loading", "v-el:button" => true } - = icon("check") + = render "shared/icons/icon_status_success.svg" - if current_user - if note.emoji_awardable? |