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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
56811049
Commit
56811049
authored
Mar 08, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fit 'unresolved discussion widget together
parent
6f9304e0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+3
-1
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
56811049
...
@@ -521,7 +521,9 @@ ul.notes {
...
@@ -521,7 +521,9 @@ ul.notes {
}
}
.btn.discussion-create-issue-btn
{
.btn.discussion-create-issue-btn
{
margin-left
:
4px
;
margin-left
:
-4px
;
border-radius
:
0
;
border-right
:
0
;
a
{
a
{
padding
:
0
;
padding
:
0
;
...
...
app/views/projects/merge_requests/_show.html.haml
View file @
56811049
...
@@ -82,8 +82,8 @@
...
@@ -82,8 +82,8 @@
=
render
"shared/icons/icon_status_success.svg"
=
render
"shared/icons/icon_status_success.svg"
%span
.line-resolve-text
%span
.line-resolve-text
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
=
render
"discussions/jump_to_next"
=
render
"discussions/new_issue_for_all_discussions"
,
merge_request:
@merge_request
=
render
"discussions/new_issue_for_all_discussions"
,
merge_request:
@merge_request
=
render
"discussions/jump_to_next"
.tab-content
#diff-notes-app
.tab-content
#diff-notes-app
#notes
.notes.tab-pane.voting_notes
#notes
.notes.tab-pane.voting_notes
...
...
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