diff options
| author | Phil Hughes <me@iamphill.com> | 2016-08-01 17:00:00 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-08-01 17:00:00 +0100 |
| commit | 3ccb27c0c79ef92585a901de32339948319cf068 (patch) | |
| tree | 28c8dac3755a0edabd22b22f8a8dd77422cfd609 | |
| parent | 8bdd88a41b3ac402ce1b78b092545dc9c927fba6 (diff) | |
| download | gitlab-ce-3ccb27c0c79ef92585a901de32339948319cf068.tar.gz | |
Moved the discussions count to be on the right of the tabs
| -rw-r--r-- | app/assets/stylesheets/behaviors.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/app/assets/stylesheets/behaviors.scss b/app/assets/stylesheets/behaviors.scss index c629229e4d9..7ddba5df8d3 100644 --- a/app/assets/stylesheets/behaviors.scss +++ b/app/assets/stylesheets/behaviors.scss @@ -22,5 +22,5 @@ } [v-cloak="true"] { - display: none; + display: none!important; } diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index fa0288cff6d..9785b5c93a7 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -44,17 +44,6 @@ = succeed '.' do = link_to "command line", "#modal_merge_info", class: "how_to_merge_link vlink", title: "How To Merge", "data-toggle" => "modal" - #resolve-count-app.line-resolve-all-container.prepend-top-10{ "v-cloak" => true } - %resolve-count{ "inline-template" => true, ":logged-out" => "#{current_user.nil?}" } - .line-resolve-all{ "v-show" => "discussionCount > 0", - ":class" => "{ 'has-next-btn': !loggedOut && resolved !== discussionCount }" } - %span.line-resolve-btn.is-disabled{ type: "button", - ":class" => "{ 'is-active': resolved === discussionCount }" } - = icon("check") - %span.line-resolve-text - {{ resolved }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved - = render "discussions/jump_to_next" - - if @commits_count.nonzero? %ul.merge-request-tabs.nav-links.no-top.no-bottom %li.notes-tab @@ -74,6 +63,16 @@ = link_to diffs_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: {target: 'div#diffs', action: 'diffs', toggle: 'tab'} do Changes %span.badge= @merge_request.diff_size + %li#resolve-count-app.line-resolve-all-container.pull-right.prepend-top-10.hidden-xs{ "v-cloak" => true } + %resolve-count{ "inline-template" => true, ":logged-out" => "#{current_user.nil?}" } + .line-resolve-all{ "v-show" => "discussionCount > 0", + ":class" => "{ 'has-next-btn': !loggedOut && resolved !== discussionCount }" } + %span.line-resolve-btn.is-disabled{ type: "button", + ":class" => "{ 'is-active': resolved === discussionCount }" } + = icon("check") + %span.line-resolve-text + {{ resolved }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved + = render "discussions/jump_to_next" .tab-content#diff-notes-app #notes.notes.tab-pane.voting_notes |