Commit 9704fa22 authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'add-hover-color-emoji-icon' into 'master'

Add hover color to emoji icon

## What does this MR do?
Adds hover color to emoji icon in discussions

## Are there points in the code the reviewer needs to double check?
Shouldn't be

## Why was this MR needed?
Keep consistency of color highlighting to indicate action icon

## What are the relevant issue numbers?
Closes #20629 

## Screenshots (if relevant)
Before:
![Gcy0V4Cjp9](/uploads/96a7a683fe2d526b74a05d7cc91c9fa0/Gcy0V4Cjp9.gif)
After:
![TAmusA6o1z](/uploads/1baf20390d2f1442b5fae84ae42914ce/TAmusA6o1z.gif)

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5673
parents e4336ba0 82302b04
...@@ -5,6 +5,7 @@ v 8.12.0 (unreleased) ...@@ -5,6 +5,7 @@ v 8.12.0 (unreleased)
- Change merge_error column from string to text type - Change merge_error column from string to text type
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel) - Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
- Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling) - Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling)
- Add hover color to emoji icon (ClemMakesApps)
- Optimistic locking for Issues and Merge Requests (title and description overriding prevention) - Optimistic locking for Issues and Merge Requests (title and description overriding prevention)
- Add `wiki_page_events` to project hook APIs (Ben Boeckel) - Add `wiki_page_events` to project hook APIs (Ben Boeckel)
- Remove Gitorious import - Remove Gitorious import
......
...@@ -281,21 +281,15 @@ ul.notes { ...@@ -281,21 +281,15 @@ ul.notes {
font-size: 17px; font-size: 17px;
} }
&.js-note-delete {
i {
&:hover { &:hover {
.danger-highlight {
color: $gl-text-red; color: $gl-text-red;
} }
}
}
&.js-note-edit { .link-highlight {
i {
&:hover {
color: $gl-link-color; color: $gl-link-color;
} }
} }
}
} }
.discussion-toggle-button { .discussion-toggle-button {
......
...@@ -52,11 +52,11 @@ ...@@ -52,11 +52,11 @@
- if note.emoji_awardable? - 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 = 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('spinner spin')
= icon('smile-o') = icon('smile-o', class: 'link-highlight')
- if note_editable - if note_editable
= link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do = 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 = 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') = icon('trash-o')
.note-body{class: note_editable ? 'js-task-list-container' : ''} .note-body{class: note_editable ? 'js-task-list-container' : ''}
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
%span.note-role Reporter %span.note-role Reporter
%a.note-action-button.note-emoji-button.js-add-award.js-note-emoji{"data-position" => "right", :href => "#", :title => "Award Emoji"} %a.note-action-button.note-emoji-button.js-add-award.js-note-emoji{"data-position" => "right", :href => "#", :title => "Award Emoji"}
%i.fa.fa-spinner.fa-spin %i.fa.fa-spinner.fa-spin
%i.fa.fa-smile-o %i.fa.fa-smile-o.link-highlight
.js-task-list-container.note-body.is-task-list-enabled .js-task-list-container.note-body.is-task-list-enabled
.note-text .note-text
%p Suscipit sunt quia quisquam sed eveniet ipsam. %p Suscipit sunt quia quisquam sed eveniet ipsam.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment