diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-12 14:43:28 -0800 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-12 14:43:28 -0800 |
| commit | 1d9e9c1b920c01122924afe86a949bc97678f06e (patch) | |
| tree | f42a7094e5c4c5d381dbbf82a3532170608f2a0c | |
| parent | 2be3a012ff6b6feaf422996ba125821022e72a00 (diff) | |
| parent | e629c45d88390b0982201362119d24f2337530a3 (diff) | |
| download | gitlab-ce-1d9e9c1b920c01122924afe86a949bc97678f06e.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | app/helpers/labels_helper.rb | 19 | ||||
| -rw-r--r-- | app/views/projects/labels/_form.html.haml | 2 |
2 files changed, 17 insertions, 4 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index add0fef512e..49063491abf 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -14,14 +14,27 @@ module LabelsHelper def suggested_colors [ - '#D9534F', - '#F0AD4E', + '#0033CC', '#428BCA', + '#44AD8E', + '#A8D695', '#5CB85C', + '#69D100', + '#004E00', '#34495E', '#7F8C8D', + '#A295D6', + '#5843AD', '#8E44AD', - '#FFECDB' + '#FFECDB', + '#AD4363', + '#D10069', + '#CC0033', + '#FF0000', + '#D9534F', + '#D1D100', + '#F0AD4E', + '#AD8D43' ] end 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 - = 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 |