kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

remove red/green colors from diff view of no-color syntax theme

Browse source
This commit is contained in:
khm 2019-01-24 17:30:08 +00:00 committed by Fatih Acet
parent 664567a8c2
commit d3fed349fb
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/assets/stylesheets/highlight/none.scss
View file

@ -38,7 +38,7 @@
$none-over-bg: #ded7fc; $none-over-bg: #ded7fc;
$none-expanded-border: #e0e0e0; $none-expanded-border: #e0e0e0;
$none-expanded-bg: #f7f7f7; $none-expanded-bg: #e0e0e0;
.line_holder { .line_holder {
@ -50,18 +50,12 @@
.diff-line-num { .diff-line-num {
&.old { &.old {
background-color: $line-number-old;
border-color: $line-removed-dark;
a { a {
color: scale-color($line-number-old, $red: -30%, $green: -30%, $blue: -30%); color: scale-color($line-number-old, $red: -30%, $green: -30%, $blue: -30%);
} }
} }
&.new { &.new {
background-color: $line-number-new;
border-color: $line-added-dark;
a { a {
color: scale-color($line-number-new, $red: -30%, $green: -30%, $blue: -30%); color: scale-color($line-number-new, $red: -30%, $green: -30%, $blue: -30%);
} }
@ -78,8 +72,8 @@
} }
&.hll:not(.empty-cell) { &.hll:not(.empty-cell) {
background-color: $line-number-select; background-color: $white-light;
border-color: $line-select-yellow-dark; border-color: $white-normal;
} }
} }
@ -101,26 +95,28 @@
.line_content { .line_content {
&.old { &.old {
background-color: $line-removed; background-color: $white-normal;
&::before { &::before {
color: scale-color($line-number-old, $red: -30%, $green: -30%, $blue: -30%); color: $gl-text-color;
} }
span.idiff { span.idiff {
background-color: $line-removed-dark; background-color: $white-normal;
text-decoration: underline;
} }
} }
&.new { &.new {
background-color: $line-added; background-color: $white-normal;
&::before { &::before {
color: scale-color($line-number-new, $red: -30%, $green: -30%, $blue: -30%); color: $gl-text-color;
} }
span.idiff { span.idiff {
background-color: $line-added-dark; background-color: $white-normal;
text-decoration: underline;
} }
} }
@ -129,7 +125,7 @@
} }
&.hll:not(.empty-cell) { &.hll:not(.empty-cell) {
background-color: $line-select-yellow; background-color: $white-normal;
} }
} }
} }

5
changelogs/unreleased/remove-diff-coloring.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: 'remove red/green colors from diff view of no-color syntax theme'
merge_request: 24582
author: khm
type: changed