diff options
| author | Annabel Dunstone Gray <annabel@gitlab.com> | 2017-09-20 23:04:43 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel@gitlab.com> | 2017-09-20 23:04:43 +0000 |
| commit | 47f172bc8a280595cc6cb816f132d011b9a649ee (patch) | |
| tree | 17ca3a572e89e2a9c6bea45d7d04d6989e23e542 | |
| parent | d3ee059d44aa0d31fc50f5f738b4d4c6408c9ede (diff) | |
| parent | 152903758ca2e868567b99c3e30860fba3f6175d (diff) | |
| download | gitlab-ce-47f172bc8a280595cc6cb816f132d011b9a649ee.tar.gz | |
Merge branch 'fix-image-diff-swipe-handle' into 'master'
Fix image diff swipe handle offset to correctly align with the frame
Closes #37928
See merge request gitlab-org/gitlab-ce!14392
| -rw-r--r-- | app/assets/javascripts/commit/image_file.js | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-image-diff-swipe-handle.yml | 5 |
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 |