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.

Storefront: fixed icons fill color (#12472)

Damian Legawiecfad0005da066
diff --git a/storefront/app/views/themes/default/spree/products/_add_to_cart_button.html.erb b/storefront/app/views/themes/default/spree/products/_add_to_cart_button.html.erb
index 3bee2ca623..fdb7b793a8 100644
--- a/storefront/app/views/themes/default/spree/products/_add_to_cart_button.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_add_to_cart_button.html.erb
@@ -26,10 +26,10 @@ variant_not_available = selected_variant.nil? ||
<span><%= Spree.t(:please_select_all_options) %></span>
<% elsif variant_not_available %>
<span><%= Spree.t(:notify_me_when_available) %></span>
- <%= render 'spree/shared/icons/bell', color: theme_setting('button_text_color') %>
+ <%= render 'spree/shared/icons/bell' %>
<% else %>
<span><%= Spree.t(:add_to_cart) %></span>
- <%= render 'spree/shared/icons/cart', color: theme_setting('button_text_color') %>
+ <%= render 'spree/shared/icons/cart' %>
<% end %>
<% end %>
</div>
@@ -48,10 +48,10 @@ variant_not_available = selected_variant.nil? ||
<span><%= Spree.t(:please_select_all_options) %></span>
<% elsif variant_not_available %>
<span><%= Spree.t(:notify_me_when_available) %></span>
- <%= render 'spree/shared/icons/bell', color: theme_setting('button_text_color') %>
+ <%= render 'spree/shared/icons/bell' %>
<% else %>
<span><%= Spree.t(:add_to_cart) %></span>
- <%= render 'spree/shared/icons/cart', color: theme_setting('button_text_color') %>
+ <%= render 'spree/shared/icons/cart' %>
<% end %>
<% end %>
</div>
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 efd076a481..fb6fb5514b 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
@@ -23,7 +23,7 @@
<% end %>
<span class='text-xl font-medium uppercase leading-loose'><%= Spree.t(:cart) %></span>
<span class='relative block w-6'>
- <%= render 'spree/shared/icons/cart', color: theme_setting('text_color') %>
+ <%= render 'spree/shared/icons/cart' %>
<span class='cart-counter w-full text-[8px] font-extrabold absolute top-[10px] text-center'>
<%= current_order.item_count if current_order.present? && current_order.item_count.to_i > 0 %>
</span>
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_account.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_account.html.erb
index d04286b3ac..60ac2964a8 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_account.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_account.html.erb
@@ -1,5 +1,3 @@
-<% color ||= theme_setting('text_color') %>
-
<svg
xmlns='http://www.w3.org/2000/svg'
width='25'
@@ -8,8 +6,8 @@
fill='none'
>
<g clip-path="url(#clip0_440_247)">
- <circle cx="12.5" cy="5" r="4.25" stroke="<%= color %>" stroke-width="1.5"/>
- <path d="M23.5 23C23.5 16.9249 18.5751 12 12.5 12C6.42487 12 1.5 16.9249 1.5 23" stroke="<%= color %>" stroke-width="1.5"/>
+ <circle cx="12.5" cy="5" r="4.25" stroke="currentColor" stroke-width="1.5"/>
+ <path d="M23.5 23C23.5 16.9249 18.5751 12 12.5 12C6.42487 12 1.5 16.9249 1.5 23" stroke="currentColor" stroke-width="1.5"/>
</g>
<defs>
<clipPath id="clip0_440_247">
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_bell.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_bell.html.erb
index f063e86ca3..871c3d768e 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_bell.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_bell.html.erb
@@ -1,4 +1,3 @@
-<% color ||= section&.text_color || theme_setting('text_color') %>
<svg
width="25"
height="24"
@@ -7,4 +6,4 @@
fill-rule="evenodd"
clip-rule="evenodd"
d="M11.25 3.367a6.749 6.749 0 0 1 2.5 0V3a1.25 1.25 0 0 0-2.5 0v.367Zm4 .469V3a2.75 2.75 0 0 0-5.5 0v.836a6.748 6.748 0 0 0-4 6.164c0 3.39-.726 5.514-1.409 6.766a6.184 6.184 0 0 1-.917 1.296 3.254 3.254 0 0 1-.339.312l-.009.007.002-.001.002-.002h.002v-.001l.002.002.415 1.371h4.31a4.75 4.75 0 0 0 9.38 0h4.31l.415-1.371.002-.002h.001l.002.001.002.002h.002l-.01-.006a3.254 3.254 0 0 1-.338-.312 6.185 6.185 0 0 1-.917-1.296c-.683-1.252-1.409-3.376-1.409-6.766a6.75 6.75 0 0 0-4-6.164ZM10.2 21.298a3.25 3.25 0 0 1-.864-1.548h6.325a3.25 3.25 0 0 1-5.46 1.548Zm9.608-3.048a8.77 8.77 0 0 1-.468-.766c-.817-1.498-1.592-3.874-1.592-7.484a5.25 5.25 0 1 0-10.5 0c0 3.61-.774 5.986-1.591 7.484a8.77 8.77 0 0 1-.469.766h14.62Z"
- fill="<%= color %>" /></svg>
+ fill="currentColor" /></svg>
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_cart.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_cart.html.erb
index 87e19366db..63c39ef7e1 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_cart.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_cart.html.erb
@@ -1,5 +1,3 @@
-<% color ||= theme_setting('text_color') %>
-
<svg
xmlns='http://www.w3.org/2000/svg'
width='24'
@@ -7,6 +5,6 @@
viewBox='0 0 24 24'
fill='none'
>
- <path d="M1.84725 22.25L3.49725 8.75H20.5028L22.1528 22.25H12H1.84725Z" stroke="<%= color %>" stroke-width="1.5" />
- <path d="M16 11V5C16 2.79086 14.2091 1 12 1V1C9.79086 1 8 2.79086 8 5V11" stroke="<%= color %>" stroke-width="1.5" />
+ <path d="M1.84725 22.25L3.49725 8.75H20.5028L22.1528 22.25H12H1.84725Z" stroke="currentColor" stroke-width="1.5" />
+ <path d="M16 11V5C16 2.79086 14.2091 1 12 1V1C9.79086 1 8 2.79086 8 5V11" stroke="currentColor" stroke-width="1.5" />
</svg>
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_close.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_close.html.erb
index 400c8d0f5b..330afc85eb 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_close.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_close.html.erb
@@ -1,5 +1,3 @@
-<% color ||= 'black' %>
-
<svg
xmlns='http://www.w3.org/2000/svg'
width='24'
@@ -7,5 +5,5 @@
viewBox='0 0 24 24'
fill='none'
>
- <path d="M3.00029 3L21 20.9688M3 21L20.9997 3.03115" stroke="<%= color %>" stroke-width="1.5"/>
+ <path d="M3.00029 3L21 20.9688M3 21L20.9997 3.03115" stroke="currentColor" stroke-width="1.5"/>
</svg>
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_delivery.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_delivery.html.erb
index ff3a147061..df268ac0f6 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_delivery.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_delivery.html.erb
@@ -1,7 +1,5 @@
-<% color ||= theme_setting('text_color') %>
-
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
- <path d="M0.5 3H9M15 19H16M15 19H9M15 19V13M15 7H19L23 13M23 13V19H20M23 13H15M5 19H1V11H4M0.5 7H7.5M12 3H15V13" stroke="<%= color %>" stroke-width="1.5"/>
- <circle cx="18" cy="19" r="2.25" stroke="<%= color %>" stroke-width="1.5"/>
- <circle cx="7" cy="19" r="2.25" stroke="<%= color %>" stroke-width="1.5"/>
+ <path d="M0.5 3H9M15 19H16M15 19H9M15 19V13M15 7H19L23 13M23 13V19H20M23 13H15M5 19H1V11H4M0.5 7H7.5M12 3H15V13" stroke="currentColor" stroke-width="1.5"/>
+ <circle cx="18" cy="19" r="2.25" stroke="currentColor" stroke-width="1.5"/>
+ <circle cx="7" cy="19" r="2.25" stroke="currentColor" stroke-width="1.5"/>
</svg>
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_menu.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_menu.html.erb
index f1c0035173..232125a405 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_menu.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_menu.html.erb
@@ -1,5 +1,3 @@
-<% color ||= theme_setting('text_color') %>
-
<svg
xmlns='http://www.w3.org/2000/svg'
width='24'
@@ -7,6 +5,6 @@
viewBox='0 0 24 24'
fill='none'
>
- <path d="M0 6H24" stroke="<%= color %>" stroke-width="1.5"/>
- <path d="M0 18H24" stroke="<%= color %>" stroke-width="1.5"/>
+ <path d="M0 6H24" stroke="currentColor" stroke-width="1.5"/>
+ <path d="M0 18H24" stroke="currentColor" stroke-width="1.5"/>
</svg>
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_return.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_return.html.erb
index 5c1a30e11e..9a97bc1dc8 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_return.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_return.html.erb
@@ -1,8 +1,7 @@
-<% color ||= 'currentColor' %>
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
<g clip-path="url(#clip0_5241_28433)">
- <path d="M1 12C1 18.0751 5.92487 23 12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C8.57603 1 5.51745 2.56438 3.5 5.01738M3.5 5.01738L7 5M3.5 5.01738L3.5 1.5" stroke="<%= color %>" stroke-width="1.5"></path>
- <path d="M12 11V17M12 11L17 9M12 11L7 9M12 17L17 15V9M12 17L7 15V9M17 9L12 7L7 9" stroke="<%= color %>" stroke-width="1.5"></path>
+ <path d="M1 12C1 18.0751 5.92487 23 12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C8.57603 1 5.51745 2.56438 3.5 5.01738M3.5 5.01738L7 5M3.5 5.01738L3.5 1.5" stroke="currentColor" stroke-width="1.5"></path>
+ <path d="M12 11V17M12 11L17 9M12 11L7 9M12 17L17 15V9M12 17L7 15V9M17 9L12 7L7 9" stroke="currentColor" stroke-width="1.5"></path>
</g>
<defs>
<clipPath id="clip0_5241_28433">
diff --git a/storefront/app/views/themes/default/spree/shared/icons/_search.html.erb b/storefront/app/views/themes/default/spree/shared/icons/_search.html.erb
index 2540ec2666..e3e2643b26 100644
--- a/storefront/app/views/themes/default/spree/shared/icons/_search.html.erb
+++ b/storefront/app/views/themes/default/spree/shared/icons/_search.html.erb
@@ -1,5 +1,3 @@
-<% color ||= 'currentColor' %>
-
<svg
xmlns='http://www.w3.org/2000/svg'
width='24'
@@ -10,10 +8,10 @@
cx="10.5"
cy="10.5"
r="8.75"
- stroke="<%= color %>"
+ stroke="currentColor"
stroke-width="1.5" />
<path
d="M23 23L17 17"
- stroke="<%= color %>"
+ stroke="currentColor"
stroke-width="1.5" />
</svg>