diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-04 11:29:27 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-04 11:29:27 +0300 |
| commit | cdce2074c782c44c12c0421a0d7306a286388315 (patch) | |
| tree | 18889fed17749ac4a3d207585ca9e5b2b0417aba | |
| parent | 064dd7aa2f4229068c0d1fcaaecc16d51952a5bd (diff) | |
| parent | f2343100a1085652f8bab7ba678a6555aa5c2100 (diff) | |
Merge branch '60005-fix-swipe-divider' into 'master'
Fix swipe diff divider
Closes #60005
See merge request gitlab-org/gitlab-ce!26970
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/diffs/_replaced_image_diff.html.haml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index 02364180c35..54d985df9b5 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -154,11 +154,17 @@ .swipe-wrap { overflow: hidden; - border-left: 1px solid $gl-gray-400; + border-right: 1px solid $gl-gray-400; position: absolute; display: block; top: 13px; right: 7px; + + &.left-oriented { + /* only for commit view (different swipe viewer) */ + border-right: 0; + border-left: 1px solid $gl-gray-400; + } } .swipe-bar { diff --git a/app/views/projects/diffs/_replaced_image_diff.html.haml b/app/views/projects/diffs/_replaced_image_diff.html.haml index 6dffc7c4390..70521ed892e 100644 --- a/app/views/projects/diffs/_replaced_image_diff.html.haml +++ b/app/views/projects/diffs/_replaced_image_diff.html.haml @@ -37,7 +37,7 @@ .swipe-frame .frame.deleted = 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 } %span.swipe-bar %span.top-handle |