diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-04 10:53:05 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-25 12:21:37 -0500 |
commit | 82302b04fc53446a01fe1f36da261345415dca91 (patch) | |
tree | 2cb9a1a1d7c9ba684fd2ee3e41286b407c21af1e /app | |
parent | b099a10e8595a517a401c9e9d2a3962f96578081 (diff) | |
download | gitlab-ce-82302b04fc53446a01fe1f36da261345415dca91.tar.gz |
Add hover color to emoji icon
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 16 | ||||
-rw-r--r-- | app/views/projects/notes/_note.html.haml | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 08d1692c888..54124a3d658 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -281,19 +281,13 @@ ul.notes { font-size: 17px; } - &.js-note-delete { - i { - &:hover { - color: $gl-text-red; - } + &:hover { + .danger-highlight { + color: $gl-text-red; } - } - &.js-note-edit { - i { - &:hover { - color: $gl-link-color; - } + .link-highlight { + color: $gl-link-color; } } } diff --git a/app/views/projects/notes/_note.html.haml b/app/views/projects/notes/_note.html.haml index d2ac1ce2b9a..7c82177f9ea 100644 --- a/app/views/projects/notes/_note.html.haml +++ b/app/views/projects/notes/_note.html.haml @@ -52,11 +52,11 @@ - if note.emoji_awardable? = link_to '#', title: 'Award Emoji', class: 'note-action-button note-emoji-button js-add-award js-note-emoji', data: { position: 'right' } do = icon('spinner spin') - = icon('smile-o') + = icon('smile-o', class: 'link-highlight') - if note_editable = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do - = icon('pencil') + = icon('pencil', class: 'link-highlight') = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button hidden-xs js-note-delete danger' do = icon('trash-o') .note-body{class: note_editable ? 'js-task-list-container' : ''} |