diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-03 01:32:17 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2018-01-03 01:32:17 +0000 |
| commit | 305038e53aa4366ac6a27013787ec0e51d1f3b67 (patch) | |
| tree | 14faec496d678e7eb91651116ab4054f2131da60 | |
| parent | 7da3d3a3ed223384d68ba196d74e10d1f727d354 (diff) | |
| parent | 9b635e1c8f88f7230ea6cfae49ad0a30c07505f7 (diff) | |
| download | gitlab-ce-305038e53aa4366ac6a27013787ec0e51d1f3b67.tar.gz | |
Merge branch '41357-empty-state-mr' into 'master'
Resolve "Modify the empty state of changes in MR"
Closes #41357
See merge request gitlab-org/gitlab-ce!16072
| -rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/diffs/_diffs.html.haml | 19 |
2 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 91976ca1f56..c5c7afe25be 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -10,7 +10,6 @@ color: $gl-text-color; font-weight: $gl-font-weight-normal; font-size: 14px; - line-height: 36px; &.diff-collapsed { padding: 5px; diff --git a/app/views/projects/merge_requests/diffs/_diffs.html.haml b/app/views/projects/merge_requests/diffs/_diffs.html.haml index 60c91024b23..986ba5ae02d 100644 --- a/app/views/projects/merge_requests/diffs/_diffs.html.haml +++ b/app/views/projects/merge_requests/diffs/_diffs.html.haml @@ -4,14 +4,17 @@ = render 'projects/merge_requests/diffs/commit_widget' - if @merge_request_diff&.empty? - .nothing-here-block - = image_tag 'illustrations/merge_request_changes_empty.svg' - = succeed '.' do - No changes between - %span.ref-name= @merge_request.source_branch - and - %span.ref-name= @merge_request.target_branch - %p= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-save' + .row.empty-state.nothing-here-block + .col-xs-12 + .svg-content= image_tag 'illustrations/merge_request_changes_empty.svg' + .col-xs-12 + .text-content.text-center + %p + No changes between + %span.ref-name= @merge_request.source_branch + and + %span.ref-name= @merge_request.target_branch + .text-center= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-save' - else - diff_viewable = @merge_request_diff ? @merge_request_diff.collected? || @merge_request_diff.overflow? : true - if diff_viewable |