Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarek Ostrowski <jostrowski@gitlab.com>2019-05-23 15:29:32 +0300
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-05-23 15:29:32 +0300
commit415b2e78e07b19a0a179cecdb4a3e2e53bed64e2 (patch)
tree95a4caac88ea17e9ae64a3f148ed7cebb25c609e /app/views/snippets
parentb68aa027d4da4ebf06e960336e9e5f249ddc61c0 (diff)
Update smiley icons to new ones
Add new emoji icons Remove added SVGs Change to sprite_icons Prettify Fix text left behind Fix errors Remove background top level reaction icon
Diffstat (limited to 'app/views/snippets')
-rw-r--r--app/views/snippets/notes/_actions.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/snippets/notes/_actions.html.haml b/app/views/snippets/notes/_actions.html.haml
index 01b95145937..6e20890a47f 100644
--- a/app/views/snippets/notes/_actions.html.haml
+++ b/app/views/snippets/notes/_actions.html.haml
@@ -3,9 +3,9 @@
.note-actions-item
= link_to '#', title: _('Add reaction'), class: "note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip", data: { position: 'right' } do
= icon('spinner spin')
- %span{ class: 'link-highlight award-control-icon-neutral' }= custom_icon('emoji_slightly_smiling_face')
- %span{ class: 'link-highlight award-control-icon-positive' }= custom_icon('emoji_smiley')
- %span{ class: 'link-highlight award-control-icon-super-positive' }= custom_icon('emoji_smile')
+ %span{ class: 'link-highlight award-control-icon-neutral' }= sprite_icon('slight-smile')
+ %span{ class: 'link-highlight award-control-icon-positive' }= sprite_icon('smiley')
+ %span{ class: 'link-highlight award-control-icon-super-positive' }= sprite_icon('smile')
- if note_editable
.note-actions-item