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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
83b5a9ae
Commit
83b5a9ae
authored
Mar 24, 2015
by
Andrew Tomaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update help texts and default value setting
parent
4349e524
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
app/views/admin/broadcast_messages/index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+2
-4
app/views/projects/labels/_form.html.haml
app/views/projects/labels/_form.html.haml
+2
-2
No files found.
app/views/admin/broadcast_messages/index.html.haml
View file @
83b5a9ae
...
@@ -21,13 +21,11 @@
...
@@ -21,13 +21,11 @@
.form-group.js-toggle-colors-container.hide
.form-group.js-toggle-colors-container.hide
=
f
.
label
:color
,
"Background Color"
,
class:
'control-label'
=
f
.
label
:color
,
"Background Color"
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
f
.
color_field
:color
,
placeholder:
"#AA33EE"
,
class:
"form-control"
=
f
.
color_field
:color
,
value:
"#AA33EE"
,
class:
"form-control"
.light
6 character hex values starting with a # sign.
.form-group.js-toggle-colors-container.hide
.form-group.js-toggle-colors-container.hide
=
f
.
label
:font
,
"Font Color"
,
class:
'control-label'
=
f
.
label
:font
,
"Font Color"
,
class:
'control-label'
.col-sm-10
.col-sm-10
=
f
.
color_field
:font
,
placeholder:
"#224466"
,
class:
"form-control"
=
f
.
color_field
:font
,
value:
"#224466"
,
class:
"form-control"
.light
6 character hex values starting with a # sign.
.form-group
.form-group
=
f
.
label
:starts_at
,
class:
'control-label'
=
f
.
label
:starts_at
,
class:
'control-label'
.col-sm-10.datetime-controls
.col-sm-10.datetime-controls
...
...
app/views/projects/labels/_form.html.haml
View file @
83b5a9ae
...
@@ -16,9 +16,9 @@
...
@@ -16,9 +16,9 @@
.col-sm-10
.col-sm-10
.input-group
.input-group
.input-group-addon.label-color-preview
.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
.help-block
6 character hex values starting with a # sign
.
Choose any color
.
%br
%br
Or you can choose one of suggested colors below
Or you can choose one of suggested colors below
...
...
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