From fd5e5ebc643e882fbc516d6c0c025952cf3fed2c Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 19 Feb 2025 11:17:46 +1100 Subject: [PATCH] Revert "Actually we don't need the additional paths" This reverts commit b2eec79a2901f815761eecfc2f49fd2740f49152. --- app/webpacker/css/admin/welcome.scss | 2 +- .../css/admin_v3/shared/question-mark-icon.scss | 2 +- app/webpacker/css/darkswarm/_shop-navigation.scss | 4 ++-- app/webpacker/css/darkswarm/footer.scss | 2 +- app/webpacker/css/darkswarm/home_panes.scss | 10 +++++----- app/webpacker/css/darkswarm/mixins.scss | 8 ++++---- app/webpacker/css/darkswarm/page_alert.scss | 2 +- app/webpacker/css/darkswarm/shop_search.scss | 2 +- app/webpacker/css/darkswarm/split-checkout.scss | 2 +- app/webpacker/css/shared/question-mark-icon.scss | 2 +- config/webpacker.yml | 2 +- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/webpacker/css/admin/welcome.scss b/app/webpacker/css/admin/welcome.scss index c6bd5923af..f4140cf4ca 100644 --- a/app/webpacker/css/admin/welcome.scss +++ b/app/webpacker/css/admin/welcome.scss @@ -4,7 +4,7 @@ padding: 4em 2em; background-color: black; - background-image: url("/assets/home/tagline-bg.jpg"); + background-image: url("../../assets/images/home/tagline-bg.jpg"); background-size: cover; background-repeat: no-repeat; background-position: center center; diff --git a/app/webpacker/css/admin_v3/shared/question-mark-icon.scss b/app/webpacker/css/admin_v3/shared/question-mark-icon.scss index 3f67f4e0b1..a71d26d949 100644 --- a/app/webpacker/css/admin_v3/shared/question-mark-icon.scss +++ b/app/webpacker/css/admin_v3/shared/question-mark-icon.scss @@ -4,7 +4,7 @@ } .question-mark-icon { - background-image: url("/assets/question-mark-icon.svg"); + background-image: url("../../assets/images/question-mark-icon.svg"); background-size: cover; background-repeat: no-repeat; border-radius: 50%; diff --git a/app/webpacker/css/darkswarm/_shop-navigation.scss b/app/webpacker/css/darkswarm/_shop-navigation.scss index 14862921b3..a0322c604f 100644 --- a/app/webpacker/css/darkswarm/_shop-navigation.scss +++ b/app/webpacker/css/darkswarm/_shop-navigation.scss @@ -60,7 +60,7 @@ ordercycle { } select { - background-image: url('/assets/white-caret.svg'); + background-image: url('../../assets/images/white-caret.svg'); background-size: 30px auto; background-position-x: 102%; height: 2.35em; @@ -145,7 +145,7 @@ shop ordercycle { select { background-color: $white; - background-image: url('/assets/black-caret.svg'); + background-image: url('../../assets/images/black-caret.svg'); color: $grey-500; font-style: italic; } diff --git a/app/webpacker/css/darkswarm/footer.scss b/app/webpacker/css/darkswarm/footer.scss index 3b696e64cc..d4812a2421 100644 --- a/app/webpacker/css/darkswarm/footer.scss +++ b/app/webpacker/css/darkswarm/footer.scss @@ -46,7 +46,7 @@ footer { width: 100%; border: 1px solid rgba($dark-grey, 0.35); - background-image: url("/assets/tile-wide.png"); + background-image: url("../../assets/images/tile-wide.png"); background-position: center center; background-color: #bbb; padding: 12px 0 8px 0; diff --git a/app/webpacker/css/darkswarm/home_panes.scss b/app/webpacker/css/darkswarm/home_panes.scss index 5885f6e5b6..905b93a2ef 100644 --- a/app/webpacker/css/darkswarm/home_panes.scss +++ b/app/webpacker/css/darkswarm/home_panes.scss @@ -36,7 +36,7 @@ } #stats.pane { - background-image: url("/assets/home/background-blurred-oranges.jpg"); + background-image: url("../../assets/images/home/background-blurred-oranges.jpg"); background-position: center center; background-color: $ofn-grey; @@ -88,7 +88,7 @@ } .home-icon-box { - background-image: url("/assets/ofn-o.png"); + background-image: url("../../assets/images/ofn-o.png"); background-position: center center; background-repeat: no-repeat; background-size: auto 100%; @@ -115,15 +115,15 @@ background-size: auto 100%; &.search { - background-image: url("/assets/icon-mask-magnifier.png"); + background-image: url("../../assets/images/icon-mask-magnifier.png"); } &.shop { - background-image: url("/assets/icon-mask-apple.png"); + background-image: url("../../assets/images/icon-mask-apple.png"); } &.pick-up-delivery { - background-image: url("/assets/icon-mask-truck.png"); + background-image: url("../../assets/images/icon-mask-truck.png"); } } } diff --git a/app/webpacker/css/darkswarm/mixins.scss b/app/webpacker/css/darkswarm/mixins.scss index cf0c53d69e..ca0851f7d0 100644 --- a/app/webpacker/css/darkswarm/mixins.scss +++ b/app/webpacker/css/darkswarm/mixins.scss @@ -3,7 +3,7 @@ // Generic \\ @mixin tiledPane { - background-image: url("/assets/tile-wide.png"); + background-image: url("../../assets/images/tile-wide.png"); background-color: $brand-colour; background-position: center center; @@ -177,7 +177,7 @@ @mixin producersbg { background-color: lighten($clr-turquoise, 68%); - background-image: url("/assets/producers.svg"); + background-image: url("../../assets/images/producers.svg"); background-position: center 50px; background-repeat: no-repeat; background-size: 922px 763px; @@ -185,13 +185,13 @@ @mixin hubsbg { background-color: $brand-colour; - background-image: url("/assets/hubs-bg.jpg"); + background-image: url("../../assets/images/hubs-bg.jpg"); background-position: center center; } @mixin groupsbg { background-color: lighten($clr-brick, 56%); - background-image: url("/assets/groups.svg"); + background-image: url("../../assets/images/groups.svg"); background-position: center 50px; background-repeat: no-repeat; background-size: 922px 922px; diff --git a/app/webpacker/css/darkswarm/page_alert.scss b/app/webpacker/css/darkswarm/page_alert.scss index a6fbd31b4e..e737679677 100644 --- a/app/webpacker/css/darkswarm/page_alert.scss +++ b/app/webpacker/css/darkswarm/page_alert.scss @@ -9,7 +9,7 @@ $page-alert-height: 55px; border-left: none; border-right: none; background-color: #bbb; - background-image: url("/assets/tile-wide.png"); + background-image: url("../../assets/images/tile-wide.png"); background-position: center center; padding: 12px 0 8px 0; margin: 0; diff --git a/app/webpacker/css/darkswarm/shop_search.scss b/app/webpacker/css/darkswarm/shop_search.scss index ef757aa239..560bd5ee59 100644 --- a/app/webpacker/css/darkswarm/shop_search.scss +++ b/app/webpacker/css/darkswarm/shop_search.scss @@ -27,7 +27,7 @@ padding: 0 2.25em 0 2.75em; width: 100%; min-width: 0; - background: $white url("/assets/icn-search-grey.png") 1em center no-repeat; + background: $white url("../../assets/images/icn-search-grey.png") 1em center no-repeat; font-size: 1rem; // avoid zoom on iphone, see issue #4535 &::placeholder { diff --git a/app/webpacker/css/darkswarm/split-checkout.scss b/app/webpacker/css/darkswarm/split-checkout.scss index 7aaab099aa..5a96407525 100644 --- a/app/webpacker/css/darkswarm/split-checkout.scss +++ b/app/webpacker/css/darkswarm/split-checkout.scss @@ -298,7 +298,7 @@ } &:after { - background-image: url("/assets/edit-with-pen.svg"); + background-image: url("../../assets/images/edit-with-pen.svg"); content: " "; display: inline-block; width: 1em; diff --git a/app/webpacker/css/shared/question-mark-icon.scss b/app/webpacker/css/shared/question-mark-icon.scss index f7dcdf1b4f..bd00a1254f 100644 --- a/app/webpacker/css/shared/question-mark-icon.scss +++ b/app/webpacker/css/shared/question-mark-icon.scss @@ -6,7 +6,7 @@ } .question-mark-icon { - background-image: url("/assets/question-mark-icon.svg"); + background-image: url("../../assets/images/question-mark-icon.svg"); background-size: cover; background-repeat: no-repeat; border-radius: 50%; diff --git a/config/webpacker.yml b/config/webpacker.yml index fbeb493f2f..43dcfcfaad 100644 --- a/config/webpacker.yml +++ b/config/webpacker.yml @@ -13,7 +13,7 @@ default: &default 'vendor', 'app/webpacker/css', 'app/webpacker/fonts', - # 'app/assets/images', + 'app/assets/images', 'engines/web/app/assets/stylesheets', 'app/components' ]