Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRubén Dávila <rdavila84@gmail.com>2016-01-07 21:45:19 +0300
committerRubén Dávila <rdavila84@gmail.com>2016-01-07 21:45:19 +0300
commit21958a393955037318141d39fbe14b1c2e842cab (patch)
tree3f8bb2ec8ffa53d2128efe04ad937e37590526cd /app/assets/stylesheets/highlight
parent1494bb3f253b2e37065080c27af22ec531966ab7 (diff)
Add some styling for syntax highlighting themes. #3945
Diffstat (limited to 'app/assets/stylesheets/highlight')
-rw-r--r--app/assets/stylesheets/highlight/dark.scss14
-rw-r--r--app/assets/stylesheets/highlight/monokai.scss18
-rw-r--r--app/assets/stylesheets/highlight/solarized_dark.scss14
-rw-r--r--app/assets/stylesheets/highlight/solarized_light.scss15
4 files changed, 61 insertions, 0 deletions
diff --git a/app/assets/stylesheets/highlight/dark.scss b/app/assets/stylesheets/highlight/dark.scss
index 6a2b25ddc67..f7d1334705f 100644
--- a/app/assets/stylesheets/highlight/dark.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -90,4 +90,18 @@
.vg { color: #cc6666 } /* Name.Variable.Global */
.vi { color: #cc6666 } /* Name.Variable.Instance */
.il { color: #de935f } /* Literal.Number.Integer.Long */
+
+ .line_holder {
+ &.new .old_line,
+ &.new .new_line,
+ &.new .line_content {
+ @include diff_background(255, 255, 255, #808080);
+ }
+
+ &.old .old_line,
+ &.old .new_line,
+ &.old .line_content {
+ @include diff_background(255, 51, 51, #808080);
+ }
+ }
}
diff --git a/app/assets/stylesheets/highlight/monokai.scss b/app/assets/stylesheets/highlight/monokai.scss
index 8560c3c490f..cc03ed6ae45 100644
--- a/app/assets/stylesheets/highlight/monokai.scss
+++ b/app/assets/stylesheets/highlight/monokai.scss
@@ -90,4 +90,22 @@
.gu { color: #75715e; } /* Generic.Subheading & Diff Unified/Comment? */
.gd { color: #f92672; } /* Generic.Deleted & Diff Deleted */
.gi { color: #a6e22e; } /* Generic.Inserted & Diff Inserted */
+
+ .line_holder {
+ &.parallel .new.new_line,
+ &.parallel .new.line_content,
+ &.new .old_line,
+ &.new .new_line,
+ &.new .line_content {
+ @include diff_background(156, 175, 183, #808080);
+ }
+
+ &.parallel .old.old_line,
+ &.parallel .old.line_content,
+ &.old .old_line,
+ &.old .new_line,
+ &.old .line_content {
+ @include diff_background(254, 147, 140, #808080);
+ }
+ }
}
diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss
index 7d489a9666b..2c3648274cf 100644
--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -111,4 +111,18 @@
.vg { color: #268bd2 } /* Name.Variable.Global */
.vi { color: #268bd2 } /* Name.Variable.Instance */
.il { color: #2aa198 } /* Literal.Number.Integer.Long */
+
+ .line_holder {
+ &.new .old_line,
+ &.new .new_line,
+ &.new .line_content {
+ @include diff_background(255, 255, 255, #808080);
+ }
+
+ &.old .old_line,
+ &.old .new_line,
+ &.old .line_content {
+ @include diff_background(255, 51, 51, #808080);
+ }
+ }
}
diff --git a/app/assets/stylesheets/highlight/solarized_light.scss b/app/assets/stylesheets/highlight/solarized_light.scss
index 200ed346446..c16473ffe66 100644
--- a/app/assets/stylesheets/highlight/solarized_light.scss
+++ b/app/assets/stylesheets/highlight/solarized_light.scss
@@ -111,4 +111,19 @@
.vg { color: #268bd2 } /* Name.Variable.Global */
.vi { color: #268bd2 } /* Name.Variable.Instance */
.il { color: #2aa198 } /* Literal.Number.Integer.Long */
+
+
+ .line_holder {
+ &.new .old_line,
+ &.new .new_line,
+ &.new .line_content {
+ @include diff_background(92, 164, 169, #FAF3DD);
+ }
+
+ &.old .old_line,
+ &.old .new_line,
+ &.old .line_content {
+ @include diff_background(237, 106, 90, #FAF3DD);
+ }
+ }
}