summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-15 10:20:12 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-08-15 10:20:12 +0300
commit0602c5d0279dba64bd3a34d2cc8ce39224ccaa49 (patch)
tree32e1daf41fe7257c17efef8121a0bf2199a6918a
parent433dac7799a1a5fd4a0dfeaa0157148eb9058202 (diff)
downloadgitlab-ce-0602c5d0279dba64bd3a34d2cc8ce39224ccaa49.tar.gz
Change default label color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/helpers/labels_helper.rb2
-rw-r--r--app/models/label.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 37f3832e54f..5bfba4f14f2 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -4,7 +4,7 @@ module LabelsHelper
end
def render_colored_label(label)
- label_color = label.color || "#428bca"
+ label_color = label.color || Label::DEFAULT_COLOR
text_color = text_color_for_bg(label_color)
content_tag :span, class: 'label color-label', style: "background:#{label_color};color:#{text_color}" do
diff --git a/app/models/label.rb b/app/models/label.rb
index a511b7940ed..c32efc7c47f 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -1,5 +1,5 @@
class Label < ActiveRecord::Base
- DEFAULT_COLOR = '#82C5FF'
+ DEFAULT_COLOR = '#428bca'
belongs_to :project
has_many :label_links, dependent: :destroy