Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Simplify Checkout Header (allow for single translation with logo moving to right on small screens.)

Matthew Kennedy5ad337ec4e2a
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index fd0aa9137c..0202904c13 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -729,7 +729,7 @@ en:
checkout_page:
main_navigation: Main navigation
checkout_navigation: Checkout navigation
- back_to_cart: back to the cart
+ back_to_cart: back to cart
delivery_method: delivery method
header: Checkout
product: Product
diff --git a/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss b/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss
index bdffd960a8..8b54266465 100644
--- a/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss
+++ b/frontend/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss
@@ -32,9 +32,21 @@
}
}
&-text {
- padding-left: 15px;
+ color: black;
+ font-size: 0.8rem;
+ @include media-breakpoint-up(sm) {
+ font-size: 1rem;
+ }
+ @include media-breakpoint-up(lg) {
+ font-size: 1.25rem;
+ }
+ svg {
+ height: 15px;
+ padding-top: 2px;
+ }
&:hover {
text-decoration: underline;
+ color: black;
}
}
}
diff --git a/frontend/app/views/spree/shared/_checkout_header.html.erb b/frontend/app/views/spree/shared/_checkout_header.html.erb
index f4686402a8..3c254c68f4 100644
--- a/frontend/app/views/spree/shared/_checkout_header.html.erb
+++ b/frontend/app/views/spree/shared/_checkout_header.html.erb
@@ -1,27 +1,25 @@
<div id="spree-header">
<header id="header" class="d-flex align-items-center header-spree border-bottom">
- <div class="container position-relative" role="navigation" aria-label="<%= Spree.t('checkout_page.main_navigation') %>">
- <div class="position-absolute checkout-header-link">
- <%= link_to spree.cart_path, class: "d-none d-sm-inline text-uppercase", method: :get do %>
- <%= icon(name: 'arrow-right',
- classes: 'spree-icon-arrow spree-icon-arrow-left',
- width: 7,
- height: 14) %>
- <span class="checkout-header-link-text"><%= Spree.t('checkout_page.back_to_cart') %></span>
- <% end %>
+ <div class="container" role="navigation" aria-label="<%= Spree.t('checkout_page.main_navigation') %>">
+
+ <div class="row">
+ <div class="col d-flex align-items-center truncate pr-0">
+ <%= link_to spree.cart_path, class: "text-uppercase truncate checkout-header-link-text", method: :get do %>
+ <%= icon(name: 'arrow-right',
+ classes: 'spree-icon-arrow spree-icon-arrow-left',
+ width: 14,
+ height: 14) %>
+ <%= Spree.t('checkout_page.back_to_cart') %>
+ <% end %>
+ </div>
+
+ <div class="col-auto d-flex align-items-center justify-content-end justify-content-md-center">
+ <figure class="logo header-spree-fluid-logo m-0 p-0">
+ <%= logo(nil, {method: :get}) %>
+ </figure>
+ </div>
+ <div class="col-0 col-md"><!-- spacer --></div>
- <%= link_to spree.cart_path, class: "d-sm-none text-uppercase", method: :get do %>
- <%= icon(name: 'arrow-right',
- classes: 'spree-icon-arrow spree-icon-arrow-left',
- width: 7,
- height: 14) %>
- <span class="checkout-header-link-text"><%= Spree.t('back') %></span>
- <% end %>
- </div>
- <div class="d-flex flex-nowrap align-items-center justify-content-center">
- <figure class="logo flex-grow-0 flex-xl-grow-0 order-xl-0 header-spree-fluid-logo m-0">
- <%= logo(nil, {method: :get}) %>
- </figure>
</div>
</div>
</header>