From 9997fe26fc977c546d2f43d75b80782bf10bd473 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Mon, 17 Oct 2022 16:07:55 +0200 Subject: [PATCH] Small adjustments to make it usable in admin section --- app/views/shared/_flashes.html.haml | 2 +- app/views/spree/layouts/_admin_body.html.haml | 2 ++ app/webpacker/css/admin/components/messages.scss | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/shared/_flashes.html.haml b/app/views/shared/_flashes.html.haml index 1cd0bd5615..be6c23dc5d 100644 --- a/app/views/shared/_flashes.html.haml +++ b/app/views/shared/_flashes.html.haml @@ -2,6 +2,6 @@ - if defined? flashes - flashes.each do |type, msg| %alert.animate-show{"data-controller": "flash"} - %div{type: "#{type}", class: "alert-box #{type == 'error' ? 'alert' : type}"} + .flash{type: "#{type}", class: "alert-box #{type == 'error' ? 'alert' : type}"} %span= msg %a.small.close{"data-action": "click->flash#close"} × diff --git a/app/views/spree/layouts/_admin_body.html.haml b/app/views/spree/layouts/_admin_body.html.haml index 056b027fba..b70d808729 100644 --- a/app/views/spree/layouts/_admin_body.html.haml +++ b/app/views/spree/layouts/_admin_body.html.haml @@ -11,6 +11,8 @@ - if flash[:success] .flash.success= flash[:success] + = render partial: "shared/flashes" + = render partial: "spree/layouts/admin/progress_spinner" %header#header{"data-hook" => ""} diff --git a/app/webpacker/css/admin/components/messages.scss b/app/webpacker/css/admin/components/messages.scss index 34970ce4c7..57b89ea3ba 100644 --- a/app/webpacker/css/admin/components/messages.scss +++ b/app/webpacker/css/admin/components/messages.scss @@ -38,6 +38,7 @@ font-size: 120%; color: $color-1; font-weight: 600; + margin-top: 0; &.notice { background-color: rgba($color-notice, 0.8) } &.success { background-color: rgba($color-success, 0.8) }