Merge pull request #7496 from Razer6/captalize_suggested_colors

Consistency: Capitalize hex values of sugested colors

Merge pull request #7496 from Razer6/captalize_suggested_colors
Consistency: Capitalize hex values of sugested colors
97288920 · Jacob Vosmaer · 4142754c · 938eed1e · 97288920 · 97288920
Commit 97288920 authored Aug 18, 2014 by Jacob Vosmaer
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

app/helpers/labels_helper.rb app/helpers/labels_helper.rb +7 -7

app/models/label.rb app/models/label.rb +1 -1

No files found.
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -14,13 +14,13 @@ module LabelsHelper
  def suggested_colors
    [
-      '#d9534f',
+      '#D9534F',
-      '#f0ad4e',
+      '#F0AD4E',
-      '#428bca',
+      '#428BCA',
-      '#5cb85c',
+      '#5CB85C',
-      '#34495e',
+      '#34495E',
-      '#7f8c8d',
+      '#7F8C8D',
-      '#8e44ad',
+      '#8E44AD',
      '#FFECDB'
    ]
  end

--- a/app/models/label.rb
+++ b/app/models/label.rb
 class Label < ActiveRecord::Base
-  DEFAULT_COLOR = '#428bca'
+  DEFAULT_COLOR = '#428BCA'
  belongs_to :project
  has_many :label_links, dependent: :destroy