raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-15 23:57:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new style to closed shop message

Browse Source
This commit is contained in:
Luis Ramos
2020-04-20 13:23:48 +01:00
parent 0996c28c09
commit dbdbe01d6a
5 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/darkswarm/branding.css.scss
View File

@@ -46,6 +46,7 @@ $grey-080: #f2f2f2;
$grey-400: #bbb;
$grey-500: #999;
$grey-600: #777;
$grey-650: #666;
$grey-700: #555;
$grey-800: #333;

41
app/assets/stylesheets/darkswarm/shop.css.scss
View File

@@ -125,7 +125,44 @@
}
}
.shopfront_closed_message {
margin: 2em 0em;
.closed_shop_header {
background-color: $grey-650;
color: $white;
h4 {
color: $white;
div {
display: inline-block;
}
}
p {
line-height: 2.5rem;
margin-bottom: 0;
}
}
.warning_sign {
margin: 0 10px 0 5px;
.rectangle {
position: absolute;
top: 27px;
color: $grey-650;
width: 23px;
height: 23px;
transform: rotate(-315deg);
border-radius: 4px;
background-color: #ffffff;
}
strong {
text-align: center;
color: $grey-650;
display: block;
position: relative;
width: 23px;
}
}
}

2
app/views/shopping_shared/_last_order_cycle.html.haml
View File

@@ -1,4 +1,2 @@
- if most_recently_closed = OrderCycle.most_recently_closed_for(@distributor)
(
= t :shopping_oc_last_closed, distance_of_time: distance_of_time_in_words_to_now(most_recently_closed.orders_close_at)
)

2
app/views/shopping_shared/_next_order_cycle.html.haml
View File

@@ -1,4 +1,2 @@
- if next_oc = OrderCycle.first_opening_for(@distributor)
(
= t :shopping_oc_next_open, distance_of_time: distance_of_time_in_words_to_now(next_oc.orders_open_at)
)

28
app/views/shopping_shared/tabs/_shop.html.haml
View File

@@ -2,22 +2,30 @@
.order-cycle-bar.hide-for-large-up
= render partial: "shopping_shared/order_cycles"
.row
.small-12.columns
- if no_open_order_cycles?
- if no_open_order_cycles?
.row.closed_shop_header
.small-12.columns
.content
%h4
%i.ofn-i_012-warning
= t :shopping_oc_closed
%small
%em
= render partial: "shopping_shared/next_order_cycle"
= render partial: "shopping_shared/last_order_cycle"
.warning_sign
.rectangle
%strong !
%div
= t :shopping_oc_closed
%p
= render partial: "shopping_shared/next_order_cycle"
= render partial: "shopping_shared/last_order_cycle"
.row
.small-12.columns
.content
.shopfront_closed_message
- if shopfront_closed_message?
= current_distributor.preferred_shopfront_closed_message.html_safe
- else
= t :shopping_oc_closed_description
- unless require_customer?
- unless require_customer?
.row
.small-12.columns
= render partial: "shop/products/form"