From 5f70ef6e751e74f236ef28ba979f4e532670848d Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Sun, 19 Apr 2020 09:45:50 +0100 Subject: [PATCH] Improve style of closed shop message and remove border from message --- app/assets/stylesheets/darkswarm/shop.css.scss | 8 -------- app/views/shopping_shared/tabs/_shop.html.haml | 9 ++++----- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/darkswarm/shop.css.scss b/app/assets/stylesheets/darkswarm/shop.css.scss index c3e0935db4..c7c61e19f9 100644 --- a/app/assets/stylesheets/darkswarm/shop.css.scss +++ b/app/assets/stylesheets/darkswarm/shop.css.scss @@ -125,14 +125,6 @@ } } - .shopfront_closed_message, .shopfront_hidden_message { - border-radius: 5px; - } - - .shopfront_closed_message { - border: 2px solid #eb4c46; - } - .shopfront_closed_message { margin: 2em 0em; } diff --git a/app/views/shopping_shared/tabs/_shop.html.haml b/app/views/shopping_shared/tabs/_shop.html.haml index be547535ca..4edcd1c91c 100644 --- a/app/views/shopping_shared/tabs/_shop.html.haml +++ b/app/views/shopping_shared/tabs/_shop.html.haml @@ -13,12 +13,11 @@ %em = render partial: "shopping_shared/next_order_cycle" = render partial: "shopping_shared/last_order_cycle" - %p - = t :shopping_oc_closed_description - + .shopfront_closed_message - if shopfront_closed_message? - .shopfront_closed_message - = current_distributor.preferred_shopfront_closed_message.html_safe + = current_distributor.preferred_shopfront_closed_message.html_safe + - else + = t :shopping_oc_closed_description - unless require_customer? = render partial: "shop/products/form"