diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-13 07:13:39 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-13 07:13:39 +0000 |
| commit | 2fd814a3285697f1803dd18dc7d9b29578757273 (patch) | |
| tree | 10e5db5cdb11a529d3e336295ae2dcc2873f99f5 | |
| parent | e49e443b70fc819bf19866523f08ef0707e1b5a4 (diff) | |
| parent | 4276864e8846c609e45446a00db7613601d19343 (diff) | |
| download | gitlab-ce-2fd814a3285697f1803dd18dc7d9b29578757273.tar.gz | |
Merge branch 'fix-cursor-path' into 'master'
Use image-url instead of url so that asset pipeline can do it's thing
Closes #38980
See merge request gitlab-org/gitlab-ce!14799
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index ffb5fc94475..09f831dcb29 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -707,11 +707,11 @@ .frame.click-to-comment { position: relative; - cursor: url(icon_image_comment.svg) + cursor: image-url('icon_image_comment.svg') $image-comment-cursor-left-offset $image-comment-cursor-top-offset, auto; // Retina cursor - cursor: -webkit-image-set(url(icon_image_comment.svg) 1x, url(icon_image_comment@2x.svg) 2x) + cursor: -webkit-image-set(image-url('icon_image_comment.svg') 1x, image-url('icon_image_comment@2x.svg') 2x) $image-comment-cursor-left-offset $image-comment-cursor-top-offset, auto; .comment-indicator { |