Commit e629c45d authored by Sytse Sijbrandij's avatar Sytse Sijbrandij

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

parents d899bc91 cab72628
...@@ -14,14 +14,27 @@ module LabelsHelper ...@@ -14,14 +14,27 @@ module LabelsHelper
def suggested_colors def suggested_colors
[ [
'#D9534F', '#0033CC',
'#F0AD4E',
'#428BCA', '#428BCA',
'#44AD8E',
'#A8D695',
'#5CB85C', '#5CB85C',
'#69D100',
'#004E00',
'#34495E', '#34495E',
'#7F8C8D', '#7F8C8D',
'#A295D6',
'#5843AD',
'#8E44AD', '#8E44AD',
'#FFECDB' '#FFECDB',
'#AD4363',
'#D10069',
'#CC0033',
'#FF0000',
'#D9534F',
'#D1D100',
'#F0AD4E',
'#AD8D43'
] ]
end end
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.col-sm-10 .col-sm-10
.input-group .input-group
.input-group-addon.label-color-preview   .input-group-addon.label-color-preview  
= f.text_field :color, placeholder: "#AA33EE", class: "form-control" = f.color_field :color, placeholder: "#AA33EE", class: "form-control"
.help-block .help-block
6 character hex values starting with a # sign. 6 character hex values starting with a # sign.
%br %br
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment