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
796d9531
Commit
796d9531
authored
Sep 18, 2020
by
Andrew McGivery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply gitlab button style to buttons in app/views/discussions directory
parent
152b0cd9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
app/views/discussions/_diff_with_notes.html.haml
app/views/discussions/_diff_with_notes.html.haml
+1
-1
app/views/discussions/_jump_to_next.html.haml
app/views/discussions/_jump_to_next.html.haml
+1
-1
app/views/discussions/_new_issue_for_all_discussions.html.haml
...iews/discussions/_new_issue_for_all_discussions.html.haml
+1
-1
app/views/discussions/_new_issue_for_discussion.html.haml
app/views/discussions/_new_issue_for_discussion.html.haml
+1
-1
app/views/discussions/_notes.html.haml
app/views/discussions/_notes.html.haml
+2
-2
No files found.
app/views/discussions/_diff_with_notes.html.haml
View file @
796d9531
...
...
@@ -29,7 +29,7 @@
%td
.line_content.js-success-lazy-load
.js-code-placeholder
%td
.js-error-lazy-load-diff.hidden.diff-loading-error-block
-
button
=
button_tag
(
_
(
"Try again"
),
class:
"btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button"
)
-
button
=
button_tag
(
_
(
"Try again"
),
class:
"btn-link
gl-button
btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button"
)
=
_
(
"Unable to load the diff. %{button_try_again}"
).
html_safe
%
{
button_try_again:
button
}
=
render
"discussions/diff_discussion"
,
discussions:
[
discussion
],
expanded:
true
-
else
...
...
app/views/discussions/_jump_to_next.html.haml
View file @
796d9531
...
...
@@ -2,7 +2,7 @@
-
if
current_user
%jump-to-discussion
{
"inline-template"
=>
true
,
":discussion-id"
=>
"'#{discussion.try(:id)}'"
}
.btn-group
{
role:
"group"
,
"v-show"
=>
"!allResolved"
,
"v-if"
=>
"showButton"
}
%button
.btn.btn-default.discussion-next-btn.has-tooltip
{
"@click"
=>
"jumpToNextUnresolvedDiscussion"
,
%button
.btn.
gl-button.
btn-default.discussion-next-btn.has-tooltip
{
"@click"
=>
"jumpToNextUnresolvedDiscussion"
,
":title"
=>
"buttonText"
,
":aria-label"
=>
"buttonText"
,
data:
{
container:
"body"
}
}
...
...
app/views/discussions/_new_issue_for_all_discussions.html.haml
View file @
796d9531
...
...
@@ -5,4 +5,4 @@
title:
'Resolve all discussions in new issue'
,
aria:
{
label:
'Resolve all discussions in new issue'
},
data:
{
container:
'body'
},
class:
'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip'
class:
'new-issue-for-discussion btn
gl-button
btn-default discussion-create-issue-btn has-tooltip'
app/views/discussions/_new_issue_for_discussion.html.haml
View file @
796d9531
...
...
@@ -7,4 +7,4 @@
title:
'Resolve this thread in a new issue'
,
aria:
{
label:
'Resolve this thread in a new issue'
},
data:
{
container:
'body'
},
class:
'new-issue-for-discussion btn btn-default discussion-create-issue-btn has-tooltip'
class:
'new-issue-for-discussion btn
gl-button
btn-default discussion-create-issue-btn has-tooltip'
app/views/discussions/_notes.html.haml
View file @
796d9531
...
...
@@ -9,9 +9,9 @@
-# to the first note position when we click on a badge diff discussion
%ul
.notes
{
id:
"discussion_#{discussion.id}"
,
data:
{
discussion_id:
discussion
.
id
,
position:
discussion
.
notes
[
0
].
position
.
to_json
}
}
-
if
discussion
.
try
(
:on_image?
)
&&
show_toggle
%button
.diff-notes-collapse.js-diff-notes-toggle
{
type:
'button'
}
%button
.
gl-button.
diff-notes-collapse.js-diff-notes-toggle
{
type:
'button'
}
=
sprite_icon
(
'collapse'
,
css_class:
'collapse-icon'
)
%button
.btn-transparent.badge.badge-pill.js-diff-notes-toggle
{
type:
'button'
}
%button
.
gl-button.
btn-transparent.badge.badge-pill.js-diff-notes-toggle
{
type:
'button'
}
=
badge_counter
=
render
partial:
"shared/notes/note"
,
collection:
discussion
.
notes
,
as: :note
,
locals:
{
badge_counter:
badge_counter
,
show_image_comment_badge:
show_image_comment_badge
}
...
...
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