BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
dbfafd44
Commit
dbfafd44
authored
Jun 19, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '28139-use-color-input-broadcast-messages' into 'master'
Use color inputs for broadcast messages Closes #28139 See merge request !12237
parents
17eff579
1ecfc7d8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
_form.html.haml
app/views/admin/broadcast_messages/_form.html.haml
+2
-2
28139-use-color-input-broadcast-messages.yml
...s/unreleased/28139-use-color-input-broadcast-messages.yml
+4
-0
No files found.
app/views/admin/broadcast_messages/_form.html.haml
View file @
dbfafd44
...
...
@@ -21,11 +21,11 @@
.form-group.js-toggle-colors-container.hide
=
f
.
label
:color
,
"Background Color"
,
class:
'control-label'
.col-sm-10
=
f
.
text
_field
:color
,
class:
"form-control"
=
f
.
color
_field
:color
,
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
,
class:
"form-control"
=
f
.
color
_field
:font
,
class:
"form-control"
.form-group
=
f
.
label
:starts_at
,
class:
'control-label'
.col-sm-10.datetime-controls
...
...
changelogs/unreleased/28139-use-color-input-broadcast-messages.yml
0 → 100644
View file @
dbfafd44
---
title
:
Use color inputs for broadcast messages
merge_request
:
author
:
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