diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-18 17:06:38 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-08-18 17:06:38 +0200 |
| commit | 97288920d6d25affbe6f5d75e612a5e8cd832a01 (patch) | |
| tree | d65555ca172bd1a9a09c61c534e19f2d3264a5e5 | |
| parent | 4142754c7f1dda713519b62df76cbc03c9e299c1 (diff) | |
| parent | 938eed1ef8c8d123920ce9466d6879676716d7c1 (diff) | |
| download | gitlab-ce-97288920d6d25affbe6f5d75e612a5e8cd832a01.tar.gz | |
Merge pull request #7496 from Razer6/captalize_suggested_colors
Consistency: Capitalize hex values of sugested colors
| -rw-r--r-- | app/helpers/labels_helper.rb | 14 | ||||
| -rw-r--r-- | app/models/label.rb | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index 5bfba4f14f2..19d688c4bb8 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -14,13 +14,13 @@ module LabelsHelper def suggested_colors [ - '#d9534f', - '#f0ad4e', - '#428bca', - '#5cb85c', - '#34495e', - '#7f8c8d', - '#8e44ad', + '#D9534F', + '#F0AD4E', + '#428BCA', + '#5CB85C', + '#34495E', + '#7F8C8D', + '#8E44AD', '#FFECDB' ] end diff --git a/app/models/label.rb b/app/models/label.rb index 819d6cefa41..3ff52416c24 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -1,5 +1,5 @@ class Label < ActiveRecord::Base - DEFAULT_COLOR = '#428bca' + DEFAULT_COLOR = '#428BCA' belongs_to :project has_many :label_links, dependent: :destroy |