Commit cdce2074 authored by Phil Hughes's avatar Phil Hughes

Merge branch '60005-fix-swipe-divider' into 'master'

Fix swipe diff divider

Closes #60005

See merge request gitlab-org/gitlab-ce!26970
parents 064dd7aa f2343100
...@@ -154,11 +154,17 @@ ...@@ -154,11 +154,17 @@
.swipe-wrap { .swipe-wrap {
overflow: hidden; overflow: hidden;
border-left: 1px solid $gl-gray-400; border-right: 1px solid $gl-gray-400;
position: absolute; position: absolute;
display: block; display: block;
top: 13px; top: 13px;
right: 7px; right: 7px;
&.left-oriented {
/* only for commit view (different swipe viewer) */
border-right: 0;
border-left: 1px solid $gl-gray-400;
}
} }
.swipe-bar { .swipe-bar {
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
.swipe-frame .swipe-frame
.frame.deleted .frame.deleted
= image_tag(old_blob_raw_url, alt: diff_file.old_path, lazy: false) = image_tag(old_blob_raw_url, alt: diff_file.old_path, lazy: false)
.swipe-wrap .swipe-wrap.left-oriented
= render partial: "projects/diffs/image_diff_frame", locals: { class_name: "added js-image-frame #{class_name}", position: position, note_type: DiffNote.name, image_path: blob_raw_url, alt: diff_file.new_path } = render partial: "projects/diffs/image_diff_frame", locals: { class_name: "added js-image-frame #{class_name}", position: position, note_type: DiffNote.name, image_path: blob_raw_url, alt: diff_file.new_path }
%span.swipe-bar %span.swipe-bar
%span.top-handle %span.top-handle
......
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