diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 15:27:58 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-24 15:27:58 -0700 |
| commit | 3a602c8432fe6c72f6ed1a7e2314317bfceb33ba (patch) | |
| tree | 8da570700485e2b5ca56b779bc2b10ccbafaa303 | |
| parent | fc4af9b1975827d4e5ead18dc3468d9aa29cd9ac (diff) | |
| parent | 83b5a9ae2bfb594bcb5a9a931d6781ba05c9b9ef (diff) | |
| download | gitlab-ce-3a602c8432fe6c72f6ed1a7e2314317bfceb33ba.tar.gz | |
Merge pull request #9007 from atomaka/atomaka/feature/broadcast-message-colors
Complete transition to using color_field for selecting colors
| -rw-r--r-- | app/views/admin/broadcast_messages/index.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/labels/_form.html.haml | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/views/admin/broadcast_messages/index.html.haml b/app/views/admin/broadcast_messages/index.html.haml index c0afaf16d8f..7e29311bf42 100644 --- a/app/views/admin/broadcast_messages/index.html.haml +++ b/app/views/admin/broadcast_messages/index.html.haml @@ -21,13 +21,11 @@ .form-group.js-toggle-colors-container.hide = f.label :color, "Background Color", class: 'control-label' .col-sm-10 - = f.text_field :color, placeholder: "#AA33EE", class: "form-control" - .light 6 character hex values starting with a # sign. + = f.color_field :color, value: "#AA33EE", class: "form-control" .form-group.js-toggle-colors-container.hide = f.label :font, "Font Color", class: 'control-label' .col-sm-10 - = f.text_field :font, placeholder: "#224466", class: "form-control" - .light 6 character hex values starting with a # sign. + = f.color_field :font, value: "#224466", class: "form-control" .form-group = f.label :starts_at, class: 'control-label' .col-sm-10.datetime-controls diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml index 2305fce112e..ad993db6c0b 100644 --- a/app/views/projects/labels/_form.html.haml +++ b/app/views/projects/labels/_form.html.haml @@ -16,9 +16,9 @@ .col-sm-10 .input-group .input-group-addon.label-color-preview - = f.color_field :color, placeholder: "#AA33EE", class: "form-control" + = f.color_field :color, value: "#AA33EE", class: "form-control" .help-block - 6 character hex values starting with a # sign. + Choose any color. %br Or you can choose one of suggested colors below |