Commit 3e32b86e authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch...

Merge branch '27734-fix-the-following-style-lint-errors-and-warnings-for-app-assets-stylesheets-framework' into 'master'

Fix stylelint errors in app/assets/stylesheets/framework/broadcast_messages.scss

See merge request gitlab-org/gitlab!34033
parents 430bdaee c7b93a14
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
} }
.broadcast-banner-message { .broadcast-banner-message {
@extend .broadcast-message;
@extend .alert-warning;
text-align: center; text-align: center;
.broadcast-message-dismiss { .broadcast-message-dismiss {
...@@ -24,8 +22,6 @@ ...@@ -24,8 +22,6 @@
} }
.broadcast-notification-message { .broadcast-notification-message {
@extend .broadcast-message;
position: fixed; position: fixed;
bottom: $gl-padding; bottom: $gl-padding;
right: $gl-padding; right: $gl-padding;
......
.broadcast-banner-message.js-broadcast-banner-message-preview.mt-2{ style: broadcast_message_style(@broadcast_message), class: ('hidden' unless @broadcast_message.banner? ) } .broadcast-message.broadcast-banner-message.alert-warning.js-broadcast-banner-message-preview.mt-2{ style: broadcast_message_style(@broadcast_message), class: ('hidden' unless @broadcast_message.banner? ) }
= sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top') = sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top')
.js-broadcast-message-preview .js-broadcast-message-preview
- if @broadcast_message.message.present? - if @broadcast_message.message.present?
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- else - else
Your message here Your message here
.d-flex.justify-content-center .d-flex.justify-content-center
.broadcast-notification-message.preview.js-broadcast-notification-message-preview.mt-2{ class: ('hidden' unless @broadcast_message.notification? ) } .broadcast-message.broadcast-notification-message.preview.js-broadcast-notification-message-preview.mt-2{ class: ('hidden' unless @broadcast_message.notification? ) }
= sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top') = sprite_icon('bullhorn', size: 16, css_class:'vertical-align-text-top')
.js-broadcast-message-preview .js-broadcast-message-preview
- if @broadcast_message.message.present? - if @broadcast_message.message.present?
......
%div{ class: "broadcast-#{message.broadcast_type}-message #{opts[:preview] && 'preview'} js-broadcast-notification-#{message.id} d-flex", - is_banner = message.broadcast_type == 'banner'
%div{ class: "broadcast-message #{'alert-warning' if is_banner} broadcast-#{message.broadcast_type}-message #{opts[:preview] && 'preview'} js-broadcast-notification-#{message.id} gl-display-flex",
style: broadcast_message_style(message), dir: 'auto' } style: broadcast_message_style(message), dir: 'auto' }
.flex-grow-1.text-right.pr-2 .flex-grow-1.text-right.pr-2
= sprite_icon('bullhorn', size: 16, css_class: 'vertical-align-text-top') = sprite_icon('bullhorn', size: 16, css_class: 'vertical-align-text-top')
......
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