summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/highlight
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 00:08:09 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 00:08:09 +0000
commitf6e2f302412fcb32b644b379778964791789cb62 (patch)
tree29ed98fca33be12adc21ee75185a459c668fb7da /app/assets/stylesheets/highlight
parent95ad46159e4cd93f2b31838199180d824e041994 (diff)
downloadgitlab-ce-f6e2f302412fcb32b644b379778964791789cb62.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/stylesheets/highlight')
-rw-r--r--app/assets/stylesheets/highlight/themes/none.scss14
-rw-r--r--app/assets/stylesheets/highlight/white_base.scss2
2 files changed, 8 insertions, 8 deletions
diff --git a/app/assets/stylesheets/highlight/themes/none.scss b/app/assets/stylesheets/highlight/themes/none.scss
index c8ac3aa8305..2fc5d7f7a85 100644
--- a/app/assets/stylesheets/highlight/themes/none.scss
+++ b/app/assets/stylesheets/highlight/themes/none.scss
@@ -30,7 +30,7 @@
&,
pre.code,
.line_holder .line_content {
- background-color: $white-light;
+ background-color: $white;
color: $gl-text-color;
}
@@ -84,7 +84,7 @@
}
&.hll:not(.empty-cell) {
- background-color: $white-light;
+ background-color: $white;
border-color: $white-normal;
}
}
@@ -160,25 +160,25 @@
text-decoration: underline;
}
- .hll { background-color: $white-light; }
+ .hll { background-color: $white; }
.gd {
color: $gl-text-color;
- background-color: $white-light;
+ background-color: $white;
.x {
color: $gl-text-color;
- background-color: $white-light;
+ background-color: $white;
}
}
.gi {
color: $gl-text-color;
- background-color: $white-light;
+ background-color: $white;
.x {
color: $gl-text-color;
- background-color: $white-light;
+ background-color: $white;
}
}
diff --git a/app/assets/stylesheets/highlight/white_base.scss b/app/assets/stylesheets/highlight/white_base.scss
index d82a0794d29..3e126a52c4b 100644
--- a/app/assets/stylesheets/highlight/white_base.scss
+++ b/app/assets/stylesheets/highlight/white_base.scss
@@ -97,7 +97,7 @@ pre.code,
&,
pre.code,
.line_holder .line_content {
- background-color: $white-light;
+ background-color: $white;
color: $white-code-color;
}