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.

Fixed Storefront templates for Tailwind 4 (#13264)

Damian Legawiec221148dd2923
diff --git a/storefront/app/views/spree/checkout/_coupon_code.html.erb b/storefront/app/views/spree/checkout/_coupon_code.html.erb
index 6dd55f77b6..0b2ea5949c 100644
--- a/storefront/app/views/spree/checkout/_coupon_code.html.erb
+++ b/storefront/app/views/spree/checkout/_coupon_code.html.erb
@@ -16,7 +16,7 @@
<%= hidden_field_tag :coupon_code, promotion.code_for_order(@order) %>
<div class="m-0">
<div class="flex items-center justify-between text-sm">
- <span class="max-w-[250px] truncate flex items-center p-2 rounded bg-gray-200">
+ <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-gray-200">
<%= heroicon('tag', options: { class: 'h-4 w-4 mr-2' }) %>
<%= promotion.name_for_order(@order) %>
</span>
@@ -31,7 +31,7 @@
<%= hidden_field_tag :gift_card, @order.gift_card.code %>
<div class="m-0">
<div class="flex items-center justify-between text-sm">
- <span class="max-w-[250px] truncate flex items-center p-2 rounded bg-gray-200">
+ <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-gray-200">
<%= heroicon('gift', options: { class: 'h-4 w-4 mr-2' }) %>
<%= @order.gift_card.code.upcase %>
</span>
@@ -45,7 +45,7 @@
<% if local_assigns[:result] && action_name == 'apply_coupon_code' %>
<% if result.error.blank? %>
- <div class="alert-success p-2 text-xs rounded"><%= result.success %></div>
+ <div class="alert-success p-2 text-xs rounded-sm"><%= result.success %></div>
<% else %>
<div class="text-red-500 !text-md text-xs ">
<span><%= result.error %></span>
diff --git a/storefront/app/views/spree/checkout/_delivery_backorder_notice.html.erb b/storefront/app/views/spree/checkout/_delivery_backorder_notice.html.erb
index d0407bcc48..914d4c7649 100644
--- a/storefront/app/views/spree/checkout/_delivery_backorder_notice.html.erb
+++ b/storefront/app/views/spree/checkout/_delivery_backorder_notice.html.erb
@@ -1,5 +1,5 @@
<% if order.backordered_variants.any? %>
- <div class="alert rounded border border-default text-sm p-5 mb-6">
+ <div class="alert rounded-sm border border-default text-sm p-5 mb-6">
<%= Spree.t("storefront.checkout.backorder_notice") %>
<ul class="list-disc list-inside flex-col flex space-y-1 mt-2">
<% order.backordered_variants.each do |variant| %>
diff --git a/storefront/app/views/spree/checkout/_line_item.html.erb b/storefront/app/views/spree/checkout/_line_item.html.erb
index 75d5edac97..687dfed31f 100644
--- a/storefront/app/views/spree/checkout/_line_item.html.erb
+++ b/storefront/app/views/spree/checkout/_line_item.html.erb
@@ -5,9 +5,9 @@
</span>
<% image = line_item.variant.default_image %>
<% if image.present? && image.attached? && image.variable? %>
- <%= spree_image_tag(image, class: 'rounded border border-default bg-transparent object-cover object-center', loading: :lazy, width: 64, height: 64) %>
+ <%= spree_image_tag(image, class: 'rounded-sm border border-default bg-transparent object-cover object-center', loading: :lazy, width: 64, height: 64) %>
<% else %>
- <div class="w-16 h-16 bg-accent border border-default rounded"></div>
+ <div class="w-16 h-16 bg-accent border border-default rounded-sm"></div>
<% end %>
</div>
<div class="flex-1 pr-3 text-sm">
diff --git a/storefront/app/views/spree/checkout/_missing_all_line_items.html.erb b/storefront/app/views/spree/checkout/_missing_all_line_items.html.erb
index 0ffd20d03e..4fa0815cb6 100644
--- a/storefront/app/views/spree/checkout/_missing_all_line_items.html.erb
+++ b/storefront/app/views/spree/checkout/_missing_all_line_items.html.erb
@@ -1,7 +1,7 @@
<div data-controller="modal" data-modal-opened-value="true" data-modal-allow-background-close="false">
<div data-modal-target="container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
<div class="max-h-screen w-full max-w-lg relative">
- <div class="m-1 bg-white rounded shadow">
+ <div class="m-1 bg-white rounded-sm shadow">
<div class="p-8">
<h2 class="text-xl mb-4"><%= Spree.t(:shipping_not_available) %></h2>
<p class="mb-4"><%= Spree.t('errors.messages.no_shipping_methods_available') %> </p>
diff --git a/storefront/app/views/spree/checkout/_missing_line_items.html.erb b/storefront/app/views/spree/checkout/_missing_line_items.html.erb
index 67a7bc48c4..929c58b9ee 100644
--- a/storefront/app/views/spree/checkout/_missing_line_items.html.erb
+++ b/storefront/app/views/spree/checkout/_missing_line_items.html.erb
@@ -1,7 +1,7 @@
<div data-controller="modal" data-modal-opened-value="true" data-modal-allow-background-close="false">
<div data-modal-target="container" data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard" class="hidden animated fadeIn fixed inset-0 overflow-y-auto flex items-center justify-center" style="z-index: 9999;">
<div class="max-h-screen w-full max-w-lg relative">
- <div class="m-1 bg-white rounded shadow">
+ <div class="m-1 bg-white rounded-sm shadow">
<div class="p-8">
<h2 class="text-xl mb-4"><%= Spree.t('storefront.checkout.shipping_not_available') %></h2>
<p class="mb-4">
diff --git a/storefront/app/views/themes/default/spree/orders/_line_item.html.erb b/storefront/app/views/themes/default/spree/orders/_line_item.html.erb
index 079cda20b1..9c6be01d5d 100644
--- a/storefront/app/views/themes/default/spree/orders/_line_item.html.erb
+++ b/storefront/app/views/themes/default/spree/orders/_line_item.html.erb
@@ -1,7 +1,7 @@
<%= turbo_frame_tag dom_id(line_item) do %>
<li class="cart-line-item flex items-top py-6 px-4 w-full">
<div class="line-item-overlay"></div>
- <div class="cart-product-image flex-shrink-0" id="<%= dom_id(line_item) %>-image" data-turbo-permanent>
+ <div class="cart-product-image shrink-0" id="<%= dom_id(line_item) %>-image" data-turbo-permanent>
<% image = line_item.variant.default_image %>
<% if image.present? && image.attached? && image.variable? %>
<%= link_to spree_storefront_resource_url(line_item.product), data: { 'turbo-frame': '_top' } do %>
diff --git a/storefront/app/views/themes/default/spree/page_sections/_featured_taxon.html.erb b/storefront/app/views/themes/default/spree/page_sections/_featured_taxon.html.erb
index cb3cb5c414..c9eeb26e31 100644
--- a/storefront/app/views/themes/default/spree/page_sections/_featured_taxon.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/_featured_taxon.html.erb
@@ -68,18 +68,18 @@
<div class='grid gap-4 md:gap-6 grid-cols-8 md:grid-cols-5'>
<div class='col-span-6 md:col-span-2'>
<div class='aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm'></div>
</div>
<div class='col-span-2 flex flex-col h-full overflow-hidden'>
<div class='h-full md:aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded shrink-0'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded shrink-0'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm shrink-0'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm shrink-0'></div>
</div>
<div class='hidden md:block'>
<div class='aspect-[1/2] bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm'></div>
</div>
</div>
<div class='md:flex <%= section.preferred_show_more_button ? "justify-between" : "justify-end" %> items-end'>
@@ -90,23 +90,23 @@
<div class='grid gap-4 md:gap-6 grid-cols-8 relative'>
<div class='col-span-6 md:col-span-2'>
<div class='aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm'></div>
</div>
<div class='col-span-2 md:col-span-2 flex flex-col'>
<div class='aspect-[1/3] md:aspect-1 bg-accent w-full flex-1'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm'></div>
</div>
<div class='col-span-2 hidden md:block'>
<div class='aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm'></div>
</div>
<div class='col-span-2 hidden md:block'>
<div class='aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm'></div>
</div>
</div>
<div class="md:hidden w-full block rounded-button bg-accent h-12 mt-8"></div>
diff --git a/storefront/app/views/themes/default/spree/page_sections/_header.html.erb b/storefront/app/views/themes/default/spree/page_sections/_header.html.erb
index 9845e56aff..e09318eb23 100644
--- a/storefront/app/views/themes/default/spree/page_sections/_header.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/_header.html.erb
@@ -143,7 +143,7 @@
aria-modal='true'
>
<div
- class='flex justify-between flex-col lg:hidden w-full transition-transform translate-x-[-50%] has-[.currency-and-locale-modal:not(.hidden)]:transform-none body header--mobile-menu'
+ class='flex justify-between flex-col lg:hidden w-full transition-transform has-[.currency-and-locale-modal:not(.hidden)]:transform-none body header--mobile-menu'
data-toggle-menu-target='content'
style='background-color: <%= section.preferred_background_color %>; height: calc(100dvh - 58px - 36px);'
>
diff --git a/storefront/app/views/themes/default/spree/page_sections/_video.html.erb b/storefront/app/views/themes/default/spree/page_sections/_video.html.erb
index 0ced706206..ea88db6c31 100644
--- a/storefront/app/views/themes/default/spree/page_sections/_video.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/_video.html.erb
@@ -14,7 +14,7 @@
<% if section.video_embed.present? %>
<div class="<%= 'lg:col-span-5' if separated_vertically %>">
- <div class="mx-auto <%= 'lg:mr-0' if separated_vertically %> rounded overflow-hidden">
+ <div class="mx-auto <%= 'lg:mr-0' if separated_vertically %> rounded-sm overflow-hidden">
<div class="video-embed-container">
<%= section.video_embed.raw_html.html_safe %>
</div>
diff --git a/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb b/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb
index 0beaf93791..39d9302a80 100644
--- a/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb
@@ -1,6 +1,6 @@
<div class="bg-background border-default border-t overflow-x-hidden h-full w-screen overflow-y-hidden">
<div class="h-full flex transform has-[.currency-and-locale-modal:not(.hidden)]:transform-none relative transition-transform duration-300" data-controller="mobile-nav">
- <div class="w-screen shrink-0 flex flex-col h-full flex-grow-0">
+ <div class="w-screen shrink-0 flex flex-col h-full grow-0">
<div class="flex-grow overflow-y-scroll">
<% if section.blocks.any? %>
<% section.blocks.each do |block| %>
diff --git a/storefront/app/views/themes/default/spree/products/_filters.html.erb b/storefront/app/views/themes/default/spree/products/_filters.html.erb
index 4cdb9ff067..235e251ea8 100644
--- a/storefront/app/views/themes/default/spree/products/_filters.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_filters.html.erb
@@ -2,10 +2,10 @@
id="slideover-filters"
data-slideover-target="menu"
class="sidebar-pane relative flex-1 !flex flex-col w-full pt-4 bg-background md:border-r border-default transition duration-300 -translate-x-full">
- <div class="flex-shrink-0 flex items-center justify-between pb-4 px-4 border-b border-default">
+ <div class="shrink-0 flex items-center justify-between pb-4 px-4 border-b border-default">
<span class="text-xl uppercase font-medium"><%= Spree.t(:filter) %></span>
<%= button_tag type: 'button',
- class: "flex items-center justify-center rounded-full focus:outline-none focus:bg-background",
+ class: "flex items-center justify-center rounded-full focus:outline-hidden focus:bg-background",
aria: { label: Spree.t(:close_sidebar) },
data: { action: "slideover#toggle" } do %>
<%= render 'spree/shared/icons/cross' %>
diff --git a/storefront/app/views/themes/default/spree/products/_media_gallery.html.erb b/storefront/app/views/themes/default/spree/products/_media_gallery.html.erb
index e78e8a463a..a408eba382 100644
--- a/storefront/app/views/themes/default/spree/products/_media_gallery.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_media_gallery.html.erb
@@ -6,17 +6,17 @@
class="media-gallery w-full h-full media-gallery-desktop"
id="media-gallery-<%= product.id %>-desktop"
data-controller="lightbox pdp-desktop-gallery">
- <div class="grid grid-cols-[6.5rem,_1fr] grid-rows-1 gap-2 w-full media-gallery-desktop__wrapper">
- <div class="flex flex-col h-full w-full aspect-1 overflow-hidden">
+ <div class="grid grid-cols-[6.5rem_1fr] grid-rows-1 gap-2 w-full media-gallery-desktop__wrapper">
+ <div class="flex flex-col h-full overflow-hidden">
<%= button_tag class: "w-full bg-background py-2 flex justify-center items-center disabled:opacity-50 media-gallery-desktop-arrow", data: { pdp_desktop_gallery_target: "prevArrow" } do %>
<span class="rotate-180">
<%= render 'spree/shared/icons/chevron_down' %>
</span>
<% end %>
- <div class="swiper h-full w-full block" data-pdp-desktop-gallery-target="imagesThumbsSlider">
- <div class="swiper-wrapper w-full h-full block">
+ <div class="swiper h-full block" data-pdp-desktop-gallery-target="imagesThumbsSlider">
+ <div class="swiper-wrapper h-full block">
<% images.each do |image| %>
- <div class="swiper-slide !h-min cursor-pointer w-full">
+ <div class="swiper-slide !h-min cursor-pointer">
<div
class="relative aspect-1 w-full block "
id="thumb-desktop-product-image-<%= image.id %>"
diff --git a/storefront/app/views/themes/default/spree/products/_metafields.html.erb b/storefront/app/views/themes/default/spree/products/_metafields.html.erb
index 40d82dd940..bcc92c6182 100644
--- a/storefront/app/views/themes/default/spree/products/_metafields.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_metafields.html.erb
@@ -6,7 +6,7 @@
<% next unless metafield.metafield_definition.available_on_front_end? %>
<details class="product-metafield border-b border-default group" id="metafield_<%= metafield.id %>">
- <summary class="text-sm uppercase tracking-widest inline-flex w-full justify-between items-center py-4 cursor-pointer focus:outline-none">
+ <summary class="text-sm uppercase tracking-widest inline-flex w-full justify-between items-center py-4 cursor-pointer focus:outline-hidden">
<span><%= metafield.name %></span>
<span class="ml-2 transition-transform group-open:rotate-180">
<%= render 'spree/shared/icons/chevron_down' %>
diff --git a/storefront/app/views/themes/default/spree/products/_product.html.erb b/storefront/app/views/themes/default/spree/products/_product.html.erb
index fdd8325f38..8646dfc1a1 100644
--- a/storefront/app/views/themes/default/spree/products/_product.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_product.html.erb
@@ -34,7 +34,7 @@
<%= product.name %>
<% else %>
<div class="grid grid-cols-3 gap-4">
- <div class="h-5 bg-accent rounded col-span-2"></div>
+ <div class="h-5 bg-accent rounded-sm col-span-2"></div>
</div>
<% end %>
</h3>
@@ -49,7 +49,7 @@
</div>
<% else %>
<div class="mt-2 grid grid-cols-3 gap-4">
- <div class="h-7 bg-accent rounded col-span-1"></div>
+ <div class="h-7 bg-accent rounded-sm col-span-1"></div>
</div>
<% end %>
</div>
diff --git a/storefront/app/views/themes/default/spree/products/_sort.html.erb b/storefront/app/views/themes/default/spree/products/_sort.html.erb
index a7122b13b5..f0d65e2ca4 100644
--- a/storefront/app/views/themes/default/spree/products/_sort.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_sort.html.erb
@@ -31,7 +31,7 @@
class: 'hidden',
data: { action: 'change->auto-submit#submit' },
checked: option[:value] == products_sort %>
- <%= f.label "sort-#{option[:value]}", class: 'text-sm cursor-pointer flex items-center justify-between px-4 py-2.5 hover:bg-accent focus:outline-none focus:bg-accent transition ease-in-out' do %>
+ <%= f.label "sort-#{option[:value]}", class: 'text-sm cursor-pointer flex items-center justify-between px-4 py-2.5 hover:bg-accent focus:outline-hidden focus:bg-accent transition ease-in-out' do %>
<%= option[:name] %>
<% if option[:value] == products_sort %>
<%= render 'spree/shared/icons/check' %>
diff --git a/storefront/app/views/themes/default/spree/products/_swiper.html.erb b/storefront/app/views/themes/default/spree/products/_swiper.html.erb
index bf006841dd..bc7bef3ad2 100644
--- a/storefront/app/views/themes/default/spree/products/_swiper.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_swiper.html.erb
@@ -75,10 +75,10 @@
<% end %>
</div>
</div>
- <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent left-0 disabled:hidden hover:border-primary ml-2 lg:ml-0 swiper-custom-button-prev-#{section.id} block #{arrows_on_top ? '' : 'md:hidden'} top-[--top] lg:top-[--desktop-top]", aria: { hidden: true }, style: "--top: calc(#{theme_setting('product_listing_image_height_mobile')}px/2); --desktop-top: calc(#{theme_setting('product_listing_image_height')}px/2); transform: translate(-50%, -50%);" do %>
+ <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent left-0 disabled:hidden hover:border-primary ml-2 lg:ml-0 swiper-custom-button-prev-#{section.id} block #{arrows_on_top ? '' : 'md:hidden'} top-(--top) lg:top-(--desktop-top)", aria: { hidden: true }, style: "--top: calc(#{theme_setting('product_listing_image_height_mobile')}px/2); --desktop-top: calc(#{theme_setting('product_listing_image_height')}px/2); transform: translate(-50%, -50%);" do %>
<%= render 'spree/shared/icons/chevron' %>
<% end %>
- <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent right-0 disabled:hidden hover:border-primary mr-2 lg:mr-0 swiper-custom-button-next-#{section.id} block #{arrows_on_top ? '' : 'md:hidden'} top-[--top] lg:top-[--desktop-top]", aria: { hidden: true }, style: "--top: calc(#{theme_setting('product_listing_image_height_mobile')}px/2); --desktop-top: calc(#{theme_setting('product_listing_image_height')}px/2); transform: translate(50%, -50%);" do %>
+ <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent right-0 disabled:hidden hover:border-primary mr-2 lg:mr-0 swiper-custom-button-next-#{section.id} block #{arrows_on_top ? '' : 'md:hidden'} top-(--top) lg:top-(--desktop-top)", aria: { hidden: true }, style: "--top: calc(#{theme_setting('product_listing_image_height_mobile')}px/2); --desktop-top: calc(#{theme_setting('product_listing_image_height')}px/2); transform: translate(50%, -50%);" do %>
<%= render 'spree/shared/icons/chevron_right' %>
<% end %>
</div>
diff --git a/storefront/app/views/themes/default/spree/products/_variant_options.html.erb b/storefront/app/views/themes/default/spree/products/_variant_options.html.erb
index 12ac864c98..8affc56925 100644
--- a/storefront/app/views/themes/default/spree/products/_variant_options.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_variant_options.html.erb
@@ -60,7 +60,7 @@
%>
<label
for='product-option-<%= product.id %>-<%= position %>-<%= index %>'
- class='text-sm cursor-pointer flex items-center justify-between px-4 py-2.5 hover:bg-accent focus:outline-none focus:bg-accent transition duration-150 ease-in-out <%= option_disabled ? "opacity-50 cursor-not-allowed" : "hover:bg-accent" %>'
+ class='text-sm cursor-pointer flex items-center justify-between px-4 py-2.5 hover:bg-accent focus:outline-hidden focus:bg-accent transition duration-150 ease-in-out <%= option_disabled ? "opacity-50 cursor-not-allowed" : "hover:bg-accent" %>'
>
<p><%=h value.presentation %></p>
<% if selected_option == value %>
diff --git a/storefront/app/views/themes/default/spree/products/filters/_availability.html.erb b/storefront/app/views/themes/default/spree/products/filters/_availability.html.erb
index e1824b0938..6afac0625e 100644
--- a/storefront/app/views/themes/default/spree/products/filters/_availability.html.erb
+++ b/storefront/app/views/themes/default/spree/products/filters/_availability.html.erb
@@ -3,7 +3,7 @@
data-controller='accordion'
data-accordion-close-others-value="false">
<% availability_filter_opened = permitted_products_params.dig(:filter, :purchasable).present? || permitted_products_params.dig(:filter, :out_of_stock).present? %>
- <%= link_to "#availability_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if availability_filter_opened}", data: { action: 'accordion#toggle:prevent' } do %>
+ <%= link_to "#availability_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-hidden transition duration-150 ease-in-out #{'st-accordion__icon--opened' if availability_filter_opened}", data: { action: 'accordion#toggle:prevent' } do %>
<%= Spree.t(:availability).capitalize %>
<%= render 'spree/shared/icons/chevron_down' %>
<% end %>
diff --git a/storefront/app/views/themes/default/spree/products/filters/_colors.html.erb b/storefront/app/views/themes/default/spree/products/filters/_colors.html.erb
index 03b170f48e..9bb9b7f1b7 100644
--- a/storefront/app/views/themes/default/spree/products/filters/_colors.html.erb
+++ b/storefront/app/views/themes/default/spree/products/filters/_colors.html.erb
@@ -2,7 +2,7 @@
<% if filter_values.any? %>
<div class="st-accordion" data-controller='accordion' data-accordion-close-others-value="false">
- <%= link_to "#colors_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if params.dig(:filter, :options, :color).present?}", data: { action: 'accordion#toggle:prevent' } do %>
+ <%= link_to "#colors_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-hidden transition duration-150 ease-in-out #{'st-accordion__icon--opened' if params.dig(:filter, :options, :color).present?}", data: { action: 'accordion#toggle:prevent' } do %>
<%= filter.presentation %>
<%= render 'spree/shared/icons/chevron_down' %>
<% end %>
diff --git a/storefront/app/views/themes/default/spree/products/filters/_generic.html.erb b/storefront/app/views/themes/default/spree/products/filters/_generic.html.erb
index 94458c6375..c4adcbc680 100644
--- a/storefront/app/views/themes/default/spree/products/filters/_generic.html.erb
+++ b/storefront/app/views/themes/default/spree/products/filters/_generic.html.erb
@@ -5,7 +5,7 @@
class="st-accordion"
data-controller="accordion"
data-accordion-close-others-value="false">
- <%= link_to "##{filter.id}", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if permitted_products_params.dig(:filter, :options, filter.name).present?}", data: { action: 'accordion#toggle:prevent' } do %>
+ <%= link_to "##{filter.id}", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-hidden transition duration-150 ease-in-out #{'st-accordion__icon--opened' if permitted_products_params.dig(:filter, :options, filter.name).present?}", data: { action: 'accordion#toggle:prevent' } do %>
<%= filter.presentation %>
<%= render 'spree/shared/icons/chevron_down' %>
<% end %>
diff --git a/storefront/app/views/themes/default/spree/products/filters/_price.html.erb b/storefront/app/views/themes/default/spree/products/filters/_price.html.erb
index a07e15a255..3a5783c69e 100644
--- a/storefront/app/views/themes/default/spree/products/filters/_price.html.erb
+++ b/storefront/app/views/themes/default/spree/products/filters/_price.html.erb
@@ -2,7 +2,7 @@
class="st-accordion"
data-controller='accordion'
data-accordion-close-others-value="false">
- <%= link_to "#price_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if params.dig(:filter, :min_price).present? || params.dig(:filter, :max_price).present?}", data: { action: 'accordion#toggle:prevent' } do %>
+ <%= link_to "#price_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-hidden transition duration-150 ease-in-out #{'st-accordion__icon--opened' if params.dig(:filter, :min_price).present? || params.dig(:filter, :max_price).present?}", data: { action: 'accordion#toggle:prevent' } do %>
<%=Spree.t(:price) %>
<%= render 'spree/shared/icons/chevron_down' %>
<% end %>
diff --git a/storefront/app/views/themes/default/spree/search/_suggestions.html.erb b/storefront/app/views/themes/default/spree/search/_suggestions.html.erb
index 187acf3ade..e484e965b1 100644
--- a/storefront/app/views/themes/default/spree/search/_suggestions.html.erb
+++ b/storefront/app/views/themes/default/spree/search/_suggestions.html.erb
@@ -26,7 +26,7 @@
<div class="fixed md:sticky py-6 px-4 bottom-0 left-0 bg-accent w-full z-[60]">
<%= link_to spree.search_path(q: query), class: "btn-primary text-center uppercase flex items-baseline justify-center" do %>
<span class="whitespace-nowrap"><%= Spree.t(:search_all) %> "</span>
- <span class="whitespace-nowrap overflow-ellipsis w-min max-w-[12ch] overflow-hidden inline"><%= query %></span>
+ <span class="whitespace-nowrap text-ellipsis w-min max-w-[12ch] overflow-hidden inline"><%= query %></span>
<span>"</span>
<% end %>
</div>
@@ -54,7 +54,7 @@
<div class="fixed md:relative md:col-span-2 lg:col-span-1 py-6 px-10 bottom-0 left-0 bg-accent w-full z-[60]">
<%= link_to spree.search_path(q: query), class: "btn-primary text-center uppercase flex items-baseline justify-center" do %>
<span class="whitespace-nowrap"><%= Spree.t(:search_all) %> "</span>
- <span class="whitespace-nowrap overflow-ellipsis w-min max-w-[12ch] overflow-hidden inline"><%= query %></span>
+ <span class="whitespace-nowrap text-ellipsis w-min max-w-[12ch] overflow-hidden inline"><%= query %></span>
<span>"</span>
<% end %>
</div>
@@ -71,18 +71,18 @@
<div class='grid gap-4 lg:gap-6 grid-cols-8 lg:grid-cols-12'>
<div class='col-span-6 lg:col-span-4'>
<div class='aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm'></div>
</div>
<div class='col-span-2 lg:col-span-4 flex flex-col h-full overflow-hidden'>
<div class='h-full lg:aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded shrink-0'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded shrink-0'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm shrink-0'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm shrink-0'></div>
</div>
<div class='hidden col-span-2 lg:col-span-4 lg:flex flex-col h-full overflow-hidden'>
<div class='h-full lg:aspect-1 bg-accent w-full'></div>
- <div class='h-6 mt-2 w-32 bg-accent rounded shrink-0'></div>
- <div class='h-8 mt-2 w-16 bg-accent rounded shrink-0'></div>
+ <div class='h-6 mt-2 w-32 bg-accent rounded-sm shrink-0'></div>
+ <div class='h-8 mt-2 w-16 bg-accent rounded-sm shrink-0'></div>
</div>
</div>
</div>
diff --git a/storefront/app/views/themes/default/spree/settings/show.html.erb b/storefront/app/views/themes/default/spree/settings/show.html.erb
index ce62df10b3..36f6308dab 100644
--- a/storefront/app/views/themes/default/spree/settings/show.html.erb
+++ b/storefront/app/views/themes/default/spree/settings/show.html.erb
@@ -2,7 +2,7 @@
<div
data-modal-target="container"
data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard"
- class="currency-and-locale-modal hidden fixed inset-0 overflow-y-auto flex items-end md:items-start justify-center z-[9999] h-dvh w-full"
+ class="currency-and-locale-modal hidden fixed inset-0 overflow-y-auto flex items-end md:items-start justify-center z-[9999] w-full"
style="animation-duration: 150ms;">
<div class="w-full lg:w-[600px] relative h-auto lg:max-h-screen flex justify-center flex-col gap-4 bg-background p-5 border border-default mt-12">
<button
diff --git a/storefront/app/views/themes/default/spree/shared/_account_pane.html.erb b/storefront/app/views/themes/default/spree/shared/_account_pane.html.erb
index 4ebc8e9343..e0f84708e2 100644
--- a/storefront/app/views/themes/default/spree/shared/_account_pane.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/_account_pane.html.erb
@@ -12,10 +12,10 @@
data-slideover-account-target='menu'
class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-text md:border-l border-default transition ease-in-out duration-300 translate-x-full'
>
- <div class='p-4 gap-4 flex-shrink-0 flex items-center justify-between border-b border-default z-50'>
+ <div class='p-4 gap-4 shrink-0 flex items-center justify-between border-b border-default z-50'>
<button
data-action='slideover-account#toggle'
- class='flex items-center justify-center rounded-full focus:outline-none focus:bg-background'
+ class='flex items-center justify-center rounded-full focus:outline-hidden focus:bg-background'
aria-label='Close account sidebar'
>
<%= render 'spree/shared/icons/cross' %>
diff --git a/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb b/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb
index e305e13977..b218f70813 100644
--- a/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb
@@ -15,11 +15,11 @@
data-slideover-target='menu'
class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-text md:border-l border-default transition ease-in-out duration-300 translate-x-full'
>
- <div class='p-4 gap-4 flex-shrink-0 flex items-center justify-between border-b border-default z-50'>
+ <div class='p-4 gap-4 shrink-0 flex items-center justify-between border-b border-default z-50'>
<%= button_tag(
type: 'button',
data: { action: 'slideover#toggle' },
- class: 'flex items-center justify-center rounded-full focus:outline-none focus:bg-background',
+ class: 'flex items-center justify-center rounded-full focus:outline-hidden focus:bg-background',
aria: { label: 'Close sidebar' }
) do %>
<%= render 'spree/shared/icons/close' %>
diff --git a/storefront/app/views/themes/default/spree/shared/_order_line_item.html.erb b/storefront/app/views/themes/default/spree/shared/_order_line_item.html.erb
index 9e8f23bf12..954dc7159f 100644
--- a/storefront/app/views/themes/default/spree/shared/_order_line_item.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/_order_line_item.html.erb
@@ -2,7 +2,7 @@
<div class="flex flex-col gap-4">
<div class="flex gap-4">
- <div class="flex-shrink-0">
+ <div class="shrink-0">
<% image = line_item.variant.default_image %>
<% if image.present? && image.attached? && image.variable? %>
<%= link_to spree_storefront_resource_url(line_item.product, relative: true) do %>
diff --git a/storefront/app/views/themes/default/spree/shared/_search.html.erb b/storefront/app/views/themes/default/spree/shared/_search.html.erb
index 5660388fa4..1388be6032 100644
--- a/storefront/app/views/themes/default/spree/shared/_search.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/_search.html.erb
@@ -15,7 +15,7 @@
<%= render 'spree/shared/icons/search' %>
<% end %>
- <%= text_field_tag :q, params[:q], class: 'p-2 lg:text-sm !leading-6 pl-10 !h-auto bg-accent w-full uppercase pr-14 focus:outline-none text-input', placeholder: Spree.t(:search), data: { search_suggestions_target: 'input', clear_input_target: 'input' } %>
+ <%= text_field_tag :q, params[:q], class: 'p-2 lg:text-sm !leading-6 pl-10 !h-auto bg-accent w-full uppercase pr-14 focus:outline-hidden text-input', placeholder: Spree.t(:search), data: { search_suggestions_target: 'input', clear_input_target: 'input' } %>
<%= button_tag class: 'hidden text-sm font-semibold absolute top-2 right-2 uppercase h-6 tracking-widest', data: { clear_input_target: 'button', action: 'click->clear-input#clear touch->clear-input#clear click->search-suggestions#clear touch->search-suggestions#clear' } do %>
<%= Spree.t(:clear) %>
<% end %>