diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-08 21:03:52 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:51 +0100 |
| commit | 5681104925be658aad97ea37896428d9618f772f (patch) | |
| tree | c3ba56bb5224ab64e0aaa7583c9013efbfef9449 | |
| parent | 6f9304e03078acfa9c7afdceb1ed02e4c87265ca (diff) | |
| download | gitlab-ce-5681104925be658aad97ea37896428d9618f772f.tar.gz | |
Fit 'unresolved discussion widget together
| -rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 71005a4666e..e27a5c0e7b6 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -521,7 +521,9 @@ ul.notes { } .btn.discussion-create-issue-btn { - margin-left: 4px; + margin-left: -4px; + border-radius: 0; + border-right: 0; a { padding: 0; diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 524cec5e1f9..c8f097c69da 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -82,8 +82,8 @@ = render "shared/icons/icon_status_success.svg" %span.line-resolve-text {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved - = render "discussions/jump_to_next" = render "discussions/new_issue_for_all_discussions", merge_request: @merge_request + = render "discussions/jump_to_next" .tab-content#diff-notes-app #notes.notes.tab-pane.voting_notes |