From 5b32fda4b8698deda5402b8c640d36bf5cd69222 Mon Sep 17 00:00:00 2001
From: phortx <benny@itws.de>
Date: Tue, 13 Jan 2015 14:09:19 +0100
Subject: Add more label color suggestions

---
 app/helpers/labels_helper.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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


From e64e0104fa97d6b420aa430018acfcfc3894044b Mon Sep 17 00:00:00 2001
From: phortx <benny@itws.de>
Date: Tue, 13 Jan 2015 15:47:23 +0100
Subject: Reorders label colors for better "rainbow"

---
 app/helpers/labels_helper.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index bf9d9fd2496..a2e6244e8b3 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -14,12 +14,6 @@ module LabelsHelper
 
   def suggested_colors
     [
-      '#CC0033',
-      '#FF0000',
-      '#D9534F',
-      '#D1D100',
-      '#F0AD4E',
-      '#AD8D43',
       '#0033CC',
       '#428BCA',
       '#44AD8E',
@@ -32,9 +26,15 @@ module LabelsHelper
       '#A295D6',
       '#5843AD',
       '#8E44AD',
-      '#AD4363',
       '#FFECDB',
-      '#D10069'
+      '#AD4363',
+      '#D10069',
+      '#CC0033',
+      '#FF0000',
+      '#D9534F',
+      '#D1D100',
+      '#F0AD4E',
+      '#AD8D43'
     ]
   end
 
-- 
cgit v1.2.1


From 7606b93c26ca58211d2cfbbad2e051dcd0ea7c32 Mon Sep 17 00:00:00 2001
From: Benjamin Kammerl <benny@itws.de>
Date: Wed, 11 Feb 2015 10:02:36 +0000
Subject: Change label color text field type to "color"

---
 app/views/projects/labels/_form.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml
index 72a01e1c271..c7380920b47 100644
--- 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
-- 
cgit v1.2.1