From f7717153cd232f3d7661f0cf95c66c78b4538837 Mon Sep 17 00:00:00 2001 From: Kimberley Cook Date: Wed, 19 Jan 2022 14:27:31 +0000 Subject: [PATCH] update alerts --- app/views/layouts/_messages.html.haml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/app/views/layouts/_messages.html.haml b/app/views/layouts/_messages.html.haml index 1183660d3..4a196004f 100644 --- a/app/views/layouts/_messages.html.haml +++ b/app/views/layouts/_messages.html.haml @@ -1,18 +1,21 @@ - flash.each do |name, msg| - - unless (name.eql?('notice') && @suppress_notices) || (name.eql?('warning') && @suppress_warnings) - - name = name.eql?('notice') ? 'info' : name + - unless (name.eql?('notice') && @suppress_notices) || (name.eql?('alert-danger') && @suppress_warnings) + - name = name.eql?('notice') ? 'alert-primary' : name - if msg.is_a?(String) - %div{ 'data-alert': '', class: "alert-box #{name}" } + %div{ 'data-alert': '', class: "mb-0 alert #{name}" } .row - .large-12 - = link_to '#', class: 'close' do - × + .col-11 = content_tag :div, msg.html_safe + .col-1 + = link_to '#', class: 'close float-right' do + × + - elsif msg.is_a?(Array) - msg.each do |message| - %div{ 'data-alert': '', class: "alert-box #{name}" } + %div{ 'data-alert': '', class: "mb-0 alert #{name}" } .row - .large-12 - = link_to '#', class: 'close' do - × + .col-11 = content_tag :span, message.html_safe + .col-1 + = link_to '#', class: 'close float-right' do + ×