summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/highlight
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-01-09 02:24:30 -0500
committerRubén Dávila <rdavila84@gmail.com>2016-01-09 09:27:43 -0500
commitee2230c3291354035f52cc4d87e3340982367fa1 (patch)
tree574aef111d052faa1cb2ac470c068b35c13ae1fa /app/assets/stylesheets/highlight
parentfed10766e533fcef2a6840deeb8d7ea1747f0c72 (diff)
downloadgitlab-ce-ee2230c3291354035f52cc4d87e3340982367fa1.tar.gz
Fix css for other highlighting themes. #3945
Diffstat (limited to 'app/assets/stylesheets/highlight')
-rw-r--r--app/assets/stylesheets/highlight/dark.scss4
-rw-r--r--app/assets/stylesheets/highlight/solarized_dark.scss4
-rw-r--r--app/assets/stylesheets/highlight/solarized_light.scss4
3 files changed, 12 insertions, 0 deletions
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss
index f7d1334705f..8201735beb5 100644
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -92,12 +92,16 @@
.il { color: #de935f } /* Literal.Number.Integer.Long */
.line_holder {
+ &.parallel .new.new_line,
+ &.parallel .new.line_content,
&.new .old_line,
&.new .new_line,
&.new .line_content {
@include diff_background(255, 255, 255, #808080);
}
+ &.parallel .old.old_line,
+ &.parallel .old.line_content,
&.old .old_line,
&.old .new_line,
&.old .line_content {
diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss
index 2c3648274cf..fdfac6cd249 100644
--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -113,12 +113,16 @@
.il { color: #2aa198 } /* Literal.Number.Integer.Long */
.line_holder {
+ &.parallel .new.new_line,
+ &.parallel .new.line_content,
&.new .old_line,
&.new .new_line,
&.new .line_content {
@include diff_background(255, 255, 255, #808080);
}
+ &.parallel .old.old_line,
+ &.parallel .old.line_content,
&.old .old_line,
&.old .new_line,
&.old .line_content {
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss
index c16473ffe66..f9788951aa8 100644
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -114,12 +114,16 @@
.line_holder {
+ &.parallel .new.new_line,
+ &.parallel .new.line_content,
&.new .old_line,
&.new .new_line,
&.new .line_content {
@include diff_background(92, 164, 169, #FAF3DD);
}
+ &.parallel .old.old_line,
+ &.parallel .old.line_content,
&.old .old_line,
&.old .new_line,
&.old .line_content {