Commit b0ece70a authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '41934-replace-fa-bullhorn-with-gitlab-svg-bullhorn-icon' into 'master'

Resolve "Replace fa-bullhorn with GitLab SVG bullhorn icon (all instances)"

Closes #41934

See merge request gitlab-org/gitlab!21587
parents eb8d36bb 6cd42110
...@@ -433,6 +433,7 @@ img.emoji { ...@@ -433,6 +433,7 @@ img.emoji {
.block { display: block; } .block { display: block; }
.flex { display: flex; } .flex { display: flex; }
.vertical-align-top { vertical-align: top; } .vertical-align-top { vertical-align: top; }
.vertical-align-text-top { vertical-align: text-top; }
.vertical-align-middle { vertical-align: middle; } .vertical-align-middle { vertical-align: middle; }
.vertical-align-sub { vertical-align: sub; } .vertical-align-sub { vertical-align: sub; }
.flex-align-self-center { align-self: center; } .flex-align-self-center { align-self: center; }
......
...@@ -9,7 +9,7 @@ module BroadcastMessagesHelper ...@@ -9,7 +9,7 @@ module BroadcastMessagesHelper
return unless message.present? return unless message.present?
content_tag :div, dir: 'auto', class: 'broadcast-message', style: broadcast_message_style(message) do 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
end end
......
.broadcast-message-preview{ style: broadcast_message_style(@broadcast_message) } .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 .js-broadcast-message-preview
- if @broadcast_message.message.present? - if @broadcast_message.message.present?
= render_broadcast_message(@broadcast_message) = render_broadcast_message(@broadcast_message)
......
---
title: Replace Font Awesome bullhorn icon with GitLab bullhorn icon
merge_request:
author:
type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment