diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-03-31 12:13:25 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-04-07 15:33:18 -0700 |
| commit | c80c1da7802c372607f5a025ef2f3e25202734c3 (patch) | |
| tree | 3a064ea72263acd04d955c39a98be64f36e75782 /app/assets/stylesheets/highlight | |
| parent | b59d4e861c5e7e9d9113afbadeef6528be321a79 (diff) | |
| download | gitlab-ce-c80c1da7802c372607f5a025ef2f3e25202734c3.tar.gz | |
Move diff colors to variables
Diffstat (limited to 'app/assets/stylesheets/highlight')
| -rw-r--r-- | app/assets/stylesheets/highlight/solarized_light.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/highlight/white.scss | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss index b90c95c62d1..c482a1258f7 100644 --- a/app/assets/stylesheets/highlight/solarized_light.scss +++ b/app/assets/stylesheets/highlight/solarized_light.scss @@ -6,7 +6,7 @@ } .diff-line-num, .diff-line-num a { - color: rgba(0, 0, 0, 0.3); + color: $black-transparent; } // Code itself @@ -30,7 +30,7 @@ } .line_content.match { - color: rgba(0, 0, 0, 0.3); + color: $black-transparent; background: rgba(255, 255, 255, 0.4); } } diff --git a/app/assets/stylesheets/highlight/white.scss b/app/assets/stylesheets/highlight/white.scss index 8c1b0cd84ec..80918970a75 100644 --- a/app/assets/stylesheets/highlight/white.scss +++ b/app/assets/stylesheets/highlight/white.scss @@ -6,7 +6,7 @@ } .diff-line-num, .diff-line-num a { - color: rgba(0, 0, 0, 0.3); + color: $black-transparent; } // Code itself @@ -23,36 +23,36 @@ .line_holder { .diff-line-num { &.old { - background: #fdd; - border-color: #f1c0c0; + background-color: $line-number-old; + border-color: $line-number-old-border; } &.new { - background: #dbffdb; - border-color: #c1e9c1; + background-color: $line-number-new; + border-color: $line-number-new-border; } } .line_content { &.old { - background: #ffecec; + background: $line-removed; span.idiff { - background-color: #f8cbcb; + background-color: $line-removed-dark; } } &.new { - background: #eaffea; + background-color: $line-added; span.idiff { - background-color: #a6f3a6; + background-color: $line-added-dark; } } &.match { - color: rgba(0, 0, 0, 0.3); - background: #fafafa; + color: $black-transparent; + background: $match-line; } } } |