From 21958a393955037318141d39fbe14b1c2e842cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Thu, 7 Jan 2016 13:45:19 -0500
Subject: [PATCH] Add some styling for syntax highlighting themes. #3945

---
 app/assets/stylesheets/highlight/dark.scss     | 14 ++++++++++++++
 app/assets/stylesheets/highlight/monokai.scss  | 18 ++++++++++++++++++
 .../stylesheets/highlight/solarized_dark.scss  | 14 ++++++++++++++
 .../stylesheets/highlight/solarized_light.scss | 15 +++++++++++++++
 app/assets/stylesheets/pages/diff.scss         | 15 +++++++++++++++
 .../projects/diffs/_parallel_view.html.haml    |  2 +-
 app/views/projects/diffs/_text_file.html.haml  |  2 +-
 7 files changed, 78 insertions(+), 2 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);
+    }
+  }
 }
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index afd6fb73675..caaad1e31d3 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -402,3 +402,18 @@
     right: 15px;
   }
 }
+
+@mixin diff_background($r, $g, $b, $custom-border) {
+  /* Fallback for web browsers that doesn't support RGBa */
+  background: rgb($r, $g, $b);
+  /* RGBa with 0.3 opacity */
+  background: rgba($r, $g, $b, 0.3);
+
+  &.new_line, &.old_line {
+    border-right-color: $custom-border !important;
+  }
+
+  &.line_content span.idiff {
+    background: rgb($r, $g, $b);
+  }
+}
diff --git a/app/views/projects/diffs/_parallel_view.html.haml b/app/views/projects/diffs/_parallel_view.html.haml
index 2a43bbd11f2..1ad54d1848b 100644
--- a/app/views/projects/diffs/_parallel_view.html.haml
+++ b/app/views/projects/diffs/_parallel_view.html.haml
@@ -1,5 +1,5 @@
 / Side-by-side diff view
-%div.text-file.diff-wrap-lines.code.file-content.js-syntax-highlight.white
+%div.text-file.diff-wrap-lines.code.file-content.js-syntax-highlight
   %table
     - parallel_diff(diff_file, index).each do |line|
       - type_left = line[0]
diff --git a/app/views/projects/diffs/_text_file.html.haml b/app/views/projects/diffs/_text_file.html.haml
index 8e86219155f..f1b8cba5e55 100644
--- a/app/views/projects/diffs/_text_file.html.haml
+++ b/app/views/projects/diffs/_text_file.html.haml
@@ -3,7 +3,7 @@
   .suppressed-container
     %a.show-suppressed-diff.js-show-suppressed-diff Changes suppressed. Click to show.
 
-%table.text-file.code.js-syntax-highlight.white{ class: too_big ? 'hide' : '' }
+%table.text-file.code.js-syntax-highlight{ class: too_big ? 'hide' : '' }
 
   - last_line = 0
   - diff_file.highlighted_diff_lines.each_with_index do |line, index|
-- 
GitLab