summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/helpers/application_helper.rb4
-rw-r--r--app/views/snippets/_blob.html.haml5
-rw-r--r--app/views/tree/blob/_text.html.haml5
3 files changed, 8 insertions, 6 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8f4d908d5a7..a689213bcee 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -126,6 +126,10 @@ module ApplicationHelper
Gitlab::Theme.css_class_by_id(current_user.try(:theme_id))
end
+ def user_color_scheme_class
+ current_user.dark_scheme ? :black : :white
+ end
+
def show_last_push_widget?(event)
event &&
event.last_push_to_non_root? &&
diff --git a/app/views/snippets/_blob.html.haml b/app/views/snippets/_blob.html.haml
index 68a5f2bc5ec..ed518300ac0 100644
--- a/app/views/snippets/_blob.html.haml
+++ b/app/views/snippets/_blob.html.haml
@@ -6,8 +6,7 @@
= link_to "raw", raw_project_snippet_path(@project, @snippet), class: "btn very_small", target: "_blank"
.file_content.code
- unless @snippet.content.empty?
- %div{class: current_user.dark_scheme ? "black" : "white"}
- :preserve
- #{raw @snippet.colorize(formatter: :gitlab)}
+ %div{class: user_color_scheme_class}
+ = raw @snippet.colorize(formatter: :gitlab)
- else
%p.nothing_here_message Empty file
diff --git a/app/views/tree/blob/_text.html.haml b/app/views/tree/blob/_text.html.haml
index 37b0ff871b2..122e275219d 100644
--- a/app/views/tree/blob/_text.html.haml
+++ b/app/views/tree/blob/_text.html.haml
@@ -8,8 +8,7 @@
- else
.file_content.code
- unless blob.empty?
- %div{class: current_user.dark_scheme ? "black" : "white"}
- = preserve do
- = raw blob.colorize(formatter: :gitlab)
+ %div{class: user_color_scheme_class}
+ = raw blob.colorize(formatter: :gitlab)
- else
%p.nothing_here_message Empty file