Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
fd2a16e0
Commit
fd2a16e0
authored
Apr 20, 2021
by
Jarek Ostrowski
Committed by
Enrique Alcántara
May 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase note actions target size
MR:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59776
parent
35a195ed
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
8 deletions
+15
-8
app/assets/javascripts/emoji/components/picker.vue
app/assets/javascripts/emoji/components/picker.vue
+1
-0
app/assets/javascripts/notes/components/note_actions.vue
app/assets/javascripts/notes/components/note_actions.vue
+2
-7
app/assets/javascripts/notes/components/note_actions/reply_button.vue
...avascripts/notes/components/note_actions/reply_button.vue
+0
-1
app/assets/stylesheets/framework/timeline.scss
app/assets/stylesheets/framework/timeline.scss
+6
-0
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+1
-0
changelogs/unreleased/make-comment-actions-larger.yml
changelogs/unreleased/make-comment-actions-larger.yml
+5
-0
No files found.
app/assets/javascripts/emoji/components/picker.vue
View file @
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
...
...
app/assets/javascripts/notes/components/note_actions.vue
View file @
fd2a16e0
...
@@ -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"
...
...
app/assets/javascripts/notes/components/note_actions/reply_button.vue
View file @
fd2a16e0
...
@@ -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"
...
...
app/assets/stylesheets/framework/timeline.scss
View file @
fd2a16e0
...
@@ -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
{
...
...
app/assets/stylesheets/pages/notes.scss
View file @
fd2a16e0
...
@@ -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
);
}
}
}
}
...
...
changelogs/unreleased/make-comment-actions-larger.yml
0 → 100644
View file @
fd2a16e0
---
title
:
Increase note actions target size
merge_request
:
59776
author
:
type
:
changed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment