Commit 9997c1cc authored by Coung Ngo's avatar Coung Ngo Committed by Savas Vedova

Align note actions icons

Aligns the emoji icon with the other icons, and darkens its color
to match the others
parent df39fe86
...@@ -244,8 +244,8 @@ export default { ...@@ -244,8 +244,8 @@ export default {
:title="displayContributorBadgeText" :title="displayContributorBadgeText"
>{{ __('Contributor') }}</span >{{ __('Contributor') }}</span
> >
<div v-if="canResolve" class="gl-ml-2">
<gl-button <gl-button
v-if="canResolve"
ref="resolveButton" ref="resolveButton"
v-gl-tooltip v-gl-tooltip
size="small" size="small"
...@@ -259,12 +259,11 @@ export default { ...@@ -259,12 +259,11 @@ export default {
class="line-resolve-btn note-action-button" class="line-resolve-btn note-action-button"
@click="onResolve" @click="onResolve"
/> />
</div>
<div v-if="canAwardEmoji" class="gl-ml-3 gl-mr-2">
<a <a
v-if="canAwardEmoji"
v-gl-tooltip v-gl-tooltip
:class="{ 'js-user-authored': isAuthoredByCurrentUser }" :class="{ 'js-user-authored': isAuthoredByCurrentUser }"
class="note-action-button note-emoji-button js-add-award js-note-emoji" class="note-action-button note-emoji-button js-add-award js-note-emoji gl-text-gray-600 gl-m-2"
href="#" href="#"
title="Add reaction" title="Add reaction"
data-position="right" data-position="right"
...@@ -273,15 +272,14 @@ export default { ...@@ -273,15 +272,14 @@ export default {
<gl-icon class="link-highlight award-control-icon-positive" name="smiley" /> <gl-icon class="link-highlight award-control-icon-positive" name="smiley" />
<gl-icon class="link-highlight award-control-icon-super-positive" name="smile" /> <gl-icon class="link-highlight award-control-icon-super-positive" name="smile" />
</a> </a>
</div>
<reply-button <reply-button
v-if="showReply" v-if="showReply"
ref="replyButton" ref="replyButton"
class="js-reply-button" class="js-reply-button"
@startReplying="$emit('startReplying')" @startReplying="$emit('startReplying')"
/> />
<div v-if="canEdit" class="gl-ml-2">
<gl-button <gl-button
v-if="canEdit"
v-gl-tooltip v-gl-tooltip
title="Edit comment" title="Edit comment"
icon="pencil" icon="pencil"
...@@ -291,9 +289,8 @@ export default { ...@@ -291,9 +289,8 @@ export default {
data-qa-selector="note_edit_button" data-qa-selector="note_edit_button"
@click="onEdit" @click="onEdit"
/> />
</div>
<div v-if="showDeleteAction" class="gl-ml-2">
<gl-button <gl-button
v-if="showDeleteAction"
v-gl-tooltip v-gl-tooltip
title="Delete comment" title="Delete comment"
size="small" size="small"
...@@ -302,8 +299,7 @@ export default { ...@@ -302,8 +299,7 @@ export default {
class="note-action-button js-note-delete btn btn-transparent" class="note-action-button js-note-delete btn btn-transparent"
@click="onDelete" @click="onDelete"
/> />
</div> <div v-else-if="shouldShowActionsDropdown" class="dropdown more-actions">
<div v-else-if="shouldShowActionsDropdown" class="dropdown more-actions gl-ml-2">
<gl-button <gl-button
v-gl-tooltip v-gl-tooltip
title="More actions" title="More actions"
......
<script> <script>
import { GlTooltipDirective, GlButton } from '@gitlab/ui'; import { GlTooltipDirective, GlButton } from '@gitlab/ui';
import { __ } from '~/locale';
export default { export default {
i18n: {
buttonText: __('Reply to comment'),
},
name: 'ReplyButton', name: 'ReplyButton',
components: { components: {
GlButton, GlButton,
...@@ -13,7 +17,6 @@ export default { ...@@ -13,7 +17,6 @@ export default {
</script> </script>
<template> <template>
<div class="gl-ml-2">
<gl-button <gl-button
ref="button" ref="button"
v-gl-tooltip v-gl-tooltip
...@@ -22,9 +25,8 @@ export default { ...@@ -22,9 +25,8 @@ export default {
category="tertiary" category="tertiary"
size="small" size="small"
icon="comment" icon="comment"
:title="__('Reply to comment')" :title="$options.i18n.buttonText"
:aria-label="__('Reply to comment')" :aria-label="$options.i18n.buttonText"
@click="$emit('startReplying')" @click="$emit('startReplying')"
/> />
</div>
</template> </template>
---
title: Align note actions icons
merge_request: 53753
author: Claudius Ellsel (@clel)
type: fixed
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