diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 00:07:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-14 00:07:41 +0300 |
| commit | 0e2fc1701bd0c87cc458cbbb34c618b0e0dc5a14 (patch) | |
| tree | 5f08f2602120b0555e5c0dc0061d7c8eea054c22 /app | |
| parent | 7cc6c10c68915f5019ab8c2029eeb462c8fed4ef (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
| -rw-r--r-- | app/helpers/broadcast_messages_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/broadcast_messages/_form.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 4cbb2f5ba71..4b7dda3a2ff 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -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; } diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb index ec653aed91b..21e57a8d391 100644 --- a/app/helpers/broadcast_messages_helper.rb +++ b/app/helpers/broadcast_messages_helper.rb @@ -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 diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index 03b7ae76de9..44d57beec0f 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -1,5 +1,5 @@ .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) |