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
4e5cfd87
Commit
4e5cfd87
authored
Jan 20, 2021
by
Lakshit
Committed by
Enrique Alcántara
Jan 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply gl-button class to projects/notes
Style buttons in the notes UI with the GlButton component styles
parent
b842ce34
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
11 deletions
+15
-11
app/views/projects/notes/_actions.html.haml
app/views/projects/notes/_actions.html.haml
+7
-7
app/views/projects/notes/_more_actions_dropdown.html.haml
app/views/projects/notes/_more_actions_dropdown.html.haml
+3
-4
changelogs/unreleased/231204-projects-notes.yml
changelogs/unreleased/231204-projects-notes.yml
+5
-0
No files found.
app/views/projects/notes/_actions.html.haml
View file @
4e5cfd87
...
@@ -39,15 +39,15 @@
...
@@ -39,15 +39,15 @@
-
if
can?
(
current_user
,
:award_emoji
,
note
)
-
if
can?
(
current_user
,
:award_emoji
,
note
)
-
if
note
.
emoji_awardable?
-
if
note
.
emoji_awardable?
.note-actions-item
.note-actions-item
=
button_tag
title:
'Add reaction'
,
class:
"note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip btn btn-transparent"
,
data:
{
position:
'right'
,
container:
'body'
}
do
=
button_tag
title:
'Add reaction'
,
class:
"note-action-button note-emoji-button js-add-award js-note-emoji has-tooltip btn
gl-button btn-icon btn-default-tertiary
btn-transparent"
,
data:
{
position:
'right'
,
container:
'body'
}
do
%span
{
class:
'link-highlight award-control-icon-neutral'
}=
sprite_icon
(
'slight-smile
'
)
=
sprite_icon
(
'slight-smile'
,
css_class:
'link-highlight award-control-icon-neutral gl-button-icon gl-icon gl-text-gray-400
'
)
%span
{
class:
'link-highlight award-control-icon-positive'
}=
sprite_icon
(
'smiley
'
)
=
sprite_icon
(
'smiley'
,
css_class:
'link-highlight award-control-icon-positive gl-button-icon gl-icon gl-left-3!
'
)
%span
{
class:
'link-highlight award-control-icon-super-positive'
}=
sprite_icon
(
'smile
'
)
=
sprite_icon
(
'smile'
,
css_class:
'link-highlight award-control-icon-super-positive gl-button-icon gl-icon gl-left-3!
'
)
-
if
note_editable
-
if
note_editable
.note-actions-item
.note-actions-item
.gl-ml-0
=
button_tag
title:
'Edit comment'
,
class:
'note-action-button js-note-edit has-tooltip btn
btn-transparent
'
,
data:
{
container:
'body'
,
qa_selector:
'edit_comment_button'
}
do
=
button_tag
title:
'Edit comment'
,
class:
'note-action-button js-note-edit has-tooltip btn
gl-button btn-default-tertiary btn-transparent gl-px-2!
'
,
data:
{
container:
'body'
,
qa_selector:
'edit_comment_button'
}
do
%span
.link-highlight
%span
.link-highlight
=
custom_icon
(
'icon_pencil
'
)
=
sprite_icon
(
'pencil'
,
css_class:
'gl-button-icon gl-icon gl-text-gray-400 s16
'
)
=
render
'projects/notes/more_actions_dropdown'
,
note:
note
,
note_editable:
note_editable
=
render
'projects/notes/more_actions_dropdown'
,
note:
note
,
note_editable:
note_editable
app/views/projects/notes/_more_actions_dropdown.html.haml
View file @
4e5cfd87
-
is_current_user
=
current_user
==
note
.
author
-
is_current_user
=
current_user
==
note
.
author
-
if
note_editable
||
!
is_current_user
-
if
note_editable
||
!
is_current_user
.dropdown.more-actions.note-actions-item
%div
{
class:
"dropdown more-actions note-actions-item gl-ml-0!"
}
=
button_tag
title:
'More actions'
,
class:
'note-action-button more-actions-toggle has-tooltip btn btn-transparent'
,
data:
{
toggle:
'dropdown'
,
container:
'body'
,
qa_selector:
'more_actions_dropdown'
}
do
=
button_tag
title:
'More actions'
,
class:
'note-action-button more-actions-toggle has-tooltip btn gl-button btn-default-tertiary btn-transparent gl-pl-2! gl-pr-0!'
,
data:
{
toggle:
'dropdown'
,
container:
'body'
,
qa_selector:
'more_actions_dropdown'
}
do
%span
.icon
=
sprite_icon
(
'ellipsis_v'
,
css_class:
'gl-button-icon gl-icon gl-text-gray-400'
)
=
custom_icon
(
'ellipsis_v'
)
%ul
.dropdown-menu.more-actions-dropdown.dropdown-open-left
%ul
.dropdown-menu.more-actions-dropdown.dropdown-open-left
%li
%li
=
clipboard_button
(
text:
noteable_note_url
(
note
),
title:
_
(
'Copy reference'
),
button_text:
_
(
'Copy link'
),
class:
'btn-clipboard'
,
hide_tooltip:
true
,
hide_button_icon:
true
)
=
clipboard_button
(
text:
noteable_note_url
(
note
),
title:
_
(
'Copy reference'
),
button_text:
_
(
'Copy link'
),
class:
'btn-clipboard'
,
hide_tooltip:
true
,
hide_button_icon:
true
)
...
...
changelogs/unreleased/231204-projects-notes.yml
0 → 100644
View file @
4e5cfd87
---
title
:
Apply GitLab UI button styles to buttons in app/views/projects/notes directory
merge_request
:
44107
author
:
Lakshit
type
:
other
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