Commit 71dee555 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'make-comment-actions-larger' into 'master'

Increase note actions target size

See merge request gitlab-org/gitlab!59776
parents 945b3a20 fd2a16e0
...@@ -79,6 +79,7 @@ export default { ...@@ -79,6 +79,7 @@ export default {
:toggle-class="toggleClass" :toggle-class="toggleClass"
:boundary="getBoundaryElement()" :boundary="getBoundaryElement()"
menu-class="dropdown-extended-height" menu-class="dropdown-extended-height"
category="tertiary"
no-flip no-flip
right right
lazy lazy
......
...@@ -278,7 +278,6 @@ export default { ...@@ -278,7 +278,6 @@ export default {
v-if="canResolve" v-if="canResolve"
ref="resolveButton" ref="resolveButton"
v-gl-tooltip v-gl-tooltip
size="small"
category="tertiary" category="tertiary"
:variant="resolveVariant" :variant="resolveVariant"
:class="{ 'is-disabled': !resolvable, 'is-active': isResolved }" :class="{ 'is-disabled': !resolvable, 'is-active': isResolved }"
...@@ -292,7 +291,7 @@ export default { ...@@ -292,7 +291,7 @@ export default {
<template v-if="canAwardEmoji"> <template v-if="canAwardEmoji">
<emoji-picker <emoji-picker
v-if="glFeatures.improvedEmojiPicker" v-if="glFeatures.improvedEmojiPicker"
toggle-class="note-action-button note-emoji-button gl-text-gray-600 gl-m-2 gl-p-0! gl-shadow-none! gl-bg-transparent!" toggle-class="note-action-button note-emoji-button gl-text-gray-600 gl-m-3 gl-p-0! gl-shadow-none! gl-bg-transparent!"
@click="setAwardEmoji" @click="setAwardEmoji"
> >
<template #button-content> <template #button-content>
...@@ -305,10 +304,9 @@ export default { ...@@ -305,10 +304,9 @@ export default {
v-else v-else
v-gl-tooltip v-gl-tooltip
:class="{ 'js-user-authored': isAuthoredByCurrentUser }" :class="{ 'js-user-authored': isAuthoredByCurrentUser }"
class="note-action-button note-emoji-button add-reaction-button js-add-award js-note-emoji" class="note-action-button note-emoji-button add-reaction-button btn-icon js-add-award js-note-emoji"
category="tertiary" category="tertiary"
variant="default" variant="default"
size="small"
:title="$options.i18n.addReactionLabel" :title="$options.i18n.addReactionLabel"
:aria-label="$options.i18n.addReactionLabel" :aria-label="$options.i18n.addReactionLabel"
data-position="right" data-position="right"
...@@ -336,7 +334,6 @@ export default { ...@@ -336,7 +334,6 @@ export default {
:title="$options.i18n.editCommentLabel" :title="$options.i18n.editCommentLabel"
:aria-label="$options.i18n.editCommentLabel" :aria-label="$options.i18n.editCommentLabel"
icon="pencil" icon="pencil"
size="small"
category="tertiary" category="tertiary"
class="note-action-button js-note-edit" class="note-action-button js-note-edit"
data-qa-selector="note_edit_button" data-qa-selector="note_edit_button"
...@@ -347,7 +344,6 @@ export default { ...@@ -347,7 +344,6 @@ export default {
v-gl-tooltip v-gl-tooltip
:title="$options.i18n.deleteCommentLabel" :title="$options.i18n.deleteCommentLabel"
:aria-label="$options.i18n.deleteCommentLabel" :aria-label="$options.i18n.deleteCommentLabel"
size="small"
icon="remove" icon="remove"
category="tertiary" category="tertiary"
class="note-action-button js-note-delete" class="note-action-button js-note-delete"
...@@ -360,7 +356,6 @@ export default { ...@@ -360,7 +356,6 @@ export default {
:title="$options.i18n.moreActionsLabel" :title="$options.i18n.moreActionsLabel"
:aria-label="$options.i18n.moreActionsLabel" :aria-label="$options.i18n.moreActionsLabel"
icon="ellipsis_v" icon="ellipsis_v"
size="small"
category="tertiary" category="tertiary"
class="note-action-button more-actions-toggle" class="note-action-button more-actions-toggle"
data-toggle="dropdown" data-toggle="dropdown"
......
...@@ -22,7 +22,6 @@ export default { ...@@ -22,7 +22,6 @@ export default {
data-track-event="click_button" data-track-event="click_button"
data-track-label="reply_comment_button" data-track-label="reply_comment_button"
category="tertiary" category="tertiary"
size="small"
icon="comment" icon="comment"
:title="$options.i18n.buttonText" :title="$options.i18n.buttonText"
:aria-label="$options.i18n.buttonText" :aria-label="$options.i18n.buttonText"
......
...@@ -50,6 +50,12 @@ ...@@ -50,6 +50,12 @@
img.avatar { img.avatar {
margin-right: $gl-padding; margin-right: $gl-padding;
@include media-breakpoint-down(sm) {
width: $gl-spacing-scale-6;
height: $gl-spacing-scale-6;
margin-right: $gl-padding-8;
}
} }
.controls { .controls {
......
...@@ -676,6 +676,7 @@ $system-note-svg-size: 16px; ...@@ -676,6 +676,7 @@ $system-note-svg-size: 16px;
@include notes-media('max', map-get($grid-breakpoints, sm) - 1) { @include notes-media('max', map-get($grid-breakpoints, sm) - 1) {
float: none; float: none;
margin-left: 0; margin-left: 0;
transform: translateY(-4px);
} }
} }
......
---
title: Increase note actions target size
merge_request: 59776
author:
type: changed
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