diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-09-28 12:07:30 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-09-28 12:07:30 -0500 |
| commit | bbad5db62676f5a03ea0d3b03ff780ee12df3ff1 (patch) | |
| tree | 14c26250463d99f3b0476ab9efbfd55739060624 | |
| parent | 51fcea7a91ed51ee45f8f99b1016084fa9c78e66 (diff) | |
| download | gitlab-ce-fix-html5-color-inputs.tar.gz | |
remove instances of <input type="color" /> due to inconsistent browser supportfix-html5-color-inputs
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/labels/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/labels/_form.html.haml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 6b157abf842..f952d2e9aa1 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -18,11 +18,11 @@ .form-group.js-toggle-colors-container.hide = f.label :color, "Background Color", class: 'control-label' .col-sm-10 - = f.color_field :color, class: "form-control" + = f.text_field :color, class: "form-control" .form-group.js-toggle-colors-container.hide = f.label :font, "Font Color", class: 'control-label' .col-sm-10 - = f.color_field :font, class: "form-control" + = f.text_field :font, class: "form-control" .form-group = f.label :starts_at, class: 'control-label' .col-sm-10.datetime-controls diff --git a/app/views/admin/labels/_form.html.haml b/app/views/admin/labels/_form.html.haml index 602cfa9b6fc..d5e6bede36a 100644 --- a/app/views/admin/labels/_form.html.haml +++ b/app/views/admin/labels/_form.html.haml @@ -14,7 +14,7 @@ .col-sm-10 .input-group .input-group-addon.label-color-preview - = f.color_field :color, class: "form-control" + = f.text_field :color, class: "form-control" .help-block Choose any color. %br diff --git a/app/views/projects/labels/_form.html.haml b/app/views/projects/labels/_form.html.haml index aa143e54ffe..6ab6ae50389 100644 --- a/app/views/projects/labels/_form.html.haml +++ b/app/views/projects/labels/_form.html.haml @@ -14,7 +14,7 @@ .col-sm-10 .input-group .input-group-addon.label-color-preview - = f.color_field :color, class: "form-control" + = f.text_field :color, class: "form-control" .help-block Choose any color. %br |