From: Riyad Preukschas Date: Tue, 27 Nov 2012 21:49:22 +0000 (+0100) Subject: Add user_color_scheme_class helper X-Git-Tag: v4.0.0rc1~129^2~1^2~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=184a9ecaf6cf25e429fe5653380e356b25a15a90;p=wvm%2Fgitlab.git Add user_color_scheme_class helper --- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8f4d908d5..a689213bc 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 68a5f2bc5..ed518300a 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 37b0ff871..122e27521 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