Commit 305038e5 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents 7da3d3a3 9b635e1c
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
color: $gl-text-color; color: $gl-text-color;
font-weight: $gl-font-weight-normal; font-weight: $gl-font-weight-normal;
font-size: 14px; font-size: 14px;
line-height: 36px;
&.diff-collapsed { &.diff-collapsed {
padding: 5px; padding: 5px;
......
...@@ -4,14 +4,17 @@ ...@@ -4,14 +4,17 @@
= render 'projects/merge_requests/diffs/commit_widget' = render 'projects/merge_requests/diffs/commit_widget'
- if @merge_request_diff&.empty? - if @merge_request_diff&.empty?
.nothing-here-block .row.empty-state.nothing-here-block
= image_tag 'illustrations/merge_request_changes_empty.svg' .col-xs-12
= succeed '.' do .svg-content= image_tag 'illustrations/merge_request_changes_empty.svg'
.col-xs-12
.text-content.text-center
%p
No changes between No changes between
%span.ref-name= @merge_request.source_branch %span.ref-name= @merge_request.source_branch
and and
%span.ref-name= @merge_request.target_branch %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' .text-center= link_to 'Create commit', project_new_blob_path(@project, @merge_request.source_branch), class: 'btn btn-save'
- else - else
- diff_viewable = @merge_request_diff ? @merge_request_diff.collected? || @merge_request_diff.overflow? : true - diff_viewable = @merge_request_diff ? @merge_request_diff.collected? || @merge_request_diff.overflow? : true
- if diff_viewable - if diff_viewable
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment