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
Kazuhiko Shiozaki
gitlab-ce
Commits
1c7febc3
Commit
1c7febc3
authored
Dec 31, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style the broadcast message form
parent
79361b20
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
app/assets/stylesheets/framework/forms.scss
app/assets/stylesheets/framework/forms.scss
+4
-0
app/views/admin/broadcast_messages/index.html.haml
app/views/admin/broadcast_messages/index.html.haml
+8
-5
app/views/layouts/_broadcast.html.haml
app/views/layouts/_broadcast.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/forms.scss
View file @
1c7febc3
...
@@ -78,6 +78,10 @@ label {
...
@@ -78,6 +78,10 @@ label {
padding
:
8px
$gl-padding
;
padding
:
8px
$gl-padding
;
}
}
.form-control-inline
{
display
:
inline
;
}
.wiki-content
{
.wiki-content
{
margin-top
:
35px
;
margin-top
:
35px
;
}
}
...
...
app/views/admin/broadcast_messages/index.html.haml
View file @
1c7febc3
-
page_title
"Broadcast Messages"
-
page_title
"Broadcast Messages"
%h3
.page-title
%h3
.page-title
Broadcast Messages
Broadcast Messages
%p
.light
%p
.light
Broadcast messages are displayed for every user and can be used to notify users about scheduled maintenance, recent upgrades and more.
Broadcast messages are displayed for every user and can be used to notify
users about scheduled maintenance, recent upgrades and more.
.broadcast-message-preview
.broadcast-message-preview
%i
.fa.fa-bullhorn
=
icon
(
'bullhorn'
)
%span
Your message here
%span
Your message here
=
form_for
[
:admin
,
@broadcast_message
],
html:
{
class:
'broadcast-message-form form-horizontal js-requires-input'
}
do
|
f
|
=
form_for
[
:admin
,
@broadcast_message
],
html:
{
class:
'broadcast-message-form form-horizontal js-requires-input'
}
do
|
f
|
...
@@ -21,7 +24,7 @@
...
@@ -21,7 +24,7 @@
.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
,
value:
"#
eb9532
"
,
class:
"form-control"
=
f
.
color_field
:color
,
value:
"#
E75E40
"
,
class:
"form-control"
.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
...
@@ -29,11 +32,11 @@
...
@@ -29,11 +32,11 @@
.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
=
f
.
datetime_select
:starts_at
=
f
.
datetime_select
:starts_at
,
{},
class:
'form-control form-control-inline'
.form-group
.form-group
=
f
.
label
:ends_at
,
class:
'control-label'
=
f
.
label
:ends_at
,
class:
'control-label'
.col-sm-10.datetime-controls
.col-sm-10.datetime-controls
=
f
.
datetime_select
:ends_at
=
f
.
datetime_select
:ends_at
,
{},
class:
'form-control form-control-inline'
.form-actions
.form-actions
=
f
.
submit
"Add broadcast message"
,
class:
"btn btn-create"
=
f
.
submit
"Add broadcast message"
,
class:
"btn btn-create"
...
...
app/views/layouts/_broadcast.html.haml
View file @
1c7febc3
-
if
broadcast_message
.
present?
-
if
broadcast_message
.
present?
.broadcast-message
{
style:
broadcast_styling
(
broadcast_message
)
}
.broadcast-message
{
style:
broadcast_styling
(
broadcast_message
)
}
%i
.fa.fa-bullhorn
=
icon
(
'bullhorn'
)
=
broadcast_message
.
message
=
broadcast_message
.
message
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