diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico index 775325e5ed..b384aa366f 100644 Binary files a/app/assets/images/favicon.ico and b/app/assets/images/favicon.ico differ diff --git a/app/assets/images/logo-spree.png b/app/assets/images/logo-spree.png deleted file mode 100644 index caf2137f22..0000000000 Binary files a/app/assets/images/logo-spree.png and /dev/null differ diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png deleted file mode 100644 index 50ae128585..0000000000 Binary files a/app/assets/images/logo.png and /dev/null differ diff --git a/app/assets/images/logo.svg b/app/assets/images/logo.svg deleted file mode 100644 index 770e67ba5c..0000000000 --- a/app/assets/images/logo.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/app/assets/images/logo/spree_50.png b/app/assets/images/logo/spree_50.png index 29b57d70ae..ff125cfe16 100644 Binary files a/app/assets/images/logo/spree_50.png and b/app/assets/images/logo/spree_50.png differ diff --git a/app/assets/images/logo@2x.png b/app/assets/images/logo@2x.png deleted file mode 100644 index 41658a8174..0000000000 Binary files a/app/assets/images/logo@2x.png and /dev/null differ diff --git a/app/assets/images/logo@3x.png b/app/assets/images/logo@3x.png deleted file mode 100644 index 27f31fbf7a..0000000000 Binary files a/app/assets/images/logo@3x.png and /dev/null differ diff --git a/app/assets/images/noimage/large.png b/app/assets/images/noimage/large.png index 08a8214261..246d3d1a7c 100644 Binary files a/app/assets/images/noimage/large.png and b/app/assets/images/noimage/large.png differ diff --git a/app/assets/images/noimage/mini.png b/app/assets/images/noimage/mini.png index 4bf41f8ed3..c91b4de6b7 100644 Binary files a/app/assets/images/noimage/mini.png and b/app/assets/images/noimage/mini.png differ diff --git a/app/assets/images/noimage/plp.png b/app/assets/images/noimage/plp.png deleted file mode 100644 index a5fa866cb8..0000000000 Binary files a/app/assets/images/noimage/plp.png and /dev/null differ diff --git a/app/assets/images/noimage/plp.svg b/app/assets/images/noimage/plp.svg deleted file mode 100644 index 838ba6d7dc..0000000000 --- a/app/assets/images/noimage/plp.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - NO IMAGE - AVAILABLE - - - diff --git a/app/assets/images/noimage/product.png b/app/assets/images/noimage/product.png index 08a8214261..246d3d1a7c 100644 Binary files a/app/assets/images/noimage/product.png and b/app/assets/images/noimage/product.png differ diff --git a/app/assets/images/noimage/small.png b/app/assets/images/noimage/small.png index daf9170ae2..0407e9f02e 100644 Binary files a/app/assets/images/noimage/small.png and b/app/assets/images/noimage/small.png differ diff --git a/app/assets/stylesheets/spree/frontend/components-custom/headers.scss b/app/assets/stylesheets/spree/frontend/components-custom/headers.scss index 8fd4c2d6be..1782ede957 100644 --- a/app/assets/stylesheets/spree/frontend/components-custom/headers.scss +++ b/app/assets/stylesheets/spree/frontend/components-custom/headers.scss @@ -1,6 +1,4 @@ .spree-header { - font-size: font-px-to-rem(18px); - text-transform: uppercase; color: theme-color('dark-text'); text-align: center; diff --git a/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss b/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss index 266f3f3c7b..d395ddfca3 100644 --- a/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss +++ b/app/assets/stylesheets/spree/frontend/components-custom/inputs.scss @@ -1,53 +1,9 @@ .spree-flat-input { - color: theme-color("secondary"); - transition: basic-transition(border-color); - padding: 15px; - width: 100%; - height: auto; - border-width: 1px; - border-style: solid; - border-color: $second-global-border; - border-radius: 0; - outline: none; - font-size: font-px-to-rem(12px); - line-height: inherit; - appearance: none; - -webkit-appearance: none; - -moz-appearance: none; - @include media-breakpoint-up(sm) { - padding: 25px; - font-size: font-px-to-rem(23px); - } - @include media-breakpoint-up(lg) { - padding: 20px; - font-size: font-px-to-rem(14px); - } - &:focus { - border-color: theme-color("secondary"); - } - &::placeholder { - text-transform: uppercase; - } + @extend .form-control; } .spree-flat-select { - @extend .spree-flat-input; - appearance: none; - padding-top:22px; - padding-bottom:21px; - -webkit-appearance: none; - -moz-appearance: none; - &-arrow { - right: 10px; - top: 50%; - transform: translateY(-50%); - @include media-breakpoint-up(sm) { - right: 23px; - } - @include media-breakpoint-up(lg) { - right: 20px; - } - } + @extend .custom-select; } .field_with_errors { @@ -58,12 +14,6 @@ .spree-flat-label { color: theme-color("secondary"); - text-transform: uppercase; - font-size: font-px-to-rem(12px); - - @include media-breakpoint-up(sm) { - font-size: font-px-to-rem(17px); - } } .spree-checkbox-container { @@ -80,16 +30,6 @@ width: 22px; margin-right: 0.5rem; - @include media-breakpoint-up(sm) { - width: 32px; - height: 32px; - } - - @include media-breakpoint-up(lg) { - width: 22px; - height: 22px; - } - input[type="checkbox"] { opacity: 0; position: absolute; @@ -105,20 +45,10 @@ width: 22px; height: 22px; font-size: 0; - border-radius: 0; - border: 2px solid theme-color("secondary"); + border-radius: $input-border-radius; + border: 1px solid $input-border-color; background-color: $input-background; cursor: pointer; - - @include media-breakpoint-up(sm) { - width: 32px; - height: 32px; - } - - @include media-breakpoint-up(lg) { - width: 22px; - height: 22px; - } } label:after { @@ -135,20 +65,6 @@ border-top: none; border-right: none; transform: rotate(-45deg); - - @include media-breakpoint-up(sm) { - width: 15px; - height: 10px; - top: 6px; - left: 6px; - } - - @include media-breakpoint-up(lg) { - width: 12px; - height: 8px; - top: 4px; - left: 3px; - } } input[type="checkbox"]:focus + label { @@ -162,23 +78,6 @@ opacity: 1; } } - - @include media-breakpoint-up(lg) { - height: 28px; - width: 28px; - - label { - height: 28px; - width: 28px; - } - - label:after { - width: 14px; - height: 9px; - top: 6px; - left: 5px; - } - } } .spree-checkbox-label { @@ -202,47 +101,6 @@ } } -.spree-btn { - text-transform: uppercase; - letter-spacing: 0.05rem; - font-size: font-px-to-rem(14px); - font-weight: bold; - - &.btn-primary { - font-size: font-px-to-rem(17px); - } - - &.btn-outline-primary { - border-width: 2px; - } - - @include media-breakpoint-up(sm) { - padding-top: 14px; - padding-bottom: 14px; - - &.btn-primary { - font-size: font-px-to-rem(28px); - } - - &.btn-outline-primary { - font-size: font-px-to-rem(28px); - } - } - - @include media-breakpoint-up(lg) { - padding-top: 6px; - padding-bottom: 6px; - - &.btn-primary { - font-size: font-px-to-rem(20px); - } - - &.btn-outline-primary { - font-size: font-px-to-rem(20px); - } - } -} - .spree-radio-label { position: relative; padding-left: 30px; diff --git a/app/assets/stylesheets/spree/frontend/fonts.scss b/app/assets/stylesheets/spree/frontend/fonts.scss index 41411230cf..8b13789179 100644 --- a/app/assets/stylesheets/spree/frontend/fonts.scss +++ b/app/assets/stylesheets/spree/frontend/fonts.scss @@ -1,137 +1 @@ -// https://fonts.google.com/specimen/Montserrat?selection.family=Montserrat:400,500,700 -/* cyrillic-ext */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WRhyyTh89ZNpQ.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459W1hyyTh89ZNpQ.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WZhyyTh89ZNpQ.woff2) format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WdhyyTh89ZNpQ.woff2) format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - font-display: swap; - src: local('Montserrat Regular'), local('Montserrat-Regular'), url(https://fonts.gstatic.com/s/montserrat/v14/JTUSjIg1_i6t8kCHKm459WlhyyTh89Y.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 500; - font-display: swap; - src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gTD_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 500; - font-display: swap; - src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3g3D_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 500; - font-display: swap; - src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gbD_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 500; - font-display: swap; - src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gfD_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 500; - font-display: swap; - src: local('Montserrat Medium'), local('Montserrat-Medium'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_ZpC3gnD_vx3rCs.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} -/* cyrillic-ext */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gTD_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F; -} -/* cyrillic */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3g3D_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* vietnamese */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gbD_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB; -} -/* latin-ext */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gfD_vx3rCubqg.woff2) format('woff2'); - unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF; -} -/* latin */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 700; - font-display: swap; - src: local('Montserrat Bold'), local('Montserrat-Bold'), url(https://fonts.gstatic.com/s/montserrat/v14/JTURjIg1_i6t8kCHKm45_dJE3gnD_vx3rCs.woff2) format('woff2'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; -} diff --git a/app/assets/stylesheets/spree/frontend/variables/variables.scss b/app/assets/stylesheets/spree/frontend/variables/variables.scss index 63f48c8092..be26a980d3 100644 --- a/app/assets/stylesheets/spree/frontend/variables/variables.scss +++ b/app/assets/stylesheets/spree/frontend/variables/variables.scss @@ -1,11 +1,11 @@ // main spree variables -$primary-color: #0074c2; +$primary-color: #000; $secondary-color: #4c4c4c; $primary-background: #ffffff; $secondary-background: #f2f2f2; $input-background: #ffffff; $font-color: black; -$font-family: "Montserrat", sans-serif; +$font-family: "Inter", "Helvetica Neue", Helvetica, Arial, sans-serif !default; $header-font-color: $font-color; $header-background: $primary-background; $meganav-font-color: $font-color; @@ -17,8 +17,8 @@ $global-border-style: #e2e2e2; $second-global-border: #e2e2e2; $spree-header-max-width: 1440px; $spree-header-mobile-height: 50px; -$spree-header-tablet-height: 75px; -$spree-header-desktop-height: 75px; +$spree-header-tablet-height: 50px; +$spree-header-desktop-height: 50px; // bootstrap overrides $grid-gutter-width: 1rem; @@ -38,9 +38,23 @@ $theme-colors: ( "overlay": rgba(76, 76, 76, 0.5), "shadow": rgba(0, 0, 0, 0.16) ); -$enable-rounded: false; -$enable-shadows: false; -$enable-gradients: false; + +$enable-responsive-font-sizes: true; +$font-size-base: 0.813rem !default; +$font-size-plus: 0.875rem !default; +$font-size-sm: 0.75rem !default; +$font-size-lg: 1rem !default; + +$border-radius: 0.5rem !default; +$border-radius-sm: 0.4rem !default; +$border-radius-lg: 0.75rem !default; + +$dropdown-item-padding-y: .5rem !default; +$dropdown-item-padding-x: 1rem !default; + +$input-btn-padding-y: .7rem !default; +$input-btn-padding-x: .75rem !default; + $font-family-sans-serif: $font-family; $font-weight-medium: 500; .font-weight-medium { diff --git a/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss b/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss index 8b54266465..6f738d0400 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss @@ -229,9 +229,6 @@ } &-field { - input::-webkit-input-placeholder { - text-transform: uppercase; - } @include media-breakpoint-up(sm) { margin-top: 33px; } diff --git a/app/assets/stylesheets/spree/frontend/views/spree/layouts/spree_application.scss b/app/assets/stylesheets/spree/frontend/views/spree/layouts/spree_application.scss index f523dbe6d0..1db5c0f541 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/layouts/spree_application.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/layouts/spree_application.scss @@ -38,7 +38,7 @@ body { .form-control, .form-control:focus, -.spree-flat-input { +.form-control { background: $input-background; color: color-yiq($input-background); } diff --git a/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss b/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss index 6fce294dfb..5ec2b8446f 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/orders/edit.scss @@ -91,19 +91,10 @@ padding-right: 16px; } } - &:last-child { - @include media-breakpoint-up(lg) { - padding: 40px 0 22px 16px; - } - } border-top: none; border-bottom: 1px solid $global-border-style; padding: 22px 0; vertical-align: top; - @include media-breakpoint-up(lg) { - padding: 22px 50px 0 0; - vertical-align: middle; - } } } } @@ -153,19 +144,8 @@ } .item-details { - text-transform: uppercase; - font-size: font-px-to-rem(12px); font-weight: 500; line-height: 1.4; - @include media-breakpoint-up(sm) { - font-size: font-px-to-rem(14px); - margin-top: 3px; - margin-bottom: 3px; - } - @include media-breakpoint-up(lg) { - font-size: font-px-to-rem(12px); - margin: 0; - } } } &-price { diff --git a/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss b/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss index ad23d21f3f..ad60025a60 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/products/index.scss @@ -131,7 +131,7 @@ font-size: font-px-to-rem(16px); font-weight: 500; &--selected { - border: solid 2px $secondary-color; + border: solid 1px $secondary-color; } } } @@ -308,7 +308,7 @@ color: $font-color; font-size: font-px-to-rem(13px); &--selected { - border: solid 2px $secondary-color; + border: solid 1px $secondary-color; } } &:last-of-type { diff --git a/app/assets/stylesheets/spree/frontend/views/spree/products/show.scss b/app/assets/stylesheets/spree/frontend/views/spree/products/show.scss index 37984ed640..4283e6c9bf 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/products/show.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/products/show.scss @@ -142,15 +142,6 @@ } .product-description { - font-size: font-px-to-rem(12px); - @include media-breakpoint-up(sm) { - font-size: font-px-to-rem(16px); - } - @include media-breakpoint-up(md) { - font-size: font-px-to-rem(14px); - line-height: font-px-to-rem(26px); - } - &-arrow { width: 44px; height: 44px; @@ -161,17 +152,6 @@ } } -.product-properies { - font-size: font-px-to-rem(12px); - @include media-breakpoint-up(sm) { - font-size: font-px-to-rem(16px); - } - @include media-breakpoint-up(md) { - font-size: font-px-to-rem(14px); - line-height: font-px-to-rem(26px); - } -} - #product-details { .breadcrumb-item:last-of-type { display: none; diff --git a/app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss b/app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss index 77b14857be..3d70811def 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/shared/cart.scss @@ -6,10 +6,6 @@ svg { width: 24px; height: 24px; - @include media-breakpoint-up(xl) { - width: 36px; - height: 36px; - } } &, &:hover { @@ -33,16 +29,6 @@ padding: 0 2px; font-size: font-px-to-rem(12px); display: none; - @include media-breakpoint-up(xl) { - $size: 26px; - $border-width: 2px; - border-radius: $size / 2; - border-width: $border-width; - height: $size; - min-width: $size; - line-height: $size - $border-width * 2; - font-size: font-px-to-rem(15px); - } } &--visible-count { #{$self}-count { diff --git a/app/assets/stylesheets/spree/frontend/views/spree/shared/header.scss b/app/assets/stylesheets/spree/frontend/views/spree/shared/header.scss index 97009507ba..9453489d65 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/shared/header.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/shared/header.scss @@ -46,31 +46,6 @@ body { } } } - @include media-breakpoint-up(sm) { - height: $spree-header-tablet-height; - &-fluid { - &-logo { - img { - max-height: 50px; - } - } - } - } - @include media-breakpoint-up(xl) { - height: $spree-header-desktop-height; - &-fluid { - &-logo { - flex-basis: 0; - margin: 0 0 1rem; - img { - max-height: 50px; - } - } - &-primary-navigation { - flex-basis: auto; - } - } - } } #logo { diff --git a/app/assets/stylesheets/spree/frontend/views/spree/shared/login.scss b/app/assets/stylesheets/spree/frontend/views/spree/shared/login.scss index f2a4f7bf4a..9ac68a6320 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/shared/login.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/shared/login.scss @@ -3,28 +3,12 @@ a { transition: basic-transition(color); - text-transform: uppercase; text-decoration: underline; color: theme-color('info'); - font-size: font-px-to-rem(12px); &:hover, &:active { color: theme-color('primary'); } } - - @include media-breakpoint-up(sm) { - margin-top: font-px-to-rem(19.7px); - a { - font-size: font-px-to-rem(23px); - } - } - - @include media-breakpoint-up(lg) { - margin-top: font-px-to-rem(20px); - a { - font-size: font-px-to-rem(16px); - } - } } diff --git a/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss b/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss index 2562360c6d..8abeedfea3 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/shared/main_nav_bar.scss @@ -1,8 +1,5 @@ .main-nav-bar { &-item { - text-transform: uppercase; - font-size: 20px; - font-weight: $font-weight-medium; padding: 0 1.5rem; height: 100%; a { @@ -67,7 +64,7 @@ padding: 0; margin: 0; border: 0; - border-bottom: 3px solid transparent; + border-bottom: 2px solid transparent; } } @@ -107,10 +104,6 @@ display: none; } } - - @include media-breakpoint-up(xl) { - top: $spree-header-desktop-height - 1px; - } } } diff --git a/app/assets/stylesheets/spree/frontend/views/spree/shared/nav_bar.scss b/app/assets/stylesheets/spree/frontend/views/spree/shared/nav_bar.scss index 63794e81e0..7cbfc49865 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/shared/nav_bar.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/shared/nav_bar.scss @@ -21,22 +21,14 @@ } .account-icon { svg { - width: 27.6px; + width: 24px; height: 24px; - @include media-breakpoint-up(xl) { - width: 41.4px; - height: 36px; - } } } .search-icons { svg { width: 24px; height: 24px; - @include media-breakpoint-up(xl) { - width: 36px; - height: 36px; - } } } &-search-menu { @@ -64,21 +56,16 @@ input#keywords { background: transparent; color: $meganav-font-color; - font-size: font-px-to-rem(14px); width: calc(100% - 40px); &:focus { outline: none; } &::placeholder { - text-transform: uppercase; color: theme-color("borders"); } &::-webkit-search-cancel-button { display: none; } - @include media-breakpoint-up(md) { - font-size: font-px-to-rem(22px); - } } input[type="submit"] { display: none; diff --git a/app/assets/stylesheets/spree/frontend/views/spree/shared/no_product_available.scss b/app/assets/stylesheets/spree/frontend/views/spree/shared/no_product_available.scss index f4d0a133d5..6b2920edd9 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/shared/no_product_available.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/shared/no_product_available.scss @@ -95,7 +95,7 @@ &-button { width: 306px; height: 29px; - background-color: #0074c2; + background-color: theme-color("primary"); margin: 44px auto auto auto; @include media-breakpoint-up(md) { diff --git a/app/assets/stylesheets/spree/frontend/views/spree/shared/order_details.scss b/app/assets/stylesheets/spree/frontend/views/spree/shared/order_details.scss index de76d09cf4..52982212ae 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/shared/order_details.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/shared/order_details.scss @@ -7,7 +7,6 @@ color: theme-color('dark-text'); margin-top: 25px; font-weight: normal; - text-transform: uppercase; &:first-child { margin-top: 0; diff --git a/app/assets/stylesheets/spree/frontend/views/spree/taxons/show.scss b/app/assets/stylesheets/spree/frontend/views/spree/taxons/show.scss index fcac529636..bddf580210 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/taxons/show.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/taxons/show.scss @@ -41,7 +41,7 @@ color: theme-color("dark-text"); } &-selected { - border-bottom: 5px solid theme-color('dark-text'); + border-bottom: 2px solid theme-color('dark-text'); } } } diff --git a/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss b/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss index 7c9dfe27c9..5a8cd216bf 100644 --- a/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss +++ b/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss @@ -226,45 +226,17 @@ &-order-status { order: 2; - font-size: font-px-to-rem(14px); - text-transform: uppercase; - @include media-breakpoint-up(md) { - font-size: font-px-to-rem(26px); - } - @include media-breakpoint-up(lg) { - font-size: font-px-to-rem(18px); - text-transform: initial; - } } &-order-date { order: 1; font-size: 14px; font-size: font-px-to-rem(14px); - @include media-breakpoint-up(md) { - font-size: font-px-to-rem(26px); - } - @include media-breakpoint-up(lg) { - font-size: font-px-to-rem(18px); - } } &-order-total { order: 4; font-size: font-px-to-rem(16px); - @include media-breakpoint-up(md) { - font-size: font-px-to-rem(29px); - } - @include media-breakpoint-up(lg) { - font-size: font-px-to-rem(18px); - } - } - - &-order-payment-state, - &-order-shipment-state { - @include media-breakpoint-up(md) { - font-size: font-px-to-rem(18px); - } } @include media-breakpoint-between(xs, md) { diff --git a/app/helpers/spree/addresses_helper.rb b/app/helpers/spree/addresses_helper.rb index 783434005b..d9c3da52bb 100644 --- a/app/helpers/spree/addresses_helper.rb +++ b/app/helpers/spree/addresses_helper.rb @@ -10,13 +10,12 @@ def address_field(form, method, address_id = 'b', &handler) method_name = I18n.t("activerecord.attributes.spree/address.#{method}") required = Spree.t(:required) form.text_field(method, - class: ['spree-flat-input'].compact, + class: ['form-control'].compact, required: is_required, placeholder: is_required ? "#{method_name} #{required}" : method_name, aria: { label: method_name }) + form.label(method_name, - is_required ? "#{method_name} #{required}" : method_name, - class: 'text-uppercase') + is_required ? "#{method_name} #{required}" : method_name) end end end @@ -27,13 +26,12 @@ def address_zipcode(form, country, address_id = 'b') method_name = Spree.t(:zipcode) required = Spree.t(:required) form.text_field(:zipcode, - class: ['spree-flat-input'].compact, + class: ['form-control'].compact, required: is_required, placeholder: is_required ? "#{method_name} #{required}" : method_name, aria: { label: Spree.t(:zipcode) }) + form.label(:zipcode, is_required ? "#{method_name} #{required}" : method_name, - class: 'text-uppercase', id: address_id + '_zipcode_label') end @@ -48,16 +46,14 @@ def address_state(form, country, address_id = 'b') aria: { label: Spree.t(:state) }, disabled: !have_states) + form.text_field(:state_name, - class: ['spree-flat-input'].compact, + class: ['form-control'].compact, aria: { label: Spree.t(:state) }, disabled: have_states, placeholder: Spree.t(:state) + " #{Spree.t(:required)}") + form.label(Spree.t(:state).downcase, raw(Spree.t(:state) + content_tag(:abbr, " #{Spree.t(:required)}")), - class: [have_states ? 'state-select-label' : nil, ' text-uppercase'].compact, - id: address_id + '_state_label') + - image_tag('arrow.svg', - class: [!have_states ? 'hidden' : nil, 'position-absolute spree-flat-select-arrow'].compact) + class: [have_states ? 'state-select-label' : nil, ' '].compact, + id: address_id + '_state_label') ].join.tr('"', "'").delete("\n") content_tag :span, class: 'd-block position-relative' do diff --git a/app/helpers/spree/frontend_helper.rb b/app/helpers/spree/frontend_helper.rb index 4ce17dda74..13dd43e30a 100644 --- a/app/helpers/spree/frontend_helper.rb +++ b/app/helpers/spree/frontend_helper.rb @@ -173,7 +173,7 @@ def plp_and_carousel_image(product, image_class = '') image_url = if image.present? main_app.cdn_image_url(image.url('plp')) else - asset_path('noimage/plp.svg') + asset_path('noimage/large.png') end image_style = image&.style(:plp) diff --git a/app/helpers/spree/navigation_helper.rb b/app/helpers/spree/navigation_helper.rb index 6d60fc79ad..f2ff013ca3 100644 --- a/app/helpers/spree/navigation_helper.rb +++ b/app/helpers/spree/navigation_helper.rb @@ -42,7 +42,7 @@ def spree_menu_cache_key(section = 'header') end def main_nav_image(image_path, title = '') - image_url = asset_path(asset_exists?(image_path) ? image_path : 'noimage/plp.svg') + image_url = asset_path(asset_exists?(image_path) ? image_path : 'noimage/large.png') lazy_image( src: image_url, diff --git a/app/helpers/spree/products_filters_helper.rb b/app/helpers/spree/products_filters_helper.rb index 42e9329529..d4625a4a84 100644 --- a/app/helpers/spree/products_filters_helper.rb +++ b/app/helpers/spree/products_filters_helper.rb @@ -2,10 +2,10 @@ module Spree module ProductsFiltersHelper PRICE_FILTER_NAME = 'price'.freeze - FILTER_LINK_CSS_CLASSES = 'd-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item'.freeze + FILTER_LINK_CSS_CLASSES = 'd-inline-block py-1 px-2 m-1 plp-overlay-card-item'.freeze ACTIVE_FILTER_LINK_CSS_CLASSES = 'plp-overlay-card-item--selected'.freeze - CLEAR_ALL_FILTERS_LINK_CSS_CLASSES = 'btn spree-btn btn-outline-primary w-100 mb-4'.freeze + CLEAR_ALL_FILTERS_LINK_CSS_CLASSES = 'btn spree-btn btn-sm btn-outline-primary w-100 mb-4'.freeze def price_filters @price_filters ||= [ @@ -38,7 +38,7 @@ def max_price_filter_input(**html_options) def price_filter_input(name:, value:, placeholder:, **html_options) price_value = value&.zero? ? '' : value - style_class = "spree-flat-input #{html_options[:class]}" + style_class = "form-control form-control-sm #{html_options[:class]}" number_field_tag( name, price_value, diff --git a/app/views/spree/addresses/_form.html.erb b/app/views/spree/addresses/_form.html.erb index dce342fde6..3657dc7883 100644 --- a/app/views/spree/addresses/_form.html.erb +++ b/app/views/spree/addresses/_form.html.erb @@ -5,11 +5,10 @@
">
" class="d-block position-relative has-float-label"> <%= address_form.collection_select :country_id, available_countries, :id, :name, - { prompt: Spree.t(:country).upcase }, - { class: 'form-control spree-flat-select', + { prompt: Spree.t(:country) }, + { class: 'custom-select spree-flat-select', aria: { label: Spree.t(:country) } } %> - <%= image_tag 'arrow.svg', class: 'position-absolute spree-flat-select-arrow' %> - <%= address_form.label(Spree.t(:country), Spree.t(:country).upcase, class:'text-uppercase') %> + <%= address_form.label(Spree.t(:country), Spree.t(:country)) %>
<% elsif field == "state" %> @@ -29,4 +28,4 @@ <% end %> <% end %> -

<%= Spree.t(:required) %> <%= Spree.t(:required_fields) %>

+

<%= Spree.t(:required) %> <%= Spree.t(:required_fields) %>

diff --git a/app/views/spree/addresses/edit.html.erb b/app/views/spree/addresses/edit.html.erb index 02799a519c..d106cf7df4 100644 --- a/app/views/spree/addresses/edit.html.erb +++ b/app/views/spree/addresses/edit.html.erb @@ -3,7 +3,7 @@

<%= Spree.t(:edit_address, scope: :address_book) %>

<%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
- <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %> + <%= f.text_field :label, class: 'form-control', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %> <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>
diff --git a/app/views/spree/addresses/new.html.erb b/app/views/spree/addresses/new.html.erb index 899eb4aba3..118ae14040 100644 --- a/app/views/spree/addresses/new.html.erb +++ b/app/views/spree/addresses/new.html.erb @@ -3,7 +3,7 @@

<%= Spree.t(:new_address, scope: :address_book) %>

<%= form_for @address, url: spree.addresses_path, html: { id: 'checkout_form_address' } do |f| %>
- <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %> + <%= f.text_field :label, class: 'form-control', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %> <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>
<%= render 'spree/addresses/form', diff --git a/app/views/spree/checkout/_address.html.erb b/app/views/spree/checkout/_address.html.erb index fb364337b8..4b33b3404e 100644 --- a/app/views/spree/checkout/_address.html.erb +++ b/app/views/spree/checkout/_address.html.erb @@ -2,7 +2,7 @@
- <%= form.email_field :email, class: 'required spree-flat-input', required: true, placeholder: Spree.t(:email) %> + <%= form.email_field :email, class: 'required form-control', required: true, placeholder: Spree.t(:email) %> <%= form.label :email, class: 'text-uppercase' %>
diff --git a/app/views/spree/checkout/_delivery.html.erb b/app/views/spree/checkout/_delivery.html.erb index c3045cb7fc..9f2d9d9fac 100644 --- a/app/views/spree/checkout/_delivery.html.erb +++ b/app/views/spree/checkout/_delivery.html.erb @@ -6,7 +6,7 @@

<%= Spree.t('checkout_page.delivery_method') %>

-
+
<%= Spree.t(:ship_to) %> <%= @order.shipping_address.address1 %> - <% if @order.shipping_address.zipcode.present? %> <%= @order.shipping_address.zipcode %> - <% end %> diff --git a/app/views/spree/checkout/_summary.html.erb b/app/views/spree/checkout/_summary.html.erb index 7186d7b843..ac33f7053d 100644 --- a/app/views/spree/checkout/_summary.html.erb +++ b/app/views/spree/checkout/_summary.html.erb @@ -1,6 +1,6 @@

<%= Spree.t(:order_summary) %>

-
+
<%= Spree.t(:subtotal) %>:
<%= order.display_item_total.to_html %>
diff --git a/app/views/spree/checkout/edit.html.erb b/app/views/spree/checkout/edit.html.erb index b468e67875..cb84e973f0 100644 --- a/app/views/spree/checkout/edit.html.erb +++ b/app/views/spree/checkout/edit.html.erb @@ -45,7 +45,7 @@ end <%= render partial: 'summary', locals: { order: @order } %>
<% submit_label_key = @order.confirm? ? :place_order : :save_and_continue %> - <%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary text-uppercase font-weight-bold w-100 checkout-content-save-continue-button' %> + <%= submit_tag Spree.t(submit_label_key), class: 'btn btn-primary font-weight-bold w-100 checkout-content-save-continue-button' %>
diff --git a/app/views/spree/checkout/payment/_gateway.html.erb b/app/views/spree/checkout/payment/_gateway.html.erb index f55df70ca9..32115f74d0 100644 --- a/app/views/spree/checkout/payment/_gateway.html.erb +++ b/app/views/spree/checkout/payment/_gateway.html.erb @@ -4,12 +4,12 @@
- <%= text_field_tag "#{param_prefix}[name]", "#{@order.bill_address_firstname} #{@order.bill_address_lastname}", { id: "name_on_card", class: 'spree-flat-input', placeholder: Spree.t(:name_on_card)} %> + <%= text_field_tag "#{param_prefix}[name]", "#{@order.bill_address_firstname} #{@order.bill_address_lastname}", { id: "name_on_card", class: 'form-control', placeholder: Spree.t(:name_on_card)} %>
<% options_hash = Rails.env.production? ? {autocomplete: 'off'} : {} %> - <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(id: 'card_number', class: 'spree-flat-input cardNumber', size: 19, maxlength: 19, autocomplete: "off", placeholder: Spree.t(:card_number)) %> + <%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(id: 'card_number', class: 'form-control cardNumber', size: 19, maxlength: 19, autocomplete: "off", placeholder: Spree.t(:card_number)) %>
- <%= text_field_tag "#{param_prefix}[expiry]", '', id: 'card_expiry', class: 'spree-flat-input cardExpiry', placeholder: "MM/YYYY" %> + <%= text_field_tag "#{param_prefix}[expiry]", '', id: 'card_expiry', class: 'form-control cardExpiry', placeholder: "MM/YYYY" %>
- <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(id: 'card_code', class: 'spree-flat-input cardCode', size: 5, placeholder: Spree.t(:cvv)) %> + <%= text_field_tag "#{param_prefix}[verification_value]", '', options_hash.merge(id: 'card_code', class: 'form-control cardCode', size: 5, placeholder: Spree.t(:cvv)) %>
diff --git a/app/views/spree/checkout/payment/_storecredit.html.erb b/app/views/spree/checkout/payment/_storecredit.html.erb index d8232309d9..8ca17c6f19 100644 --- a/app/views/spree/checkout/payment/_storecredit.html.erb +++ b/app/views/spree/checkout/payment/_storecredit.html.erb @@ -5,7 +5,7 @@

<%= Spree.t('store_credit.remaining_amount', amount: @order.display_store_credit_remaining_after_capture).html_safe %>

<% else %>

<%= Spree.t('store_credit.additional_payment_needed', amount: @order.display_order_total_after_store_credit).html_safe %>

- <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'store-credit-button continue btn btn-lg btn-primary font-weight-bold text-uppercase align-self-start' %> + <%= button_tag Spree.t('store_credit.remove'), name: 'remove_store_credit', class: 'store-credit-button continue btn btn-lg btn-primary font-weight-bold align-self-start' %> <% end %>
diff --git a/app/views/spree/checkout/registration.html.erb b/app/views/spree/checkout/registration.html.erb index 0f2ffe01c0..6a8d96d8ac 100755 --- a/app/views/spree/checkout/registration.html.erb +++ b/app/views/spree/checkout/registration.html.erb @@ -18,7 +18,7 @@ <%= form_for @order, url: path, method: :put, html: { id: 'checkout_form_registration', data: { turbo: false } } do |f| %>

- <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email) %> + <%= f.email_field :email, class: 'form-control', placeholder: Spree.t(:email) %>

<%= f.submit Spree.t(:continue_as_guest), class: 'btn btn-block btn-outline-primary spree-btn' %> diff --git a/app/views/spree/layouts/spree_application.html.erb b/app/views/spree/layouts/spree_application.html.erb index 7984f9e759..b005cff571 100644 --- a/app/views/spree/layouts/spree_application.html.erb +++ b/app/views/spree/layouts/spree_application.html.erb @@ -5,10 +5,13 @@ + + + + <%= render partial: 'spree/shared/head' %> - <%= render partial: 'spree/shared/get_started' %> <%= render partial: 'spree/shared/header' %>
diff --git a/app/views/spree/orders/_line_item_data.html.erb b/app/views/spree/orders/_line_item_data.html.erb index ebfa9c5039..c33aa349ee 100644 --- a/app/views/spree/orders/_line_item_data.html.erb +++ b/app/views/spree/orders/_line_item_data.html.erb @@ -10,7 +10,7 @@
<%= button_tag '-', type: 'button', class: "border-right-0 shopping-cart-item-quantity-decrease-btn", data: { id: dom_id(line_item) } %> - <%= item_form.number_field :quantity, min: 0, class: "form-control text-center border-left-0 border-right-0 shopping-cart-item-quantity-input", size: 5, data: { id: dom_id(line_item) }, aria: { label: Spree.t('cart_page.change_quantity') } %> + <%= item_form.number_field :quantity, min: 0, class: "form-control text-center border-left-0 border-right-0 rounded-0 shopping-cart-item-quantity-input", size: 5, data: { id: dom_id(line_item) }, aria: { label: Spree.t('cart_page.change_quantity') } %> <%= button_tag '+', type: 'button', class: "border-left-0 shopping-cart-item-quantity-increase-btn", data: { id: dom_id(line_item) } %>
diff --git a/app/views/spree/orders/show.html.erb b/app/views/spree/orders/show.html.erb index 1ebdb49ea2..9c1a5f7fbb 100644 --- a/app/views/spree/orders/show.html.erb +++ b/app/views/spree/orders/show.html.erb @@ -12,7 +12,7 @@

<%= Spree.t(:order_success_explain) %>

<% end %> -

+

<%= accurate_title %> / <%= pretty_date(@order.completed_at) %>

<%= render partial: 'spree/shared/order_details', locals: { order: @order } %> diff --git a/app/views/spree/products/_cart_form.html.erb b/app/views/spree/products/_cart_form.html.erb index fae93861cb..6577ed93df 100644 --- a/app/views/spree/products/_cart_form.html.erb +++ b/app/views/spree/products/_cart_form.html.erb @@ -37,7 +37,7 @@
<% end %> -
+
<%= Spree.t(:availability) %>: <% if !is_product_available_in_currency %> <%= render 'cart_form_availability_templates', type: 'not-available-in-currency' %> @@ -74,7 +74,7 @@ <%= render 'spree/shared/quantity_select', input_name: :quantity %>
- <%= button_tag class: 'btn btn-primary w-100 text-uppercase font-weight-bold add-to-cart-button', id: 'add-to-cart-button', type: :submit, disabled: true do %> + <%= button_tag class: 'btn btn-primary w-100 font-weight-bold add-to-cart-button', id: 'add-to-cart-button', type: :submit, disabled: true do %> <%= Spree.t(:add_to_cart) %> <% end %>
diff --git a/app/views/spree/products/_color_option_type.html.erb b/app/views/spree/products/_color_option_type.html.erb index ae9d4910db..63fa13741d 100644 --- a/app/views/spree/products/_color_option_type.html.erb +++ b/app/views/spree/products/_color_option_type.html.erb @@ -1,5 +1,5 @@
- + <%= option_type[:presentation] %> diff --git a/app/views/spree/products/_description.html.erb b/app/views/spree/products/_description.html.erb index 8d43a60d29..676528fa80 100644 --- a/app/views/spree/products/_description.html.erb +++ b/app/views/spree/products/_description.html.erb @@ -1,4 +1,4 @@ -

<%= Spree.t(:description) %>

+

<%= Spree.t(:description) %>

<% if Spree::Frontend::Config[:show_raw_product_description] || product_wysiwyg_editor_enabled? %>
diff --git a/app/views/spree/products/_filters_desktop.html.erb b/app/views/spree/products/_filters_desktop.html.erb index 34df4a7013..c94bfbea3a 100644 --- a/app/views/spree/products/_filters_desktop.html.erb +++ b/app/views/spree/products/_filters_desktop.html.erb @@ -85,7 +85,7 @@ <%= max_price_filter_input class: 'w-50 p-2' %>
- <%= link_to Spree.t('plp.done'), permitted_params, class: 'btn btn-primary spree-btn w-100', data: { params: permitted_params } %> + <%= link_to Spree.t('plp.done'), permitted_params, class: 'btn btn-sm btn-primary spree-btn w-100', data: { params: permitted_params } %>
diff --git a/app/views/spree/products/_filters_mobile.html.erb b/app/views/spree/products/_filters_mobile.html.erb index ce5e837392..5f8fac66e8 100644 --- a/app/views/spree/products/_filters_mobile.html.erb +++ b/app/views/spree/products/_filters_mobile.html.erb @@ -15,7 +15,7 @@ <% ot_downcase_name = option_type_name.downcase %>
-
+
<%= option_type.presentation %> <%= icon(name: 'arrow-right', classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow', @@ -35,7 +35,7 @@ <% property_name = property.name %> <% collapsed = params.dig(:properties, property.filter_param).blank? %>
-