Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
1d9e9c1b
Commit
1d9e9c1b
authored
Feb 12, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
2be3a012
e629c45d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
4 deletions
+17
-4
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+16
-3
app/views/projects/labels/_form.html.haml
app/views/projects/labels/_form.html.haml
+1
-1
No files found.
app/helpers/labels_helper.rb
View file @
1d9e9c1b
...
@@ -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
...
...
app/views/projects/labels/_form.html.haml
View file @
1d9e9c1b
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment