diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-24 20:40:06 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-24 20:40:06 +0000 |
commit | 5a4e6721786dd080cd40ca4ea23fc4202a85e73f (patch) | |
tree | e72bc1d6ae529cb4a0f60303665e1a844346720b | |
parent | 4658c9a234b270897b0e9042a3f51fcdc376146b (diff) | |
parent | 2004b30ed60b2de37edcc0e174b0cfdc20e33db4 (diff) | |
download | gitlab-ce-5a4e6721786dd080cd40ca4ea23fc4202a85e73f.tar.gz |
Merge branch 'enable-scss-lint-space-around-operator' into 'master'
Enable SpaceAroundOperator in scss-lint
## What does this MR do?
Enables `SpaceAroundOperator` in .`scss-lint.yml`
## Are there points in the code the reviewer needs to double check?
None
## Why was this MR needed?
Improve SCSS maintainability and consistency
## Screenshots (if relevant)
None
## Does this MR meet the acceptance criteria?
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#23485
See merge request !7078
-rw-r--r-- | .scss-lint.yml | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/modal.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.scss-lint.yml b/.scss-lint.yml index 89f9e74f03d..f3c21ccd149 100644 --- a/.scss-lint.yml +++ b/.scss-lint.yml @@ -201,7 +201,7 @@ linters: # Operators should be formatted with a single space on both sides of an # infix operator. SpaceAroundOperator: - enabled: false + enabled: true # Opening braces should be preceded by a single space. SpaceBeforeBrace: diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index 8374f30d0b2..8cd49280e1c 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -3,7 +3,7 @@ padding: 15px; .form-actions { - margin: -$gl-padding+1; + margin: -$gl-padding + 1; margin-top: 15px; } diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 17f28959414..25c1bbdc1c9 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -8,7 +8,7 @@ .diff-file .diff-content { tr.line_holder:hover > td .line_note_link { opacity: 1.0; - filter: alpha(opacity=100); + filter: alpha(opacity = 100); } } |