RubyGems - spree_frontend - Versions diffs - 4.6.0 → 4.8.0 - Mend

spree_frontend 4.6.0 → 4.8.0

Files changed (139) hide show

data/app/views/spree/layouts/spree_application.html.erb CHANGED Viewed

@@ -5,10 +5,13 @@
 <!--[if IE 9 ]>    <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
 <!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
   <head data-hook="inside_head">
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap" rel="stylesheet">
     <%= render partial: 'spree/shared/head' %>
   </head>
   <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
-    <%= render partial: 'spree/shared/get_started' %>
     <%= render partial: 'spree/shared/header' %>
     <div id="overlay" class="overlay hide-on-esc"></div>

data/app/views/spree/orders/_line_item_data.html.erb CHANGED Viewed

@@ -10,7 +10,7 @@
 <div class="shopping-cart-item-quantity <%= additional_classes %>" data-hook="cart_item_quantity">
   <div class="d-flex align-items-center">
     <%= 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) } %>
   </div>
 </div>

data/app/views/spree/orders/show.html.erb CHANGED Viewed

@@ -12,7 +12,7 @@
     <p class="order-show-explain w-100 text-center"><%= Spree.t(:order_success_explain) %></p>
   <% end %>
-  <p class="order-show-number text-uppercase w-100 text-center">
+  <p class="order-show-number w-100 text-center">
     <%= accurate_title %> / <%= pretty_date(@order.completed_at) %>
   </p>
   <%= render partial: 'spree/shared/order_details', locals: { order: @order } %>

data/app/views/spree/products/_cart_form.html.erb CHANGED Viewed

@@ -37,7 +37,7 @@
       </div>
     <% end %>
-    <div class="text-center text-md-left add-to-cart-form-general-availability text-uppercase">
+    <div class="text-center text-md-left add-to-cart-form-general-availability">
       <%= 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 %>
         </div>
-        <%= 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 %>
       </div>

data/app/views/spree/products/_color_option_type.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <div class="product-variants-variant product-variants-variant--color" data-option-type-id="<%= option_type[:id] %>">
-  <span class="d-block mb-2 text-center text-md-left text-uppercase product-variants-variant-title">
+  <span class="d-block mb-2 text-center text-md-left product-variants-variant-title">
     <%= option_type[:presentation] %>
   </span>

data/app/views/spree/products/_description.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<h3 class="pt-4 font-weight-bold text-uppercase product-details-subtitle"><%= Spree.t(:description) %></h3>
+<h3 class="pt-4 font-weight-bold product-details-subtitle"><%= Spree.t(:description) %></h3>
 <% if Spree::Frontend::Config[:show_raw_product_description] || product_wysiwyg_editor_enabled? %>
   <div id="product-description-long" class="m-0 text-break product-description" data-hook="description">

data/app/views/spree/products/_filters_desktop.html.erb CHANGED Viewed

@@ -85,7 +85,7 @@
                 <%= max_price_filter_input class: 'w-50 p-2' %>
               </div>
-              <%= 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 } %>
             </div>
           </div>
         </div>

data/app/views/spree/products/_filters_mobile.html.erb CHANGED Viewed

@@ -15,7 +15,7 @@
           <% ot_downcase_name = option_type_name.downcase %>
           <div class="card plp-overlay-card">
-            <div class="card-header text-uppercase <%= 'collapsed' if params[ot_downcase_name].blank? %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= option_type_name %>" data-target="#collapseFilterMobile<%= option_type_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= option_type_name %>" role="heading" aria-level="3">
+            <div class="card-header <%= 'collapsed' if params[ot_downcase_name].blank? %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= option_type_name %>" data-target="#collapseFilterMobile<%= option_type_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= option_type_name %>" role="heading" aria-level="3">
               <%= 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? %>
             <div class="card plp-overlay-card">
-              <div class="card-header text-uppercase <%= 'collapsed' if collapsed %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= property_name %>" data-target="#collapseFilterMobile<%= property_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= property_name %>" role="heading" aria-level="3">
+              <div class="card-header <%= 'collapsed' if collapsed %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= property_name %>" data-target="#collapseFilterMobile<%= property_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= property_name %>" role="heading" aria-level="3">
                 <%= property.presentation %>
                 <%= icon(name: 'arrow-right',
                          classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
@@ -57,7 +57,7 @@
         <% end %>
         <div class="card plp-overlay-card">
-          <div class="card-header text-uppercase <%= 'collapsed' if params[:price].blank? %> plp-overlay-card-header" id="headingFour" data-toggle="collapse" data-target="#collapseFour" aria-expanded="true" aria-controls="collapseFour" role="heading" aria-level="3">
+          <div class="card-header <%= 'collapsed' if params[:price].blank? %> plp-overlay-card-header" id="headingFour" data-toggle="collapse" data-target="#collapseFour" aria-expanded="true" aria-controls="collapseFour" role="heading" aria-level="3">
             <%= Spree.t('plp.price') %>
             <%= icon(name: 'arrow-right',
                     classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',

data/app/views/spree/products/_option_type.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <div class="product-variants-variant" data-option-type-id="<%= option_type[:id] %>">
-  <span class="d-block mb-2 text-center text-md-left text-uppercase product-variants-variant-title">
+  <span class="d-block mb-2 text-center text-md-left product-variants-variant-title">
     <%= option_type[:presentation] %>
   </span>

data/app/views/spree/products/_promotions.html.erb CHANGED Viewed

@@ -2,7 +2,7 @@
 <% if promotions.any? %>
   <div id="promotions">
-    <h3 class="pt-4 font-weight-bold text-uppercase product-details-subtitle"><%= Spree.t(:promotions) %></h3>
+    <h3 class="pt-4 font-weight-bold product-details-subtitle"><%= Spree.t(:promotions) %></h3>
     <% promotions.each do |promotion| %>
       <div class="row">
         <div class="col-12 col-md-7 col-lg-6 mb-3">

data/app/views/spree/products/_properties.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% unless @product_properties.blank? %>
-  <h3 class="pt-4 font-weight-bold text-uppercase product-details-subtitle"><%= Spree.t(:details) %></h3>
+  <h3 class="pt-4 font-weight-bold product-details-subtitle"><%= Spree.t(:details) %></h3>
   <ul id="product-properties" class="m-0 list-unstyled product-properies" data-hook>
     <% @product_properties.each do |product_property| %>
       <% if product_property.show_property? %>

data/app/views/spree/products/_sort_desktop.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<div class="container dropdown d-none d-lg-flex justify-content-end mt-5 pr-4 pb-3 plp-sort">
+<div class="dropdown d-none d-lg-flex justify-content-end mt-5 pr-4 pb-3 plp-sort">
   <a data-toggle="dropdown" class="plp-sort-header" href="#" role="button" aria-haspopup="true" aria-expanded="false">
     <%= Spree.t("plp.#{ params[:sort_by].blank? ? 'sort_by': params[:sort_by].gsub('-', '_') }") %>
     <%= icon(name: 'arrow-right',
@@ -10,27 +10,12 @@
              width: 18,
              height: 18) %>
   </a>
-  <div class="dropdown-menu text-right plp-sort-dropdown">
-    <ul class="pt-1 plp-sort-dropdown-ul">
-      <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by].blank? %>">
-        <%= link_to Spree.t('plp.default'), url_for(permitted_params.merge(sort_by: nil)), class: 'dropdown-item' %>
-      </li>
-      <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'name-a-z' %>">
-        <%= link_to Spree.t('plp.name_a_z'), url_for(permitted_params.merge(sort_by: 'name-a-z')), class: 'dropdown-item' %>
-      </li>
-    </li>
-    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'name-z-a' %>">
-      <%= link_to Spree.t('plp.name_z_a'), url_for(permitted_params.merge(sort_by: 'name-z-a')), class: 'dropdown-item' %>
-    </li>
-    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'newest-first' %>">
-      <%= link_to Spree.t('plp.newest_first'), url_for(permitted_params.merge(sort_by: 'newest-first')), class: 'dropdown-item' %>
-    </li>
-    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'price-high-to-low' %>">
-      <%= link_to Spree.t('plp.price_high_to_low'), url_for(permitted_params.merge(sort_by: 'price-high-to-low')), class: 'dropdown-item' %>
-    </li>
-    <li class="p-3 plp-sort-dropdown-ul-li<%= '--active' if params[:sort_by] == 'price-low-to-high' %>">
-      <%= link_to Spree.t('plp.price_low_to_high'), url_for(permitted_params.merge(sort_by: 'price-low-to-high')), class: 'dropdown-item' %>
-    </li>
-  </ul>
-</div>
+  <div class="dropdown-menu text-right">
+    <%= active_link_to Spree.t('plp.default'), url_for(permitted_params.merge(sort_by: nil)), class: 'dropdown-item', active: { sort_by: nil } %>
+    <%= active_link_to Spree.t('plp.name_a_z'), url_for(permitted_params.merge(sort_by: 'name-a-z')), class: 'dropdown-item', active: { sort_by: 'name-a-z' } %>
+    <%= active_link_to Spree.t('plp.name_z_a'), url_for(permitted_params.merge(sort_by: 'name-z-a')), class: 'dropdown-item', active: { sort_by: 'name-z-a' } %>
+    <%= active_link_to Spree.t('plp.newest_first'), url_for(permitted_params.merge(sort_by: 'newest-first')), class: 'dropdown-item', active: { sort_by: 'newest-first' } %>
+    <%= active_link_to Spree.t('plp.price_high_to_low'), url_for(permitted_params.merge(sort_by: 'price-high-to-low')), class: 'dropdown-item', active: { sort_by: 'price-high-to-low' } %>
+    <%= active_link_to Spree.t('plp.price_low_to_high'), url_for(permitted_params.merge(sort_by: 'price-low-to-high')), class: 'dropdown-item', active: { sort_by: 'price-low-to-high' } %>
+  </div>
 </div>

data/app/views/spree/products/index.html.erb CHANGED Viewed

@@ -11,7 +11,7 @@
   <% else %>
     <% if params[:keywords] %>
       <div class="container d-md-flex pt-md-5">
-        <div class="plp-results-text text-uppercase mx-md-auto py-md-5">
+        <div class="plp-results-text mx-md-auto py-md-5">
           <%= "#{@products.total_count} #{Spree.t('plp.results_for')} '#{params[:keywords].upcase}'" %>
         </div>
       </div>

data/app/views/spree/products/related.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
       <% if products.any? %>
         <div class="product-details-related" id="product-details-related-<%= relation_type.id %>">
-          <p class="font-weight-bold text-center text-uppercase product-details-carousel-text"><%= relation_type.name %></p>
+          <p class="font-weight-bold text-center product-details-carousel-text"><%= relation_type.name %></p>
           <%= render 'spree/shared/carousel_4_products', id: "related-products-carousel-#{relation_type.id}", products: products %>
         </div>
       <% end %>

data/app/views/spree/shared/_checkout_header.html.erb CHANGED Viewed

@@ -4,7 +4,7 @@
       <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 %>
+          <%= link_to spree.cart_path, class: "truncate checkout-header-link-text btn btn-link", method: :get do %>
             <%= icon(name: 'arrow-right',
                      classes: 'spree-icon-arrow spree-icon-arrow-left',
                      width: 14,

data/app/views/spree/shared/_currency_dropdown.html.erb CHANGED Viewed

@@ -6,7 +6,7 @@
       </label>
       <%= select_tag(:switch_to_currency,
         options_for_select(supported_currency_options, current_currency),
-        class: 'custom-select w-100') %>
+        class: 'custom-select custom-select-sm w-100') %>
       <noscript><%= submit_tag %></noscript>
     </div>
   <% end %>

data/app/views/spree/shared/_delete_address_popup.html.erb CHANGED Viewed

@@ -12,10 +12,10 @@
   </p>
   <div class="d-flex delete-address-popup-buttons">
-    <div class="btn bg-light-background text-primary border-2 border-primary text-uppercase font-weight-bold delete-address-popup-button js-delete-address-popup-close-button"><%= Spree.t(:cancel) %></div>
+    <div class="btn bg-light-background text-primary border-2 border-primary font-weight-bold delete-address-popup-button js-delete-address-popup-close-button"><%= Spree.t(:cancel) %></div>
     <a
       id="delete-address-popup-confirm"
-      class="btn btn-primary text-uppercase font-weight-bold delete-address-popup-button"
+      class="btn btn-primary font-weight-bold delete-address-popup-button"
       data-method="delete"
       rel="nofollow"
       href="#">

data/app/views/spree/shared/_footer.html.erb CHANGED Viewed

@@ -47,7 +47,7 @@
           </div>
         </div>
       </div>
-      <div class="row d-none d-xl-flex border-top pt-5 text-uppercase footer-spree-menu-links">
+      <div class="row d-none d-xl-flex border-top pt-5 footer-spree-menu-links">
         <% if spree_menu('footer').present? %>
           <% spree_menu('footer').children.each do |parent| %>
@@ -71,10 +71,10 @@
         <% if spree.respond_to?(:account_path) %>
           <div class="col-3 mb-5">
             <div class="footer-spree-label">
-              <%= Spree.t('nav_bar.my_account') %>
+              <%= Spree.t(:my_account) %>
             </div>
             <div class="pt-2">
-              <%= link_to Spree.t(:my_orders).upcase, spree.account_path(anchor: "account-my-orders") %>
+              <%= link_to Spree.t(:my_orders), spree.account_path(anchor: "account-my-orders") %>
             </div>
           </div>
         <% end %>

data/app/views/spree/shared/_head.html.erb CHANGED Viewed

@@ -7,8 +7,9 @@
 <%= favicon_link_tag(spree_favicon_path) %>
 <%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', data: { turbo_track: 'reload' } %>
 <%= csrf_meta_tags %>
+<%= javascript_importmap_tags('application-spree-frontend') %>
 <%= render 'spree/shared/paths' %>
 <%= render 'spree/shared/locale_and_currency' %>
-<%= javascript_include_tag "application", defer: true, data: { turbo_track: 'reload' } %>
 <%= javascript_include_tag 'spree/frontend/all', defer: true, data: { turbo_track: 'reload' } %>
 <%= yield :head %>

data/app/views/spree/shared/_internationalization_options.html.erb CHANGED Viewed

@@ -4,8 +4,8 @@
       <button id="internationalization-button-desktop" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t(:internationalization) %>">
         <%= icon(name: 'global',
                 classes: 'd-none d-xl-inline-block',
-                width: 41,
-                height: 36) %>
+                width: 24,
+                height: 24) %>
         <%= icon(name: 'arrow-down',
                 classes: 'd-inline-block d-xl-none',
                 width: 15,
@@ -17,7 +17,7 @@
           <% stores.each do |store| %>
             <div class="pl-3 d-flex justify-content-between align-items-center stores-list">
               <%= country_flag_icon(store_country_iso(store)) %>
-              <%= store_link(store, class: "dropdown-item text-uppercase #{'font-weight-bold' if current_store == store}") %>
+              <%= store_link(store, class: "dropdown-item #{'font-weight-bold' if current_store == store}") %>
             </div>
           <% end %>
         <% else %>

data/app/views/spree/shared/_line_item.html.erb CHANGED Viewed

@@ -4,7 +4,7 @@
       <%= link_to product_image(line_item.variant), spree.product_path(line_item.product) %>
       <div class="d-flex flex-column mt-2 mt-lg-0">
         <div><%= link_to line_item.name, spree.product_path(line_item.product) %></div>
-        <ul class="checkout-confirm-order-details-line-items-line-item-name-options text-uppercase list-unstyled mb-0">
+        <ul class="checkout-confirm-order-details-line-items-line-item-name-options list-unstyled mb-0">
           <% line_item.variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>
           <li>
             <% # TODO: rework option values so options_text method can be used here %>

data/app/views/spree/shared/_locale_dropdown.html.erb CHANGED Viewed

@@ -6,7 +6,7 @@
       </label>
       <%= select_tag(:switch_to_locale,
         options_for_select(supported_locales_options, I18n.locale),
-        class: 'custom-select w-100') %>
+        class: 'custom-select custom-select-sm w-100') %>
       <noscript><%= submit_tag %></noscript>
     </div>
   <% end %>

data/app/views/spree/shared/_login.html.erb CHANGED Viewed

@@ -4,12 +4,12 @@
     <div id="password-credentials" class="mb-4">
       <div class="form-group mb-4">
         <p class="form-group checkout-content-inner-field">
-          <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email), value: params.dig(:spree_user, :email) %>
+          <%= f.email_field :email, class: 'form-control', placeholder: Spree.t(:email), value: params.dig(:spree_user, :email) %>
         </p>
       </div>
       <div class="form-group mb-4">
         <p class="form-group checkout-content-inner-field">
-          <%= f.password_field :password, class: 'spree-flat-input', placeholder: Spree.t(:password) %>
+          <%= f.password_field :password, class: 'form-control', placeholder: Spree.t(:password) %>
         </p>
       </div>
     </div>

data/app/views/spree/shared/_main_nav_bar.html.erb CHANGED Viewed

@@ -22,14 +22,14 @@
                       <!-- Categories -->
                       <% if child.container? && child.code?('category') %>
                         <div class="category-links my-4 mx-2">
-                          <div class="category-links-header text-uppercase">
+                          <div class="category-links-header">
                             <%= child.name %>
                           </div>
                           <% if child.children.present? %>
                             <ul class="pl-0">
                               <% child.children.each do |category_link| %>
                                 <li>
-                                  <%= spree_nav_link_tag(category_link, { class: "text-uppercase main-nav-bar-category-links dropdown-item truncate" }) %>
+                                  <%= spree_nav_link_tag(category_link, { class: "main-nav-bar-category-links dropdown-item truncate" }) %>
                                 </li>
                               <% end %>
                             </ul>

data/app/views/spree/shared/_mobile_internationalization_options.html.erb CHANGED Viewed

@@ -22,7 +22,7 @@
         <% stores.each do |store| %>
           <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">
             <%= country_flag_icon(store_country_iso(store)) %>
-            <%= store_link(store, class: "dropdown-item text-uppercase d-flex #{'font-weight-bold' if current_store == store}") %>
+            <%= store_link(store, class: "dropdown-item d-flex #{'font-weight-bold' if current_store == store}") %>
           </li>
         <% end %>
       <% else %>

data/app/views/spree/shared/_mobile_navigation.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% if spree_menu.present? %>
-  <div class="position-fixed text-uppercase d-xl-none mobile-navigation" role="navigation" aria-label="<%= Spree.t('nav_bar.mobile') %>">
+  <div class="position-fixed d-xl-none mobile-navigation" role="navigation" aria-label="<%= Spree.t('nav_bar.mobile') %>">
     <div class="container d-flex align-items-center justify-content-between header-spree" data-hook>
       <button class="m-0 p-0" id="mobile-navigation-back-button" aria-label="<%= Spree.t('nav_bar.go_to_previous_menu') %>">
         <%= icon(name: 'arrow-right',

data/app/views/spree/shared/_nav_bar.html.erb CHANGED Viewed

@@ -4,8 +4,8 @@
       <button type="button" class="navbar-right-dropdown-toggle search-icons" aria-label="<%= Spree.t('nav_bar.show_search') %>">
         <%= icon(name: 'magnifying-glass',
                  classes: 'd-inline-block',
-                 width: 36,
-                 height: 36) %>
+                 width: 24,
+                 height: 24) %>
       </button>
       <div id="search-dropdown" class="p-0 px-md-4 py-md-2 w-100 shadow navbar-right-search-menu-dropdown hide-on-esc">
@@ -19,8 +19,8 @@
         <button id="account-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle account-icon" aria-label="<%= Spree.t('nav_bar.show_user_menu') %>">
           <%= icon(name: 'person',
                   classes: 'd-inline-block',
-                  width: 41.4,
-                  height: 36) %>
+                  width: 24,
+                  height: 24) %>
         </button>
         <div id="link-to-account" class="dropdown-menu dropdown-menu-right text-right">
@@ -29,7 +29,7 @@
     </li>
   <% end %>
   <li id="link-to-cart">
-    <%= render 'spree/shared/cart', class: 'd-inline-block cart-icon', size: 36, item_count: 0 %>
+    <%= render 'spree/shared/cart', class: 'd-inline-block cart-icon', size: 24, item_count: 0 %>
   </li>
   <%= render partial: 'spree/shared/internationalization_options' %>
 </ul>

data/app/views/spree/shared/_no_product_available.html.erb CHANGED Viewed

@@ -15,7 +15,7 @@
     <% end %>
   <p>
-  <div class="btn btn-primary text-uppercase font-weight-bold d-flex no-product-available-button" id="no-product-available-hide-button">
+  <div class="btn btn-primary font-weight-bold d-flex no-product-available-button" id="no-product-available-hide-button">
     <p class="d-flex m-auto no-product-available-button-text">
       <%= Spree.t(:ok) %>
     </p>

data/app/views/spree/shared/_order_details.html.erb CHANGED Viewed

@@ -56,7 +56,7 @@
       <%= Spree.t(:products) %>
     </div>
     <div class="d-table" data-hook="order_details">
-      <div class="d-none d-lg-table-row text-secondary text-uppercase" data-hook="order_details_line_items_headers">
+      <div class="d-none d-lg-table-row text-secondary" data-hook="order_details_line_items_headers">
         <p class="d-table-cell pb-1">
           <%= Spree.t(:product) %>
         </p>
@@ -82,7 +82,7 @@
                   <%= link_to item.name, spree.product_path(item.product), class: 'checkout-confirm-order-details-line-items-line-item-name-link' %>
                 </div>
                 <% unless item.variant.is_master? %>
-                  <ul class="checkout-confirm-order-details-line-items-line-item-name-options text-uppercase list-unstyled mb-0">
+                  <ul class="checkout-confirm-order-details-line-items-line-item-name-options list-unstyled mb-0">
                     <% item.variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>
                     <li>
                       <% # TODO: rework option values so options_text method can be used here %>
@@ -120,7 +120,7 @@
     <% unless @order.uneditable? %>
       <div data-hook="buttons">
         <% 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' %>
       </div>
     <% end %>
   </div>

data/app/views/spree/shared/_product_added_modal.html.erb CHANGED Viewed

@@ -47,14 +47,14 @@
         <div class="container-fluid">
           <div class="row pb-4 justify-content-center">
             <div class="col-12 col-lg-8">
-              <%= link_to spree.checkout_path, class: 'btn btn-primary w-100 font-weight-bold text-uppercase product-added-modal-button', method: :get do %>
+              <%= link_to spree.checkout_path, class: 'btn btn-primary w-100 font-weight-bold product-added-modal-button', method: :get do %>
                 <%= Spree.t(:checkout) %>
               <% end %>
             </div>
           </div>
           <div class="row justify-content-center">
             <div class="col-12 col-lg-8">
-              <%= link_to spree.cart_path, class: 'btn btn-outline-primary w-100 font-weight-bold text-uppercase product-added-modal-button' do %>
+              <%= link_to spree.cart_path, class: 'btn btn-outline-primary w-100 font-weight-bold product-added-modal-button' do %>
                 <%= Spree.t('pdp.view_cart') %>
               <% end %>
             </div>

data/app/views/spree/shared/_user_form.html.erb CHANGED Viewed

@@ -1,12 +1,12 @@
 <div class="form-group mb-5">
-  <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email) %>
+  <%= f.email_field :email, class: 'form-control', placeholder: Spree.t(:email) %>
 </div>
 <div class="form-group mb-4">
-  <%= f.password_field :password, class: 'spree-flat-input', placeholder: Spree.t(:password) %>
+  <%= f.password_field :password, class: 'form-control', placeholder: Spree.t(:password) %>
 </div>
 <div class="form-group mb-5">
-  <%= f.password_field :password_confirmation, class: 'spree-flat-input', placeholder: Spree.t(:confirm_password) %>
+  <%= f.password_field :password_confirmation, class: 'form-control', placeholder: Spree.t(:confirm_password) %>
 </div>
 <div data-hook="signup_below_password_fields"></div>

data/app/views/spree/taxons/_header.html.erb CHANGED Viewed

@@ -1,5 +1,5 @@
 <% cache [base_cache_key, taxon, 'header'] do %>
-  <div class="py-md-3 text-uppercase taxon-title">
+  <div class="py-md-3 taxon-title">
     <%= @taxon.name %>
   </div>
   <% unless @taxon.description.blank? %>

data/app/views/spree/taxons/_subcategories.html.erb CHANGED Viewed

@@ -7,7 +7,7 @@
     <% child_taxons = [current_taxon, *current_taxon.children.where(hide_from_nav: false)] %>
     <% if current_taxon.level > 0 && child_taxons.size > 1 %>
       <div class="d-flex justify-content-center position-sticky sticky-top-90px taxon-subcategories-wrapper">
-        <div class="py-1 text-uppercase d-none d-xl-flex overflow-x taxon-subcategories">
+        <div class="py-1 d-none d-xl-flex overflow-x taxon-subcategories">
           <% child_taxons.each_with_index.map do |subcategory, index| %>
             <%=
               link_to_unless subcategory == taxon,

data/app/views/spree/taxons/product_carousel.html.erb CHANGED Viewed

@@ -1,4 +1,4 @@
-<p class="font-weight-bold text-center homepage-carousel-text text-uppercase">
+<p class="font-weight-bold text-center homepage-carousel-text">
   <%= @taxon.name %>
 </p>

data/app/views/spree/users/edit.html.erb CHANGED Viewed

@@ -5,7 +5,7 @@
   <%= form_for Spree.user_class.new, as: @user, url: spree.user_path(@user), method: :put do |f| %>
     <%= render partial: 'spree/shared/user_form', locals: { f: f, remember_me_field: false } %>
     <div>
-      <%= f.submit Spree.t(:update), class: 'btn btn-lg btn-block btn-primary text-uppercase font-weight-bold' %>
+      <%= f.submit Spree.t(:update), class: 'btn btn-lg btn-block btn-primary font-weight-bold' %>
     </div>
   <% end %>
 </div>

data/app/views/spree/users/show.html.erb CHANGED Viewed

@@ -12,7 +12,7 @@
       <dd class="account-page-user-info-item-definition"><%= @user.email %></dd>
       <div class="d-lg-inline-block account-page-user-info-item-store-credits">
-        <p class="my-0 text-uppercase text-center">
+        <p class="my-0 text-center">
           <%= Spree.t(:store_credit_name) %>
           <% @user.available_store_credits(current_store).each do |value| %>
             <br><b class="account-page-user-info-item-store-credits-amount"><%= value %></b>

data/config/importmap.rb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ pin "application-spree-frontend", to: "spree/frontend/application.js", preload: true
2	+ pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true

data/config/initializers/admin_actions.rb ADDED Viewed

@@ -0,0 +1,18 @@
+Rails.application.config.after_initialize do
+  if Spree::Core::Engine.backend_available?
+    action = ::Spree::Admin::Actions::ActionBuilder.new('preview', ->(resource) { "/products/#{resource.slug}" }).
+              with_icon_key('view.svg').
+              with_label_translation_key('admin.utilities.preview').
+              with_id('adminPreviewProduct').
+              with_target(:blank).
+              with_data_attributes({ turbo: false }).
+              build
+    Rails.application.config.spree_backend.actions[:product].add(action)
+    Rails.application.config.spree_backend.actions[:images].add(action)
+    Rails.application.config.spree_backend.actions[:variants].add(action)
+    Rails.application.config.spree_backend.actions[:prices].add(action)
+    Rails.application.config.spree_backend.actions[:stock].add(action)
+    Rails.application.config.spree_backend.actions[:product_properties].add(action)
+  end
+end

data/config/locales/en.yml ADDED Viewed

@@ -0,0 +1,37 @@
+en:
+  spree:
+    pdp:
+      checkout: Checkout
+      description: Description
+      details: Details
+      products_included_in_promotion: Products included in the promotion
+      quantity: Quantity
+      view_cart: View cart
+      you_may_also_like: You may also like
+    plp:
+      best_selling: Best Selling
+      clear_all: Clear All
+      collection: Collection
+      color: Color
+      done: Done
+      default: Default
+      filter_by: Filter By
+      newest_first: Newest First
+      no_results: No results
+      no_results_found: No results found
+      not_found_filters1: We couldn’t find a match for these filters.
+      not_found_filters2: Please try another choose.
+      not_found_text1: We couldn’t find products for '%{keywords}'.
+      not_found_text2: Please try another search.
+      price: Price
+      price_high_to_low: Price (High - Low)
+      price_low_to_high: Price (Low - High)
+      name_a_z: Name (A-Z)
+      name_z_a: Name (Z-A)
+      result: Result
+      results_for: Results For
+      size: Size
+      sort_by: Sort By
+      top_sellers: Top Sellers
+      type: Type

data/lib/generators/spree/frontend/install/install_generator.rb CHANGED Viewed

@@ -23,8 +23,6 @@ module Spree
           directory 'homepage', './app/assets/images/homepage'
           # SCSS theming
           template 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'
-          # Sprockets 4 manifest
-          template 'app/assets/config/manifest.js', force: Rails.env.test?
           # home page template
           directory 'home', './app/views/spree/home'
         end

data/lib/spree/frontend/configuration.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module Spree
       preference :additional_filters_partials, :array, default: %w()
       preference :always_put_site_name_in_title, :boolean, default: true
       preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
-      preference :http_cache_enabled, :boolean, default: true
+      preference :http_cache_enabled, :boolean, default: false
       preference :layout, :string, default: 'spree/layouts/spree_application'
       preference :locale, :string, default: nil
       preference :products_filters, :array, default: %w(keywords price sort_by)