diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 21:08:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 21:08:35 +0300 |
commit | 6315ed9630fb1c6ade3114beb762cd1568d79219 (patch) | |
tree | 2a5d31936d09c14420c8f4c8bd752e268f0eb19f /app/views/shared | |
parent | fedf978f9aa1909ed7bb3fad767ad120a1c6bd7b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/_broadcast_message.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/shared/_broadcast_message.html.haml b/app/views/shared/_broadcast_message.html.haml new file mode 100644 index 00000000000..c058b210688 --- /dev/null +++ b/app/views/shared/_broadcast_message.html.haml @@ -0,0 +1,8 @@ +%div{ class: "broadcast-#{message.broadcast_type}-message #{opts[:preview] && 'preview'} js-broadcast-notification-#{message.id} d-flex", + style: broadcast_message_style(message), dir: 'auto' } + %div + = sprite_icon('bullhorn', size: 16, css_class: 'vertical-align-text-top') + = render_broadcast_message(message) + - if message.notification? && opts[:preview].blank? + %button.js-dismiss-current-broadcast-notification.btn.btn-link.text-dark.pl-2.pr-2{ 'aria-label' => _('Close'), :type => 'button', data: { id: message.id } } + %i.fa.fa-times |