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.

Fix: revert storefront changes accidently performed via admin tailwind migration

Damian Legawiec5a0f14085ad8
diff --git a/storefront/app/helpers/spree/checkout_helper.rb b/storefront/app/helpers/spree/checkout_helper.rb
index b23f49cec4..2cc3ac39d5 100644
--- a/storefront/app/helpers/spree/checkout_helper.rb
+++ b/storefront/app/helpers/spree/checkout_helper.rb
@@ -21,10 +21,10 @@ module Spree
end
text = link_to(link_content, link_url)
- css_classes << 'text-zinc-950'
+ css_classes << 'text-primary'
content_tag('li', text, class: css_classes.join(' '))
else
- content_tag('li', text, class: "breadcrumb-item #{state == @order.state ? 'font-bold' : 'text-gray-950'}")
+ content_tag('li', text, class: "breadcrumb-item #{state == @order.state ? 'font-bold' : 'text-text'}")
end
end
content_tag('ol', raw(items.join("\n")), class: 'breadcrumb flex items-center py-6 gap-2', id: "checkout-step-#{@order.state}")
diff --git a/storefront/app/views/devise/sessions/new.html.erb b/storefront/app/views/devise/sessions/new.html.erb
index 5986d06d0a..887bdc31f9 100644
--- a/storefront/app/views/devise/sessions/new.html.erb
+++ b/storefront/app/views/devise/sessions/new.html.erb
@@ -33,7 +33,7 @@
</div>
<div class="flex flex-col items-center gap-4">
- <p class="text-sm text-gray-600"><%= Spree.t(:continue_without_logging_in) %></p>
+ <p class="text-sm text-muted"><%= Spree.t(:continue_without_logging_in) %></p>
<%= link_to Spree.t(:continue_as_guest), spree.checkout_path(current_order.token, guest: true), class: 'btn btn-secondary w-full max-w-sm', data: { turbo: false } %>
</div>
<% end %>
diff --git a/storefront/app/views/layouts/spree/checkout.html.erb b/storefront/app/views/layouts/spree/checkout.html.erb
index 7fc0825147..dba0143f0c 100644
--- a/storefront/app/views/layouts/spree/checkout.html.erb
+++ b/storefront/app/views/layouts/spree/checkout.html.erb
@@ -8,13 +8,13 @@
<%= render 'spree/shared/head' %>
<%= render 'spree/shared/custom_head' %>
</head>
- <body id="checkout-page" class="theme-<%= current_theme.class.name.demodulize.underscore %> w-full bg-background text-gray-950">
+ <body id="checkout-page" class="theme-<%= current_theme.class.name.demodulize.underscore %> w-full bg-background text-text">
<%= render_storefront_partials(:body_start_partials) %>
<%= current_store.storefront_custom_code_body_start&.html_safe %>
<div id="overlay" class="overlay"></div>
- <div class="w-full min-h-screen text-gray-600 bg-background" id="checkout-container">
+ <div class="w-full min-h-screen text-muted bg-background" id="checkout-container">
<header
class="checkout-mobile-header lg:hidden relative z-[999] bg-background tailwind-container text-center py-3 mx-auto"
id="checkout-mobile-header"
diff --git a/storefront/app/views/layouts/spree/password.html.erb b/storefront/app/views/layouts/spree/password.html.erb
index c9a013f94f..0388e8b235 100644
--- a/storefront/app/views/layouts/spree/password.html.erb
+++ b/storefront/app/views/layouts/spree/password.html.erb
@@ -5,7 +5,7 @@
<%= render 'spree/shared/custom_head' %>
<%= current_store.storefront_custom_code_head&.html_safe %>
</head>
- <body class="bg-background w-full text-gray-950">
+ <body class="bg-background w-full text-text">
<%= render_storefront_partials(:body_start_partials) %>
<%= current_store.storefront_custom_code_body_start&.html_safe %>
diff --git a/storefront/app/views/layouts/spree/storefront.html.erb b/storefront/app/views/layouts/spree/storefront.html.erb
index 1cda11970f..659b13b2fd 100644
--- a/storefront/app/views/layouts/spree/storefront.html.erb
+++ b/storefront/app/views/layouts/spree/storefront.html.erb
@@ -6,7 +6,7 @@
<%= render 'spree/shared/json_ld' %>
<%= current_store.storefront_custom_code_head&.html_safe %>
</head>
- <body class="theme-<%= current_theme.class.name.demodulize.underscore %> bg-background w-full text-gray-950 <%= current_page&.slug %>-page <% if current_theme_preview.present? %>inside-page-builder<% end %>">
+ <body class="theme-<%= current_theme.class.name.demodulize.underscore %> bg-background w-full text-text <%= current_page&.slug %>-page <% if current_theme_preview.present? %>inside-page-builder<% end %>">
<%= render_storefront_partials(:body_start_partials) %>
<%= current_store.storefront_custom_code_body_start&.html_safe %>
diff --git a/storefront/app/views/spree/checkout/_address.html.erb b/storefront/app/views/spree/checkout/_address.html.erb
index ebd1ac7158..af52158251 100644
--- a/storefront/app/views/spree/checkout/_address.html.erb
+++ b/storefront/app/views/spree/checkout/_address.html.erb
@@ -73,8 +73,8 @@
</h5>
<% if !already_have_an_account? && defined?(spree_login_path) %>
<div class="lg:text-right">
- <span class="text-gray-600 text-sm">
- <%= Spree.t('storefront.checkout.already_have_an_account') %> <span class="text-zinc-950"><%= link_to Spree.t(:login), spree_login_path, data: { turbo_frame: '_top' } %></span>
+ <span class="text-muted text-sm">
+ <%= Spree.t('storefront.checkout.already_have_an_account') %> <span class="text-primary"><%= link_to Spree.t(:login), spree_login_path, data: { turbo_frame: '_top' } %></span>
</span>
</div>
<% end %>
@@ -104,7 +104,7 @@
<% unless try_spree_current_user %>
<% if already_have_an_account? %>
<div class="py-2 text-sm">
- <%= Spree.t("storefront.checkout.it_seems_you_already_have_an_account_html", link: link_to(Spree.t(:login), spree_login_path, class: 'text-zinc-950 font-semibold')) %>
+ <%= Spree.t("storefront.checkout.it_seems_you_already_have_an_account_html", link: link_to(Spree.t(:login), spree_login_path, class: 'text-primary font-semibold')) %>
</div>
<% end %>
<% end %>
diff --git a/storefront/app/views/spree/checkout/_coupon_code.html.erb b/storefront/app/views/spree/checkout/_coupon_code.html.erb
index 0b2ea5949c..afe6f6de8f 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-sm bg-gray-200">
+ <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-border">
<%= 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-sm bg-gray-200">
+ <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-border">
<%= heroicon('gift', options: { class: 'h-4 w-4 mr-2' }) %>
<%= @order.gift_card.code.upcase %>
</span>
diff --git a/storefront/app/views/spree/checkout/_delivery_shipping_rate.html.erb b/storefront/app/views/spree/checkout/_delivery_shipping_rate.html.erb
index 3382326faf..3237221fcf 100644
--- a/storefront/app/views/spree/checkout/_delivery_shipping_rate.html.erb
+++ b/storefront/app/views/spree/checkout/_delivery_shipping_rate.html.erb
@@ -12,7 +12,7 @@
<label class="select-none cursor-pointer px-2 word-break w-full" for="<%= "shipping-rate-#{rate.id}" %>">
<%= rate.name %>
<% if rate.delivery_range %>
- <span class="text-gray-600 text-xs ml-3"><%= rate.display_delivery_range %></span>
+ <span class="text-muted text-xs ml-3"><%= rate.display_delivery_range %></span>
<% end %>
</label>
<span class="text-right">
diff --git a/storefront/app/views/spree/checkout/_payment_methods.html.erb b/storefront/app/views/spree/checkout/_payment_methods.html.erb
index e781cba748..dccc6890ab 100644
--- a/storefront/app/views/spree/checkout/_payment_methods.html.erb
+++ b/storefront/app/views/spree/checkout/_payment_methods.html.erb
@@ -11,7 +11,7 @@
<%= Spree.t('storefront.checkout.order_already_paid') %>
</p>
</div>
- <div class="flex justify-end w-full gap-2">
+ <div class="flex justify-end w-full">
<%= button_tag Spree.t(:place_order),
class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',
data: { 'turbo-submits-with': (render 'spree/checkout/button_processing', is_hidden: false) } %>
@@ -20,7 +20,7 @@
<h5 class="mb-3 font-body font-semibold">
<%= Spree.t(:payment) %>
</h5>
- <p class="text-gray-600 mb-3 text-neutral-600">
+ <p class="text-muted mb-3 text-neutral-600">
<%= Spree.t('storefront.checkout.all_transactions_are_secure_and_encrypted') %>
</p>
diff --git a/storefront/app/views/spree/checkout/_terms_and_conditions.html.erb b/storefront/app/views/spree/checkout/_terms_and_conditions.html.erb
index 8661e32dd7..0961d8be0b 100644
--- a/storefront/app/views/spree/checkout/_terms_and_conditions.html.erb
+++ b/storefront/app/views/spree/checkout/_terms_and_conditions.html.erb
@@ -1,5 +1,5 @@
<p id="payment-and-conditions" class="text-xs mt-2 mb-4">
<%= Spree.t('storefront.checkout.by_placing_this_order_you_agree_to') %>
- <%= link_to Spree.t(:terms_of_service), policy_path('terms_of_service'), target: :_blank, class: 'text-zinc-950' %><%= I18n.t('support.array.two_words_connector') %>
- <%= link_to Spree.t(:privacy_policy), policy_path('privacy_policy'), target: :_blank, class: 'text-zinc-950' %>.
+ <%= link_to Spree.t(:terms_of_service), policy_path('terms_of_service'), target: :_blank, class: 'text-primary' %><%= I18n.t('support.array.two_words_connector') %>
+ <%= link_to Spree.t(:privacy_policy), policy_path('privacy_policy'), target: :_blank, class: 'text-primary' %>.
</p>
\ No newline at end of file
diff --git a/storefront/app/views/themes/default/spree/checkout/complete.html.erb b/storefront/app/views/themes/default/spree/checkout/complete.html.erb
index bf85f66265..544b0812f2 100644
--- a/storefront/app/views/themes/default/spree/checkout/complete.html.erb
+++ b/storefront/app/views/themes/default/spree/checkout/complete.html.erb
@@ -1,4 +1,4 @@
-<div id="<%= dom_id(@order) %>" class="text-gray-600">
+<div id="<%= dom_id(@order) %>" class="text-muted">
<p class="text-sm mb-1 mt-3">
<%= Spree.t(:order) %> <strong><%= @order.number %></strong>
</p>
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 14348ade7f..5f71506f96 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
@@ -13,7 +13,7 @@
</div>
<div class="ml-3 w-full">
<div class="flex justify-between">
- <%= link_to line_item.name, spree_storefront_resource_url(line_item.product), class: 'font-semibold text-gray-950', data: { 'turbo-frame': '_top' } %>
+ <%= link_to line_item.name, spree_storefront_resource_url(line_item.product), class: 'font-semibold text-text', data: { 'turbo-frame': '_top' } %>
<%= form_for line_item, url: spree.line_item_url(line_item, order_token: line_item.order.token), method: :delete, data: { controller: 'turbo-stream-form' } do |item_form| %>
<%= button_tag type: :submit, class: 'remove-line-item-button', data: { action: "click->cart#disableCart turbo-stream-form:submit-end->cart#enableCart" } do %>
diff --git a/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erb b/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erb
index 702220c214..ae9acfc45d 100644
--- a/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erb
@@ -10,7 +10,7 @@
<div class="breadcrumb-square opacity-50 <%= 'hidden md:block' if index == taxons.length - 1 %>"></div>
<% end %>
- <li class="hidden lg:block text-gray-950 opacity-100"><%= @product.name %></li>
+ <li class="hidden lg:block text-text opacity-100"><%= @product.name %></li>
</ul>
<% end %>
</nav>
diff --git a/storefront/app/views/themes/default/spree/page_sections/_featured_taxons.html.erb b/storefront/app/views/themes/default/spree/page_sections/_featured_taxons.html.erb
index a2f56545a5..d97d889bd9 100644
--- a/storefront/app/views/themes/default/spree/page_sections/_featured_taxons.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/_featured_taxons.html.erb
@@ -14,11 +14,11 @@
<%= page_builder_link_to link, title: link.label, class: 'group block overflow-hidden', target: link.open_in_new_tab.presence && '_blank' do %>
<% if link.linkable.page_builder_image&.attached? && link.linkable.page_builder_image&.variable? %>
<div class="flex space-y-2 flex-col">
- <%= spree_image_tag(link.linkable.page_builder_image, height: 300, width: 300, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
+ <%= spree_image_tag(link.linkable.page_builder_image, height: 300, width: 300, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-border', loading: :lazy, alt: link.label) %>
<span><%= link.label %></span>
</div>
<% else %>
- <div class="aspect-1 w-full group-hover:bg-gray-100 bg-gray-200 rounded-md flex items-center justify-center relative">
+ <div class="aspect-1 w-full group-hover:bg-gray-100 bg-border rounded-md flex items-center justify-center relative">
<span><%= link.label %></span>
</div>
<% end %>
@@ -49,10 +49,10 @@
<%= page_builder_link_to link, title: link.label, class: 'group block overflow-hidden', target: link.open_in_new_tab.presence && '_blank' do %>
<% if link.linkable.page_builder_image.attached? %>
<div class="flex space-y-2 flex-col">
- <%= spree_image_tag(link.linkable.page_builder_image, height: 200, width: 200, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
+ <%= spree_image_tag(link.linkable.page_builder_image, height: 200, width: 200, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-border', loading: :lazy, alt: link.label) %>
</div>
<% else %>
- <div class="aspect-1 w-full group-hover:bg-gray-100 bg-gray-200 flex items-center justify-center relative">
+ <div class="aspect-1 w-full group-hover:bg-gray-100 bg-border flex items-center justify-center relative">
<span><%= link.label %></span>
</div>
<% end %>
diff --git a/storefront/app/views/themes/default/spree/page_sections/_footer.html.erb b/storefront/app/views/themes/default/spree/page_sections/_footer.html.erb
index cf352512aa..a114f881f1 100644
--- a/storefront/app/views/themes/default/spree/page_sections/_footer.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/_footer.html.erb
@@ -46,7 +46,7 @@
</div>
</div>
</div>
- <div class="flex justify-end w-full gap-2"></div>
+ <div class="flex justify-end w-full"></div>
</div>
</div>
<div class="text-sm" style="color: <%= section.preferred_copyright_text_color %>; background-color: <%= section.preferred_copyright_background_color %>">
diff --git a/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erb b/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erb
index af3a2eebcb..75873d8fc0 100644
--- a/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erb
+++ b/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erb
@@ -1,7 +1,7 @@
<% logo = section.logo || current_store.logo %>
<div style='<%= section_styles(section) %>'>
<div class="page-container">
- <div class="bg-background text-gray-950 flex flex-col items-center gap-2 md:flex-row justify-between">
+ <div class="bg-background text-text flex flex-col items-center gap-2 md:flex-row justify-between">
<% if logo&.attached? && logo.variable? %>
<%= render 'spree/shared/logo', logo: section.logo, height: section.preferred_desktop_logo_height %>
<% else %>
diff --git a/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erb b/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erb
index 6ed4ea4a98..8d88766a91 100644
--- a/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erb
@@ -6,7 +6,7 @@
<div class="breadcrumb-square opacity-50"></div>
<% end %>
- <li class="text-gray-950 opacity-100"><%= product.name %></li>
+ <li class="text-text opacity-100"><%= product.name %></li>
</ul>
<!-- mobile -->
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 afaf6fdd4b..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
@@ -10,7 +10,7 @@
<div
id='slideover-account'
data-slideover-account-target='menu'
- class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-gray-950 md:border-l border-default transition ease-in-out duration-300 translate-x-full'
+ 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 shrink-0 flex items-center justify-between border-b border-default z-50'>
<button
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 827921efe7..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
@@ -13,7 +13,7 @@
<div
id='slideover-cart'
data-slideover-target='menu'
- class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-gray-950 md:border-l border-default transition ease-in-out duration-300 translate-x-full'
+ 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 shrink-0 flex items-center justify-between border-b border-default z-50'>
<%= button_tag(
diff --git a/storefront/app/views/themes/default/spree/shared/_flash.html.erb b/storefront/app/views/themes/default/spree/shared/_flash.html.erb
index e63a990ed4..01ea403f1f 100644
--- a/storefront/app/views/themes/default/spree/shared/_flash.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/_flash.html.erb
@@ -2,7 +2,7 @@
<div class="pointer-events-none w-full">
<div data-controller="alert" data-alert-hide-class="translate-x-[500px] opacity-0" class="ease-in-out duration-500 w-full relative pointer-events-auto <%= tailwind_classes_for(key) %>">
<div class="p-2">
- <p class="text-sm lg:text-base font-medium text-center uppercase text-gray-950 flash-message">
+ <p class="text-sm lg:text-base font-medium text-center uppercase text-text flash-message">
<%= value %>
</p>
<button data-action="alert#close" class="absolute top-2 right-2 h-[22px] lg:h-6">
diff --git a/storefront/app/views/themes/default/spree/shared/_order_details.html.erb b/storefront/app/views/themes/default/spree/shared/_order_details.html.erb
index e709554628..3b48d336b7 100644
--- a/storefront/app/views/themes/default/spree/shared/_order_details.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/_order_details.html.erb
@@ -36,7 +36,7 @@
<% end %>
<div class="mt-6 bg-accent mb-24">
- <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-6 p-4 lg:p-6 text-sm bg-gray-200 bg-accent-100">
+ <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-6 p-4 lg:p-6 text-sm bg-border bg-accent-100">
<% if order.billing_address.present? %>
<!-- billing address -->
<div>