Merge branch '31760-add-tooltips-to-note-actions' into 'master'
Add tooltips to note action buttons Closes #31760 See merge request !11082
This commit is contained in:
commit
e7b6f39fe1
|
@ -31,14 +31,14 @@
|
||||||
- if current_user
|
- if current_user
|
||||||
- if note.emoji_awardable?
|
- if note.emoji_awardable?
|
||||||
- user_authored = note.user_authored?(current_user)
|
- user_authored = note.user_authored?(current_user)
|
||||||
= link_to '#', title: 'Award Emoji', class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored}", data: { position: 'right' } do
|
= link_to '#', title: 'Award Emoji', class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored} has-tooltip", data: { position: 'right' } do
|
||||||
= icon('spinner spin')
|
= icon('spinner spin')
|
||||||
%span{ class: 'link-highlight award-control-icon-neutral' }= custom_icon('emoji_slightly_smiling_face')
|
%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-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-super-positive' }= custom_icon('emoji_smile')
|
||||||
|
|
||||||
- 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 has-tooltip' do
|
||||||
= icon('pencil', class: 'link-highlight')
|
= 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 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 js-note-delete danger has-tooltip' do
|
||||||
= icon('trash-o', class: 'danger-highlight')
|
= icon('trash-o', class: 'danger-highlight')
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
- if current_user
|
- if current_user
|
||||||
- if note.emoji_awardable?
|
- if note.emoji_awardable?
|
||||||
- user_authored = note.user_authored?(current_user)
|
- user_authored = note.user_authored?(current_user)
|
||||||
= link_to '#', title: 'Award Emoji', class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored}", data: { position: 'right' } do
|
= link_to '#', title: 'Award Emoji', class: "note-action-button note-emoji-button js-add-award js-note-emoji #{'js-user-authored' if user_authored} has-tooltip", data: { position: 'right' } do
|
||||||
= icon('spinner spin')
|
= icon('spinner spin')
|
||||||
%span{ class: 'link-highlight award-control-icon-neutral' }= custom_icon('emoji_slightly_smiling_face')
|
%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-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-super-positive' }= custom_icon('emoji_smile')
|
||||||
- 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 has-tooltip' do
|
||||||
= icon('pencil', class: 'link-highlight')
|
= icon('pencil', class: 'link-highlight')
|
||||||
= link_to snippet_note_path(note.noteable, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do
|
= link_to snippet_note_path(note.noteable, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger has-tooltip' do
|
||||||
= icon('trash-o', class: 'danger-highlight')
|
= icon('trash-o', class: 'danger-highlight')
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Add tooltips to note action buttons
|
||||||
|
merge_request:
|
||||||
|
author:
|
Loading…
Reference in New Issue