Commit a8b4f184 authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '230718-make-storage-alert-conform-with-alert-style' into 'master'

Make storage alert conform with other alerts

Closes #230718

See merge request gitlab-org/gitlab!38058
parents e1253828 fd282826
...@@ -14,17 +14,16 @@ ...@@ -14,17 +14,16 @@
- icon = namespace_storage_alert_icon(alert_level) - icon = namespace_storage_alert_icon(alert_level)
- link = namespace_storage_usage_link(root_namespace) - link = namespace_storage_usage_link(root_namespace)
%div{ class: ['js-namespace-storage-alert', [container_class, ("limit-container-width" unless fluid_layout)]] } .gl-py-5
.gl-pt-5.gl-pb-3 .gl-alert.js-namespace-storage-alert{ class: "gl-alert-#{style}", role: 'alert' }
.gl-alert{ class: "gl-alert-#{style}", role: 'alert' } = sprite_icon(icon, css_class: "gl-icon gl-alert-icon")
= sprite_icon(icon, css_class: "gl-icon gl-alert-icon") .gl-alert-title
.gl-alert-title %h4.gl-alert-title= payload[:usage_message]
%h4.gl-alert-title= payload[:usage_message] - if alert_level != :error
- if alert_level != :error %button.js-namespace-storage-alert-dismiss.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss'), data: { id: root_namespace.id, level: alert_level } }
%button.js-namespace-storage-alert-dismiss.gl-alert-dismiss.gl-cursor-pointer{ type: 'button', 'aria-label' => _('Dismiss'), data: { id: root_namespace.id, level: alert_level } } = sprite_icon('close', size: 16, css_class: 'gl-icon')
= sprite_icon('close', size: 16, css_class: 'gl-icon') .gl-alert-body
.gl-alert-body = payload[:explanation_message]
= payload[:explanation_message] - if link
- if link .gl-alert-actions
.gl-alert-actions = link_to(_('Manage storage usage'), link, class: "btn gl-alert-action btn-md gl-button btn-#{style}")
= link_to(_('Manage storage usage'), link, class: "btn gl-alert-action btn-md gl-button btn-#{style}")
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