summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-09-20 09:12:35 -0500
committerClement Ho <ClemMakesApps@gmail.com>2017-09-20 09:12:35 -0500
commit152903758ca2e868567b99c3e30860fba3f6175d (patch)
tree9cc239154e936d90bf3b3e8b9ca121167a8fa60a
parent727f51b8ef0af2b78087b4ac894ee728bfbabd1f (diff)
downloadgitlab-ce-fix-image-diff-swipe-handle.tar.gz
Fix image diff swipe handle offset to correctly align with the framefix-image-diff-swipe-handle
-rw-r--r--app/assets/javascripts/commit/image_file.js3
-rw-r--r--changelogs/unreleased/fix-image-diff-swipe-handle.yml5
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/commit/image_file.js b/app/assets/javascripts/commit/image_file.js
index 17d14dc1e79..bb33e9eb783 100644
--- a/app/assets/javascripts/commit/image_file.js
+++ b/app/assets/javascripts/commit/image_file.js
@@ -134,8 +134,9 @@
width: maxWidth + 1,
height: maxHeight + 2
});
+ // Set swipeBar left position to match image frame
$swipeBar.css({
- left: 0
+ left: 1
});
wrapPadding = parseInt($swipeWrap.css('right').replace('px', ''), 10);
diff --git a/changelogs/unreleased/fix-image-diff-swipe-handle.yml b/changelogs/unreleased/fix-image-diff-swipe-handle.yml
new file mode 100644
index 00000000000..a4e0c2e8465
--- /dev/null
+++ b/changelogs/unreleased/fix-image-diff-swipe-handle.yml
@@ -0,0 +1,5 @@
+---
+title: Fix image diff swipe handle offset to correctly align with the frame
+merge_request:
+author:
+type: fixed