diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-25 13:52:26 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-25 13:52:26 +0000 |
commit | 3b93574a356b77419672c564f6046ecd751a7e35 (patch) | |
tree | 7ff7b08f1c926fcd24c92b18f14913e21d1bbfa6 /app/assets/stylesheets/pages/merge_conflicts.scss | |
parent | 9a6770388c0e93f98952a40cc88bb7f5ecd23631 (diff) | |
parent | 791c9d0dd3464eb471262b73a62632ed39d47eb2 (diff) | |
download | gitlab-ce-3b93574a356b77419672c564f6046ecd751a7e35.tar.gz |
Merge branch 'enable-scss-lint-single-line-per-selector' into 'master'
Enable SingleLinePerSelector in scss-lint
## What does this MR do?
Enables `SingleLinePerSelector` in `.scss-lint.yml`
## Are there points in the code the reviewer needs to double check?
This MR touches a lot of files, just need another pair of eyes to look through and make sure I didn't break anything.
## Why was this MR needed?
Improve SCSS maintainability and consistency
## Screenshots (if relevant)
None
## Does this MR meet the acceptance criteria?
- Tests
- [x] Added for this feature/bug
- [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 !7081
Diffstat (limited to 'app/assets/stylesheets/pages/merge_conflicts.scss')
-rw-r--r-- | app/assets/stylesheets/pages/merge_conflicts.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/merge_conflicts.scss b/app/assets/stylesheets/pages/merge_conflicts.scss index 2e917361b25..032feae8854 100644 --- a/app/assets/stylesheets/pages/merge_conflicts.scss +++ b/app/assets/stylesheets/pages/merge_conflicts.scss @@ -101,7 +101,8 @@ $colors: ( @mixin color-scheme($color) { - .header.line_content, .diff-line-num { + .header.line_content, + .diff-line-num { &.origin { background-color: map-get($colors, #{$color}_header_origin_neutral); border-color: map-get($colors, #{$color}_header_origin_neutral); |