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
76a3bcfc
Commit
76a3bcfc
authored
Jan 26, 2021
by
Marvin Karegyeya
Committed by
Jose Ivan Vargas
Jan 26, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply GitLab UI styles to buttons in _comment_button.html.haml
parent
6ef7d089
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/shared/notes/_comment_button.html.haml
app/views/shared/notes/_comment_button.html.haml
+4
-4
changelogs/unreleased/ApplyGitLabUIstylesto_comment_button-html-haml.yml
...leased/ApplyGitLabUIstylesto_comment_button-html-haml.yml
+5
-0
No files found.
app/views/shared/notes/_comment_button.html.haml
View file @
76a3bcfc
-
noteable_name
=
@note
.
noteable
.
human_class_name
-
noteable_name
=
@note
.
noteable
.
human_class_name
.float-left.btn-group.gl-mr-3.droplab-dropdown.comment-type-dropdown.js-comment-type-dropdown
.float-left.btn-group.gl-mr-3.droplab-dropdown.comment-type-dropdown.js-comment-type-dropdown
%input
.btn.btn-success.js-comment-button.js-comment-submit-button
{
type:
'submit'
,
value:
_
(
'Comment'
),
data:
{
qa_selector:
'comment_button'
}
}
%input
.btn.
gl-button.
btn-success.js-comment-button.js-comment-submit-button
{
type:
'submit'
,
value:
_
(
'Comment'
),
data:
{
qa_selector:
'comment_button'
}
}
-
if
@note
.
can_be_discussion_note?
-
if
@note
.
can_be_discussion_note?
=
button_tag
type:
'button'
,
class:
'btn dropdown-toggle btn-success js-note-new-discussion js-disable-on-submit'
,
data:
{
'dropdown-trigger'
=>
'#resolvable-comment-menu'
},
'aria-label'
=>
_
(
'Open comment type dropdown'
)
do
=
button_tag
type:
'button'
,
class:
'
gl-button
btn dropdown-toggle btn-success js-note-new-discussion js-disable-on-submit'
,
data:
{
'dropdown-trigger'
=>
'#resolvable-comment-menu'
},
'aria-label'
=>
_
(
'Open comment type dropdown'
)
do
=
sprite_icon
(
'chevron-down'
)
=
sprite_icon
(
'chevron-down'
)
%ul
#resolvable-comment-menu
.dropdown-menu.dropdown-open-top
{
data:
{
dropdown:
true
}
}
%ul
#resolvable-comment-menu
.dropdown-menu.dropdown-open-top
{
data:
{
dropdown:
true
}
}
%li
#comment
.droplab-item-selected
{
data:
{
value:
''
,
'submit-text'
=>
_
(
'Comment'
),
'close-text'
=>
_
(
"Comment & close %{noteable_name}"
)
%
{
noteable_name:
noteable_name
},
'reopen-text'
=>
_
(
"Comment & reopen %{noteable_name}"
)
%
{
noteable_name:
noteable_name
}
}
}
%li
#comment
.droplab-item-selected
{
data:
{
value:
''
,
'submit-text'
=>
_
(
'Comment'
),
'close-text'
=>
_
(
"Comment & close %{noteable_name}"
)
%
{
noteable_name:
noteable_name
},
'reopen-text'
=>
_
(
"Comment & reopen %{noteable_name}"
)
%
{
noteable_name:
noteable_name
}
}
}
%button
.btn.btn-transparent
%button
.btn.
gl-button.
btn-transparent
=
sprite_icon
(
'check'
,
css_class:
'icon'
)
=
sprite_icon
(
'check'
,
css_class:
'icon'
)
.description
.description
%strong
=
_
(
"Comment"
)
%strong
=
_
(
"Comment"
)
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
%li
.divider.droplab-item-ignore
%li
.divider.droplab-item-ignore
%li
#discussion
{
data:
{
value:
'DiscussionNote'
,
'submit-text'
=>
_
(
'Start thread'
),
'close-text'
=>
_
(
"Start thread & close %{noteable_name}"
)
%
{
noteable_name:
noteable_name
},
'reopen-text'
=>
_
(
"Start thread & reopen %{noteable_name}"
)
%
{
noteable_name:
noteable_name
}
}
}
%li
#discussion
{
data:
{
value:
'DiscussionNote'
,
'submit-text'
=>
_
(
'Start thread'
),
'close-text'
=>
_
(
"Start thread & close %{noteable_name}"
)
%
{
noteable_name:
noteable_name
},
'reopen-text'
=>
_
(
"Start thread & reopen %{noteable_name}"
)
%
{
noteable_name:
noteable_name
}
}
}
%button
.btn.btn-transparent
%button
.btn.
gl-button.
btn-transparent
=
sprite_icon
(
'check'
,
css_class:
'icon'
)
=
sprite_icon
(
'check'
,
css_class:
'icon'
)
.description
.description
%strong
=
_
(
"Start thread"
)
%strong
=
_
(
"Start thread"
)
...
...
changelogs/unreleased/ApplyGitLabUIstylesto_comment_button-html-haml.yml
0 → 100644
View file @
76a3bcfc
---
title
:
Apply GitLab UI styles to buttons in _comment_button.html.haml
merge_request
:
51152
author
:
nuwe1
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