diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-10-24 23:22:06 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-10-24 23:22:06 +0300 |
| commit | 791c9d0dd3464eb471262b73a62632ed39d47eb2 (patch) | |
| tree | 7d69d8727424a32709daf6b6d0595179d78a5872 /app/assets/stylesheets/pages/merge_conflicts.scss | |
| parent | cb38290ababe43aca0c635fb87d3a38c4c5debcd (diff) | |
Enable SingleLinePerSelector in scss-lint
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 eed2b0ab7cc..aa8057e4b9d 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); |