Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

1d9e9c1b · Dmitriy Zaporozhets · 2be3a012 · e629c45d · 1d9e9c1b · 1d9e9c1b
Commit 1d9e9c1b authored Feb 12, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 4 deletions

app/helpers/labels_helper.rb app/helpers/labels_helper.rb +16 -3

app/views/projects/labels/_form.html.haml app/views/projects/labels/_form.html.haml +1 -1

No files found.
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -14,14 +14,27 @@ module LabelsHelper
  def suggested_colors
    [
-      '#D9534F',
+      '#0033CC',
-      '#F0AD4E',
      '#428BCA',
+      '#44AD8E',
+      '#A8D695',
      '#5CB85C',
+      '#69D100',
+      '#004E00',
      '#34495E',
      '#7F8C8D',
+      '#A295D6',
+      '#5843AD',
      '#8E44AD',
-      '#FFECDB'
+      '#FFECDB',
+      '#AD4363',
+      '#D10069',
+      '#CC0033',
+      '#FF0000',
+      '#D9534F',
+      '#D1D100',
+      '#F0AD4E',
+      '#AD8D43'
    ]
  end

--- a/app/views/projects/labels/_form.html.haml
+++ b/app/views/projects/labels/_form.html.haml
@@ -16,7 +16,7 @@
    .col-sm-10
      .input-group
        .input-group-addon.label-color-preview &nbsp;
-        = f.text_field :color, placeholder: "#AA33EE", class: "form-control"
+        = f.color_field :color, placeholder: "#AA33EE", class: "form-control"
      .help-block
        6 character hex values starting with a # sign.
        %br