summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Alonso Chavez Armendariz <lchavez@nearsoft.com>2016-11-16 16:21:28 -0700
committerLuis Alonso Chavez Armendariz <lchavez@nearsoft.com>2016-11-16 16:21:28 -0700
commite6271bb04326ff146b85a976d4b59973eb43c2c5 (patch)
treeb1ac40f8dc93aa0e0a03f6f51b7336f2f4a2a239
parent3de1e71c8bef597034ba39992ff2753c3006439e (diff)
downloadgitlab-ce-e6271bb04326ff146b85a976d4b59973eb43c2c5.tar.gz
Add placeholder in the color input inside the create new label popup
-rw-r--r--app/views/shared/issuable/_label_page_create.html.haml2
-rw-r--r--changelogs/unreleased/issue-24512.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_label_page_create.html.haml b/app/views/shared/issuable/_label_page_create.html.haml
index 3bc57d3d2ac..bd66f39fa59 100644
--- a/app/views/shared/issuable/_label_page_create.html.haml
+++ b/app/views/shared/issuable/_label_page_create.html.haml
@@ -9,7 +9,7 @@
&nbsp
.dropdown-label-color-input
.dropdown-label-color-preview.js-dropdown-label-color-preview
- %input#new_label_color.default-dropdown-input{ type: "text" }
+ %input#new_label_color.default-dropdown-input{ type: "text", placeholder: "Assign custom color like #FF0000" }
.clearfix
%button.btn.btn-primary.pull-left.js-new-label-btn{ type: "button" }
Create
diff --git a/changelogs/unreleased/issue-24512.yml b/changelogs/unreleased/issue-24512.yml
new file mode 100644
index 00000000000..a3a9bd9c3d1
--- /dev/null
+++ b/changelogs/unreleased/issue-24512.yml
@@ -0,0 +1,4 @@
+---
+title: Add placeholder for the example text for custom hex color on label creation popup
+merge_request:
+author: Luis Alonso Chavez Armendariz