diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-04-06 11:01:22 +0200 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-04-06 11:01:22 +0200 |
| commit | 77ed561b4f764a64f7b0d2ddf4ae5321be8c4eee (patch) | |
| tree | 46182a5062ac8756d40ffccae43c40084058ee02 | |
| parent | 992c1ff8d8eee7608b0656104952f65ef245ebb0 (diff) | |
| download | gitlab-ce-77ed561b4f764a64f7b0d2ddf4ae5321be8c4eee.tar.gz | |
Adapted SCSS Lint rules to allow fallback configuration for cursors
| -rw-r--r-- | .scss-lint.yml | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/content_viewer/lib/viewer_utils.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/.scss-lint.yml b/.scss-lint.yml index dcd4cac780a..180d377d6f8 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -59,6 +59,8 @@ linters: # Reports when you define the same property twice in a single rule set. DuplicateProperty: enabled: true + ignore_consecutive: + - cursor # Separate rule, function, and mixin declarations with empty lines. EmptyLineBetweenBlocks: diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/lib/viewer_utils.js b/app/assets/javascripts/vue_shared/components/content_viewer/lib/viewer_utils.js index 195d9bdcf5a..f01a51da0b3 100644 --- a/app/assets/javascripts/vue_shared/components/content_viewer/lib/viewer_utils.js +++ b/app/assets/javascripts/vue_shared/components/content_viewer/lib/viewer_utils.js @@ -15,6 +15,7 @@ const fileExtensionViewers = { gif: 'image', png: 'image', bmp: 'image', + ico: 'image', md: 'markdown', markdown: 'markdown', }; diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 2c0fa0cae53..640532d89c8 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -332,9 +332,11 @@ } .zoomable { + cursor: pointer; cursor: zoom-in; &.zoomed { + cursor: pointer; cursor: zoom-out; max-width: none; max-height: none; |