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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
6cd42110
Commit
6cd42110
authored
Dec 13, 2019
by
Jeremy Elder
Committed by
Annabel Dunstone Gray
Dec 13, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replacing fa-bullhorn icon with GitLab bullhorn SVG icon
parent
eb8d36bb
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/stylesheets/framework/common.scss
app/assets/stylesheets/framework/common.scss
+1
-0
app/helpers/broadcast_messages_helper.rb
app/helpers/broadcast_messages_helper.rb
+1
-1
app/views/admin/broadcast_messages/_form.html.haml
app/views/admin/broadcast_messages/_form.html.haml
+1
-1
changelogs/unreleased/41934-replace-fa-bullhorn-with-gitlab-svg-bullhorn-icon.yml
...934-replace-fa-bullhorn-with-gitlab-svg-bullhorn-icon.yml
+5
-0
No files found.
app/assets/stylesheets/framework/common.scss
View file @
6cd42110
...
...
@@ -433,6 +433,7 @@ img.emoji {
.block
{
display
:
block
;
}
.flex
{
display
:
flex
;
}
.vertical-align-top
{
vertical-align
:
top
;
}
.vertical-align-text-top
{
vertical-align
:
text-top
;
}
.vertical-align-middle
{
vertical-align
:
middle
;
}
.vertical-align-sub
{
vertical-align
:
sub
;
}
.flex-align-self-center
{
align-self
:
center
;
}
...
...
app/helpers/broadcast_messages_helper.rb
View file @
6cd42110
...
...
@@ -9,7 +9,7 @@ module BroadcastMessagesHelper
return
unless
message
.
present?
content_tag
:div
,
dir:
'auto'
,
class:
'broadcast-message'
,
style:
broadcast_message_style
(
message
)
do
icon
(
'bullhorn
'
)
<<
' '
<<
render_broadcast_message
(
message
)
sprite_icon
(
'bullhorn'
,
size:
16
,
css_class:
'vertical-align-text-top mr-2
'
)
<<
' '
<<
render_broadcast_message
(
message
)
end
end
...
...
app/views/admin/broadcast_messages/_form.html.haml
View file @
6cd42110
.broadcast-message-preview
{
style:
broadcast_message_style
(
@broadcast_message
)
}
=
icon
(
'bullhorn
'
)
=
sprite_icon
(
'bullhorn'
,
size:
16
,
css_class
:'vertical-align-text-top mr-2
'
)
.js-broadcast-message-preview
-
if
@broadcast_message
.
message
.
present?
=
render_broadcast_message
(
@broadcast_message
)
...
...
changelogs/unreleased/41934-replace-fa-bullhorn-with-gitlab-svg-bullhorn-icon.yml
0 → 100644
View file @
6cd42110
---
title
:
Replace Font Awesome bullhorn icon with GitLab bullhorn icon
merge_request
:
author
:
type
:
other
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