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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Correct Frontend view files with ERB lint.
Matthew Kennedydfaa71d73e8a
diff --git a/frontend/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb b/frontend/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erbindex 702b02b5d0..af8b57f656 100755--- a/frontend/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb+++ b/frontend/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.first? %><li class="first page-item"><%= link_to_unless current_page.first?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>diff --git a/frontend/app/views/kaminari/twitter-bootstrap-4/_gap.html.erb b/frontend/app/views/kaminari/twitter-bootstrap-4/_gap.html.erbindex de230de77c..a7f00c7d12 100755--- a/frontend/app/views/kaminari/twitter-bootstrap-4/_gap.html.erb+++ b/frontend/app/views/kaminari/twitter-bootstrap-4/_gap.html.erb@@ -3,8 +3,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<li class="page gap disabled page-item d-none d-lg-flex"><a href="#" onclick="return false;" class="page-link"><%= raw(t 'views.pagination.truncate') %>diff --git a/frontend/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb b/frontend/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erbindex 78f5416586..debec2d4b5 100755--- a/frontend/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb+++ b/frontend/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.last? %><li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %><%= link_to_unless current_page.last?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>diff --git a/frontend/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb b/frontend/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erbindex 1abb03045f..e0a7af892a 100755--- a/frontend/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb+++ b/frontend/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.last? %><li class="next_page page-item"><%= link_to_unless current_page.last?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>diff --git a/frontend/app/views/kaminari/twitter-bootstrap-4/_page.html.erb b/frontend/app/views/kaminari/twitter-bootstrap-4/_page.html.erbindex 65bb712f19..a5d6ef1821 100755--- a/frontend/app/views/kaminari/twitter-bootstrap-4/_page.html.erb+++ b/frontend/app/views/kaminari/twitter-bootstrap-4/_page.html.erb@@ -5,8 +5,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<li class="page<%= ' active' if page.current? %> page-item"><%= link_to page,url,diff --git a/frontend/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb b/frontend/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erbindex ffe384cfd4..edf2b6cd3a 100755--- a/frontend/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb+++ b/frontend/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb@@ -4,8 +4,8 @@total_pages: total number of pagesper_page: number of items to fetch per pageremote: data-remote- paginator: the paginator that renders the pagination tags inside--%>+ paginator: the paginator that renders the pagination tags inside -%>+<% pagination_class ||= '' %><%= paginator.render do %>diff --git a/frontend/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb b/frontend/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erbindex ebcdc32c3c..9e03b86931 100755--- a/frontend/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb+++ b/frontend/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb@@ -4,8 +4,8 @@current_page: a page object for the currently displayed pagetotal_pages: total number of pagesper_page: number of items to fetch per page- remote: data-remote--%>+ remote: data-remote -%>+<% unless current_page.first? %><li class="prev page-item"><%= link_to_unless current_page.first?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>diff --git a/frontend/app/views/spree/address/_form.html.erb b/frontend/app/views/spree/address/_form.html.erbindex 48bbc24f8b..f9da13c2fe 100644--- a/frontend/app/views/spree/address/_form.html.erb+++ b/frontend/app/views/spree/address/_form.html.erb@@ -1,54 +1,54 @@<% address_id = address_type.chars.first %>-<div class="inner" data-hook=<%="#{address_type}_inner" %>>- <div class="form-group" id=<%="#{address_id}firstname" %>>+<div class="inner" data-hook='<%= "#{address_type}_inner" %>'>+ <div class="form-group" id='<%= "#{address_id}firstname" %>'><%= form.label :firstname do %><%= Spree.t(:first_name) %><abbr class="required" title="required">*</abbr><% end %><%= form.text_field :firstname, class: 'form-control', required: true %></div>- <div class="form-group" id=<%="#{address_id}lastname" %>>+ <div class="form-group" id='<%= "#{address_id}lastname" %>'><%= form.label :lastname do %><%= Spree.t(:last_name) %><abbr class="required" title="required">*</abbr><% end %><%= form.text_field :lastname, class: 'form-control', required: true %></div><% if Spree::Config[:company] %>- <div class="form-group" id=<%="#{address_id}company" %>>+ <div class="form-group" id='<%= "#{address_id}company" %>'><%= form.label :company, Spree.t(:company) %><%= form.text_field :company, class: 'form-control' %></div><% end %>- <div class="form-group" id=<%="#{address_id}address1" %>>+ <div class="form-group" id='<%= "#{address_id}address1" %>'><%= form.label :address1 do %><%= Spree.t(:street_address) %><abbr class="required" title="required">*</abbr><% end %><%= form.text_field :address1, class: 'form-control required' %></div>- <div class="form-group" id=<%="#{address_id}address2" %>>+ <div class="form-group" id='<%= "#{address_id}address2" %>'><%= form.label :address2, Spree.t(:street_address_2) %><%= form.text_field :address2, class: 'form-control' %></div>- <div class="form-group" id=<%="#{address_id}city" %>>+ <div class="form-group" id='<%= "#{address_id}city" %>'><%= form.label :city do %><%= Spree.t(:city) %><abbr class="required" title="required">*</abbr><% end %><%= form.text_field :city, class: 'form-control', required: true %></div>- <div class="form-group" id=<%="#{address_id}country" %>>+ <div class="form-group" id='<%= "#{address_id}country" %>'><%= form.label :country_id do %><%= Spree.t(:country) %><abbr class="required" title="required">*</abbr><% end %>- <span id=<%="#{address_id}country-selection" %>>+ <span id='<%= "#{address_id}country-selection" %>'><%= form.collection_select :country_id, available_countries, :id, :name, {}, { class: 'form-control', required: true } %></span></div><% if Spree::Config[:address_requires_state] %>- <div class="form-group" id=<%="#{address_id}state" %>>+ <div class="form-group" id='<%= "#{address_id}state" %>'><% have_states = !address.country.states.empty? %><%= form.label :state do %>- <%= Spree.t(:state) %><abbr class='required' title="required" id=<%="#{address_id}state-required"%>>*</abbr>+ <%= Spree.t(:state) %><abbr class='required' title="required" id='<%= "#{address_id}state-required" %>'>*</abbr><% end %><%== state_elements = [@@ -62,28 +62,27 @@class: !have_states ? 'form-control' : 'form-control hidden',required: !have_states,disabled: have_states)- ].join.gsub('"', "'").gsub("\n", "")- %>+ ].join.gsub('"', "'").gsub("\n", "") %></div><noscript><%= form.text_field :state_name, class: 'form-control', required: true %></noscript><% end %>- <div class="form-group" id=<%="#{address_id}zipcode" %>>+ <div class="form-group" id='<%= "#{address_id}zipcode" %>'><%= form.label :zipcode do %><%= Spree.t(:zip) %><% if address.require_zipcode? %><abbr class="required" title="required">*</abbr><% end %><% end %><%= form.text_field :zipcode, class: 'form-control', required: address.require_zipcode? %></div>- <div class="form-group" id=<%="#{address_id}phone" %>>+ <div class="form-group" id='<%= "#{address_id}phone" %>'><%= form.label :phone do %><%= Spree.t(:phone) %><% if address.require_phone? %><abbr class="required" title="required">*</abbr><% end %><% end %><%= form.phone_field :phone, class: 'form-control', required: address.require_phone? %></div><% if Spree::Config[:alternative_shipping_phone] %>- <div class="form-group" id=<%="#{address_id}altphone" %>>+ <div class="form-group" id='<%= "#{address_id}altphone" %>'><%= form.label :alternative_phone, Spree.t(:alternative_phone) %><%= form.phone_field :alternative_phone, class: 'form-control' %></div>diff --git a/frontend/app/views/spree/addresses/edit.html.erb b/frontend/app/views/spree/addresses/edit.html.erbindex 6c0fa3e8a2..02799a519c 100644--- a/frontend/app/views/spree/addresses/edit.html.erb+++ b/frontend/app/views/spree/addresses/edit.html.erb@@ -11,8 +11,8 @@address_name: 'address',address_form: f,address_type: 'shipping',- address: @address- %>+ address: @address %>+<%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mb-5' %><% end %></div>diff --git a/frontend/app/views/spree/addresses/new.html.erb b/frontend/app/views/spree/addresses/new.html.erbindex 41b023584b..3bf71471fb 100644--- a/frontend/app/views/spree/addresses/new.html.erb+++ b/frontend/app/views/spree/addresses/new.html.erb@@ -10,8 +10,8 @@address_name: 'address',address_form: f,address_type: 'shipping',- address: @address- %>+ address: @address %>+<%= f.submit t(:save, scope: :address_book), class: 'btn btn-primary btn-block spree-btn mb-5' %><% end %></div>diff --git a/frontend/app/views/spree/checkout/_address.html.erb b/frontend/app/views/spree/checkout/_address.html.erbindex f1b9769fc2..d94b2f59cd 100644--- a/frontend/app/views/spree/checkout/_address.html.erb+++ b/frontend/app/views/spree/checkout/_address.html.erb@@ -5,7 +5,7 @@<div class="col-12 mb-4"><div class="form-group checkout-content-inner-field has-float-label"><%= form.email_field :email, class: 'required spree-flat-input', required: true, placeholder: Spree.t(:email) %>- <%= form.label :email, class: 'text-uppercase'%>+ <%= form.label :email, class: 'text-uppercase' %></div></div></div>@@ -51,7 +51,7 @@</div><% end %><%= form.fields_for address_name do |address_form| %>- <div class="inner checkout-content-inner" data-hook=<%="#{address_type}_inner" %>>+ <div class="inner checkout-content-inner" data-hook='<%= "#{address_type}_inner" %>'><%= render partial: 'spree/addresses/form', locals: {address_name: address_name,address_form: address_form,diff --git a/frontend/app/views/spree/checkout/_credit_card.html.erb b/frontend/app/views/spree/checkout/_credit_card.html.erbindex ba7891283c..b697f74a0a 100644--- a/frontend/app/views/spree/checkout/_credit_card.html.erb+++ b/frontend/app/views/spree/checkout/_credit_card.html.erb@@ -1,6 +1,6 @@-<div id="<%= dom_id(card,'spree')%>" class="payment-sources-list-item">+<div id="<%= dom_id(card,'spree') %>" class="payment-sources-list-item"><label class="form-check-label spree-radio-label">- <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" } %>+ <%= radio_button_tag "order[existing_card]", card.id, (card == @payment_sources.first), { class: "existing-cc-radio" } %><span class="spree-radio-label-custom-input"></span><%= credit_card_icon(card.cc_type) %><span>****<%= card.last_digits %>, </span>diff --git a/frontend/app/views/spree/checkout/_summary.html.erb b/frontend/app/views/spree/checkout/_summary.html.erbindex 472c9724ce..7a488bb1d1 100644--- a/frontend/app/views/spree/checkout/_summary.html.erb+++ b/frontend/app/views/spree/checkout/_summary.html.erb@@ -20,8 +20,7 @@data-non-shipment-tax='<%= adjustments.reject{ |adj| adj.adjustable_type== 'Spree::Shipment'}.sum(&:amount) %>'thousands-separator='<%= tax_total.thousands_separator %>'decimal-mark='<%= tax_total.decimal_mark %>'- precision='<%= Money::Currency.find(order.currency).exponent %>'- >+ precision='<%= Money::Currency.find(order.currency).exponent %>'><%= tax_total.to_html %></div><% end %>@@ -38,8 +37,7 @@data-currency='<%= Money::Currency.find(order.currency).symbol %>'thousands-separator='<%= shipping_total.thousands_separator %>'decimal-mark='<%= shipping_total.decimal_mark %>'- precision='<%= Money::Currency.find(order.currency).exponent %>'- >+ precision='<%= Money::Currency.find(order.currency).exponent %>'><%= shipping_total.to_html %></div>diff --git a/frontend/app/views/spree/checkout/payment/_gateway.html.erb b/frontend/app/views/spree/checkout/payment/_gateway.html.erbindex 292a05af2f..f55df70ca9 100644--- a/frontend/app/views/spree/checkout/payment/_gateway.html.erb+++ b/frontend/app/views/spree/checkout/payment/_gateway.html.erb@@ -11,7 +11,7 @@<% options_hash = Rails.env.production? ? {autocomplete: 'off'} : {} %><%= text_field_tag "#{param_prefix}[number]", '', options_hash.merge(id: 'card_number', class: 'spree-flat-input cardNumber', size: 19, maxlength: 19, autocomplete: "off", placeholder: Spree.t(:card_number)) %><span id="card_type" style="display:none;">- ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>+ ( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span><span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>)</span>diff --git a/frontend/app/views/spree/home/index.html.erb b/frontend/app/views/spree/home/index.html.erbindex c4d209afdf..c15b67a9ae 100644--- a/frontend/app/views/spree/home/index.html.erb+++ b/frontend/app/views/spree/home/index.html.erb@@ -4,7 +4,7 @@<img class="lazyload hero-image position-absolute"data-src="<%= asset_path('homepage/main_banner.jpg') %>"data-srcset="<%= image_source_set('homepage/main_banner') %>"- alt="Summer Collection" />+ alt="Summer Collection"><div class="hero-content"><div class="homepage-hero-image-text mb-2 mx-auto pb-3 pb-md-4">@@ -24,7 +24,7 @@<img class="w-100 lazyload"data-src="<%= asset_path('homepage/category_banner_upper.jpg') %>"data-srcset="<%= image_source_set('homepage/category_banner_upper') %>"- alt="Men" />+ alt="Men"><div class="homepage-taxon-box-text"><h3>Men</h3>@@ -35,7 +35,7 @@<img class="w-100 lazyload"data-src="<%= asset_path('homepage/category_banner_lower.jpg') %>"data-srcset="<%= image_source_set('homepage/category_banner_lower') %>"- alt="Sportswear" />+ alt="Sportswear"><div class="homepage-taxon-box-text" role="img" aria-label="Sportswear"><h3>Sportswear</h3>@@ -50,7 +50,7 @@<img class="w-100 lazyload"data-src="<%= asset_path('homepage/big_category_banner.jpg') %>"data-srcset="<%= image_source_set('homepage/big_category_banner') %>"- alt="Women" />+ alt="Women"><div class="homepage-taxon-box-text"><h3>Women</h3>@@ -74,7 +74,6 @@</div></div>-<div data-product-carousel data-product-carousel-taxon-id='trending' class="mb-3"></div><div class="container">@@ -85,7 +84,7 @@<img class="w-100 lazyload"data-src="<%= asset_path('homepage/promo_banner_left.jpg') %>"data-srcset="<%= image_source_set('homepage/promo_banner_left') %>"- alt="NEW COLLECTION" />+ alt="NEW COLLECTION"><div class="homepage-bottom-box-inner" role="img" aria-label="New Collection"><div class="homepage-bottom-box-inner-small-text">@@ -105,7 +104,7 @@<img class="w-100 lazyload"data-src="<%= asset_path('homepage/promo_banner_right.jpg') %>"data-srcset="<%= image_source_set('homepage/promo_banner_right') %>"- alt="Summer Sale" />+ alt="Summer Sale"><div class="homepage-bottom-box-inner"><div class="homepage-bottom-box-inner-small-text">diff --git a/frontend/app/views/spree/orders/_coupon_code.html.erb b/frontend/app/views/spree/orders/_coupon_code.html.erbindex 7f12485d90..d922ccd40e 100644--- a/frontend/app/views/spree/orders/_coupon_code.html.erb+++ b/frontend/app/views/spree/orders/_coupon_code.html.erb@@ -12,11 +12,10 @@<div class="input-group"><%= order_form.text_field :applied_coupon_code, name: '', size: '30', class: 'form-control border-right-0 disabled',value: Spree.t(:promotion_label, name: promotion.name),- data: { code: promotion.code }- %>+ data: { code: promotion.code } %><div class="input-group-append"><%= button_tag name: '', id: 'shopping-cart-remove-coupon-code-button', class: 'btn border-left-0 remove' do %>- <%= icon(name: 'close', width: 15, height: 14) %>+ <%= icon(name: 'close', width: 15, height: 14) %><% end %></div></div>diff --git a/frontend/app/views/spree/orders/_line_item.html.erb b/frontend/app/views/spree/orders/_line_item.html.erbindex d765927c47..280092ef0e 100644--- a/frontend/app/views/spree/orders/_line_item.html.erb+++ b/frontend/app/views/spree/orders/_line_item.html.erb@@ -9,7 +9,7 @@<h2 class="item-title"><%= link_to line_item.name, spree.product_path(variant.product) %></h2><% if line_item.insufficient_stock? %><span class="out-of-stock">- <%= Spree.t(:out_of_stock) %> <br />+ <%= Spree.t(:out_of_stock) %> <br></span><% end %><ul class="item-details-list" data-hook="line_item_description">diff --git a/frontend/app/views/spree/orders/_line_item_data.html.erb b/frontend/app/views/spree/orders/_line_item_data.html.erbindex 08c2045396..983598653c 100644--- a/frontend/app/views/spree/orders/_line_item_data.html.erb+++ b/frontend/app/views/spree/orders/_line_item_data.html.erb@@ -26,6 +26,6 @@<%= icon(name: 'garbage',classes: 'shopping-cart-item-delete-icon',width: 18.9,- height: 17) %>+ height: 17) %><% end %></div>diff --git a/frontend/app/views/spree/orders/edit.html.erb b/frontend/app/views/spree/orders/edit.html.erbindex 9b3165658a..eb63e7c8b1 100644--- a/frontend/app/views/spree/orders/edit.html.erb+++ b/frontend/app/views/spree/orders/edit.html.erb@@ -12,7 +12,7 @@<%= icon(name: 'empty-cart',classes: 'shopping-cart-empty-image',width: 83,- height: 83) %>+ height: 83) %><p class="text-center shopping-cart-empty-info"><%= Spree.t('cart_page.empty_info').html_safe %></p></div>@@ -57,8 +57,7 @@<%= render 'coupon_code',promotion: @order.valid_coupon_promotions.first,order_form: order_form,- classes: ''- %>+ classes: '' %><% end %><div class="text-right shopping-cart-total d-lg-none">diff --git a/frontend/app/views/spree/products/_color_option_type.html.erb b/frontend/app/views/spree/products/_color_option_type.html.erbindex 779b2c6897..2bc8ec1e0d 100644--- a/frontend/app/views/spree/products/_color_option_type.html.erb+++ b/frontend/app/views/spree/products/_color_option_type.html.erb@@ -22,8 +22,7 @@"presentation" => option_value[:presentation],"variant-id" => option_value[:variant_id],"is-color" => true- }- %>+ } %><%= render partial: "spree/shared/color_select", locals: {color: option_value[:presentation],diff --git a/frontend/app/views/spree/products/_filters_desktop.html.erb b/frontend/app/views/spree/products/_filters_desktop.html.erbindex aebebb8c44..6b7025d2eb 100644--- a/frontend/app/views/spree/products/_filters_desktop.html.erb+++ b/frontend/app/views/spree/products/_filters_desktop.html.erb@@ -24,8 +24,7 @@params_ot_downcase_name: params[ot_downcase_name],option_type: option_type,permitted_params: permitted_params,- ot_downcase_name: ot_downcase_name- %>+ ot_downcase_name: ot_downcase_name %></div></div></div>diff --git a/frontend/app/views/spree/products/_gallery.html.erb b/frontend/app/views/spree/products/_gallery.html.erbindex b5fd809a3d..c048dd9b0e 100644--- a/frontend/app/views/spree/products/_gallery.html.erb+++ b/frontend/app/views/spree/products/_gallery.html.erb@@ -2,16 +2,15 @@<% if @product_images.size > 0 %><divclass="w-100 d-flex align-self-start justify-content-between product-details-images"- data-hook="product_left_part_wrap"- >+ data-hook="product_left_part_wrap">+<div class="d-none d-md-block product-details-thumbnails" data-hook="product_thumbnails"><%= render 'spree/shared/carousel/thumbnails',images: @product_images,group_id: 'main-product-carousel',id: 'productThumbnailsCarousel',trigger_id: 'productCarousel',- per_page: 5- %>+ per_page: 5 %></div><div class="product-details-single" data-hook="product_images"><%= render 'spree/shared/carousel/single',@@ -19,8 +18,7 @@group_id: 'main-product-carousel',id: 'productCarousel',trigger_id: 'productCarousel',- zoomed: false- %>+ zoomed: false %></div></div><% end %>diff --git a/frontend/app/views/spree/products/_gallery_modal.html.erb b/frontend/app/views/spree/products/_gallery_modal.html.erbindex a7f7d877f1..6eef85fbee 100644--- a/frontend/app/views/spree/products/_gallery_modal.html.erb+++ b/frontend/app/views/spree/products/_gallery_modal.html.erb@@ -1,5 +1,5 @@<% if @product_images.size > 0 %>- <div class="modal fade" id="picturesModal" tabindex="-1" role="dialog" >+ <div class="modal fade" id="picturesModal" tabindex="-1" role="dialog"><div class="modal-dialog--zoom modal-dialog mw-100 vh-100 mt-0 mb-0" role="document"><div class="modal-content h-100"><div class="modal-body h-100">@@ -23,8 +23,7 @@group_id: 'main-product-modal-carousel',id: 'productModalThumbnailsCarousel',trigger_id: 'productCarousel',- per_page: 4- %>+ per_page: 4 %></div><% end %><div class="product-details-single">@@ -33,8 +32,7 @@group_id: 'main-product-modal-carousel',id: 'productModalCarousel',trigger_id: 'productCarousel',- zoomed: true- %>+ zoomed: true %></div></div></div>diff --git a/frontend/app/views/spree/products/_option_type.html.erb b/frontend/app/views/spree/products/_option_type.html.erbindex b338d496c2..bf48ae3c0d 100644--- a/frontend/app/views/spree/products/_option_type.html.erb+++ b/frontend/app/views/spree/products/_option_type.html.erb@@ -15,8 +15,7 @@"option-type-index" => index,"presentation" => option_value[:presentation],"variant-id" => option_value[:variant_id]- }- %>+ } %><%= label_tag "variant_option_value_id_#{option_type[:id]}_#{option_value[:id]}",class: "m-1 select-label",diff --git a/frontend/app/views/spree/products/_sort_mobile.html.erb b/frontend/app/views/spree/products/_sort_mobile.html.erbindex 4b927afff7..93ea63b0bf 100644--- a/frontend/app/views/spree/products/_sort_mobile.html.erb+++ b/frontend/app/views/spree/products/_sort_mobile.html.erb@@ -8,7 +8,7 @@<div class="plp-overlay-header-border"></div><ul class="pt-1 plp-overlay-ul"><li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by].blank? %>">- <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: nil)) %>" >+ <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: nil)) %>"><div class="plp-empty-dot"><div class="filled-dot"></div></div>@@ -16,7 +16,7 @@</a></li><li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'newest-first' %>">- <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'newest-first')) %>" >+ <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'newest-first')) %>"><div class="plp-empty-dot"><div class="filled-dot"></div></div>@@ -24,7 +24,7 @@</a></li><li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'price-high-to-low' %>">- <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'price-high-to-low')) %>" >+ <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'price-high-to-low')) %>"><div class="plp-empty-dot"><div class="filled-dot"></div></div>@@ -32,7 +32,7 @@</a></li><li class="plp-overlay-ul-li <%= 'plp-overlay-ul-li--active' if params[:sort_by] == 'price-low-to-high' %>">- <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'price-low-to-high')) %>" >+ <a class="p-3 d-block" href="<%= url_for(permitted_params.merge(sort_by: 'price-low-to-high')) %>"><div class="plp-empty-dot"><div class="filled-dot"></div></div>diff --git a/frontend/app/views/spree/products/show.html.erb b/frontend/app/views/spree/products/show.html.erbindex c93e4ac918..e914bfd499 100644--- a/frontend/app/views/spree/products/show.html.erb+++ b/frontend/app/views/spree/products/show.html.erb@@ -48,5 +48,4 @@<divdata-related-productsdata-related-products-id="<%= @product.slug %>"- data-related-products-enabled="<%= @product.respond_to?(:has_related_products?) %>"-/>+ data-related-products-enabled="<%= @product.respond_to?(:has_related_products?) %>" />diff --git a/frontend/app/views/spree/shared/_carousel_4_products.html.erb b/frontend/app/views/spree/shared/_carousel_4_products.html.erbindex 94a86fb16e..ea2a1f23f5 100644--- a/frontend/app/views/spree/shared/_carousel_4_products.html.erb+++ b/frontend/app/views/spree/shared/_carousel_4_products.html.erb@@ -20,8 +20,7 @@class="d-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--previous"href="#<%= id %>-mobile"role="button"- data-slide="prev"- >+ data-slide="prev"><span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-left',@@ -35,8 +34,7 @@class="d-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--next"href="#<%= id %>-mobile"role="button"- data-slide="next"- >+ data-slide="next"><span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-right',@@ -56,14 +54,12 @@class="d-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--previous"href="#<%= id %>-desktop"role="button"- data-slide="prev"- >+ data-slide="prev"><span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-left',width: 20,- height: 20)- %>+ height: 20) %></span><span class="sr-only"><%= Spree.t(:previous) %></span></a>@@ -80,14 +76,12 @@class="d-md-flex position-absolute justify-content-center align-items-center carousel-icon-control carousel-icon-control--next"href="#<%= id %>-desktop"role="button"- data-slide="next"- >+ data-slide="next"><span class="d-flex justify-content-center align-items-center carousel-icon-control-rounded" aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-right',width: 20,- height: 20)- %>+ height: 20) %></span><span class="sr-only"><%= Spree.t(:next) %></span></a>diff --git a/frontend/app/views/spree/shared/_change_store.html.erb b/frontend/app/views/spree/shared/_change_store.html.erbindex 5484c4d387..77dcd31b3a 100644--- a/frontend/app/views/spree/shared/_change_store.html.erb+++ b/frontend/app/views/spree/shared/_change_store.html.erb@@ -1,15 +1,15 @@<% if Spree::Config.show_store_selector && stores.size > 1 %><li class="d-none d-xl-block change-store"><div class="dropdown navbar-right-dropdown">- <button id="stores-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.change_country')%>">+ <button id="stores-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.change_country') %>"><%= icon(name: 'global',classes: 'd-none d-xl-inline-block',width: 41,- height: 36) %>+ height: 36) %><%= icon(name: 'arrow-down',classes: 'd-inline-block d-xl-none',width: 15,- height: 15) %>+ height: 15) %></button><div id="stores_list" class="dropdown-menu dropdown-menu-right text-right">diff --git a/frontend/app/views/spree/shared/_color_select.html.erb b/frontend/app/views/spree/shared/_color_select.html.erbindex e5e546b7bf..319296cf6a 100644--- a/frontend/app/views/spree/shared/_color_select.html.erb+++ b/frontend/app/views/spree/shared/_color_select.html.erb@@ -1,9 +1,9 @@<svg class="color-select" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><g class="color-select-border" fill="none" fill-rule="evenodd">- <circle class="<%= 'color-select-border--selected' if selected %> plp-overlay-color-item" cx="16" cy="16" r="15" stroke-width="2"/>+ <circle class="<%= 'color-select-border--selected' if selected %> plp-overlay-color-item" cx="16" cy="16" r="15" stroke-width="2" /><g transform="translate(2 2)">- <circle cx="14" cy="14" fill="<%= color %>" fill-rule="evenodd" r="12"/>- <circle cx="14" cy="14" r="13" stroke="#fff" stroke-width="2"/>+ <circle cx="14" cy="14" fill="<%= color %>" fill-rule="evenodd" r="12" />+ <circle cx="14" cy="14" r="13" stroke="#fff" stroke-width="2" /></g></g></svg>diff --git a/frontend/app/views/spree/shared/_delete_address_popup.html.erb b/frontend/app/views/spree/shared/_delete_address_popup.html.erbindex 7efbb2ef0e..deb4566f3c 100644--- a/frontend/app/views/spree/shared/_delete_address_popup.html.erb+++ b/frontend/app/views/spree/shared/_delete_address_popup.html.erb@@ -18,8 +18,7 @@class="btn btn-primary text-uppercase font-weight-bold delete-address-popup-button"data-method="delete"rel="nofollow"- href="#"- >+ href="#"><%= Spree.t("address_action_popup.delete_button") %></a></div>diff --git a/frontend/app/views/spree/shared/_error_messages.html.erb b/frontend/app/views/spree/shared/_error_messages.html.erbindex fb54c5760d..a2bf3bafe4 100644--- a/frontend/app/views/spree/shared/_error_messages.html.erb+++ b/frontend/app/views/spree/shared/_error_messages.html.erb@@ -1,10 +1,10 @@<% if target && target.errors.any? %><div id="errorExplanation" class="alert alert-danger d-flex justify-content-center mb-0" data-hook>- <ul class="mb-0 pl-0" style="list-style-type: none;">+ <ul class="mb-0 pl-0" style="list-style-type: none;"><% target.errors.full_messages.each do |msg| %><li><%= msg %></li><% end %></ul>- <br/>+ <br></div><% end %>diff --git a/frontend/app/views/spree/shared/_footer.html.erb b/frontend/app/views/spree/shared/_footer.html.erbindex 6d33cceda3..bf4e7f3a29 100644--- a/frontend/app/views/spree/shared/_footer.html.erb+++ b/frontend/app/views/spree/shared/_footer.html.erb@@ -33,7 +33,7 @@<div class="d-flex flex-column align-items-center align-items-xl-start pb-3 flex-grow-2 footer-spree-contact-note"><div><strong><%= current_store.name %></strong>- <br/>+ <br><% if current_store.address %><%= current_store.address.html_safe %><% end %>diff --git a/frontend/app/views/spree/shared/_head.html.erb b/frontend/app/views/spree/shared/_head.html.erbindex d4ccf34a0f..5f998ae60a 100644--- a/frontend/app/views/spree/shared/_head.html.erb+++ b/frontend/app/views/spree/shared/_head.html.erb@@ -1,5 +1,5 @@<title><%= title %></title>-<meta name="viewport" content="width=device-width, initial-scale=1" />+<meta name="viewport" content="width=device-width, initial-scale=1"><%== og_meta_data_tags %><%== meta_data_tags %><%== meta_robots %>diff --git a/frontend/app/views/spree/shared/_header.html.erb b/frontend/app/views/spree/shared/_header.html.erbindex 60924bd3db..0d9e3c8ddc 100644--- a/frontend/app/views/spree/shared/_header.html.erb+++ b/frontend/app/views/spree/shared/_header.html.erb@@ -8,7 +8,7 @@<button class="navbar-toggler border-0 px-0 d-flex" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-label="<%= Spree.t('nav_bar.show_menu') %>"><%= icon(name: 'burger',width: 18.5,- height: 16) %>+ height: 16) %></button></div><figure class="logo flex-grow-0 flex-xl-grow-1 order-xl-0 header-spree-fluid-logo m-0">diff --git a/frontend/app/views/spree/shared/_main_nav_bar.html.erb b/frontend/app/views/spree/shared/_main_nav_bar.html.erbindex 2c60b266bd..e7719d74e5 100644--- a/frontend/app/views/spree/shared/_main_nav_bar.html.erb+++ b/frontend/app/views/spree/shared/_main_nav_bar.html.erb@@ -48,7 +48,7 @@</div></div></div>- <%end %>+ <% end %></li><% end %></ul>diff --git a/frontend/app/views/spree/shared/_mobile_change_store.html.erb b/frontend/app/views/spree/shared/_mobile_change_store.html.erbindex 84eff81fdb..c726548399 100644--- a/frontend/app/views/spree/shared/_mobile_change_store.html.erb+++ b/frontend/app/views/spree/shared/_mobile_change_store.html.erb@@ -1,7 +1,7 @@<% if stores.size > 1 %><li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">- <span class="w-75"><%= Spree.t('nav_bar.change_country')%></span>- <a class="w-25 text-right mobile-navigation-category-link" data-category="countries" href="#" aria-label="<%= Spree.t('nav_bar.change_country')%>">+ <span class="w-75"><%= Spree.t('nav_bar.change_country') %></span>+ <a class="w-25 text-right mobile-navigation-category-link" data-category="countries" href="#" aria-label="<%= Spree.t('nav_bar.change_country') %>"><%= icon(name: 'arrow-right',classes: 'd-sm-none spree-icon-arrow spree-icon-arrow-right',width: 16,@@ -14,7 +14,7 @@<ul class="list-unstyled position-absolute mobile-navigation-sublist" data-category="countries"><li class="text-center font-weight-bold mobile-navigation-sublist-header">- <%= Spree.t('nav_bar.change_country')%>+ <%= Spree.t('nav_bar.change_country') %></li><% stores.each do |store| %><li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">diff --git a/frontend/app/views/spree/shared/_mobile_navigation.html.erb b/frontend/app/views/spree/shared/_mobile_navigation.html.erbindex 193160c6b0..f98266e94c 100644--- a/frontend/app/views/spree/shared/_mobile_navigation.html.erb+++ b/frontend/app/views/spree/shared/_mobile_navigation.html.erb@@ -25,7 +25,7 @@<li class="d-flex justify-content-between align-items-center mobile-navigation-list-item"><%= link_to root[:title], root[:url], class: 'w-75' %><% if root[:items].present? %>- <a class="w-25 text-right mobile-navigation-category-link" data-category="<%= root[:title].parameterize %>" href="#" aria-label="<%= Spree.t('go_to_category')%>">+ <a class="w-25 text-right mobile-navigation-category-link" data-category="<%= root[:title].parameterize %>" href="#" aria-label="<%= Spree.t('go_to_category') %>"><%= icon(name: 'arrow-right',classes: 'd-inline spree-icon-arrow spree-icon-arrow-right',width: 14,diff --git a/frontend/app/views/spree/shared/_nav_bar.html.erb b/frontend/app/views/spree/shared/_nav_bar.html.erbindex 840a9586a9..90d57b5347 100644--- a/frontend/app/views/spree/shared/_nav_bar.html.erb+++ b/frontend/app/views/spree/shared/_nav_bar.html.erb@@ -1,11 +1,11 @@<ul id="nav-bar" class="nav align-items-center d-flex flex-nowrap justify-content-end navbar-right"><li><div class="navbar-right-search-menu">- <button type="button" class="navbar-right-dropdown-toggle search-icons" aria-label="<%= Spree.t('nav_bar.show_search')%>">+ <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) %>+ height: 36) %></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">@@ -16,11 +16,11 @@<% if defined?(spree.account_link_path) %><li><div class="dropdown navbar-right-dropdown">- <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')%>">+ <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) %>+ height: 36) %></button><div id="link-to-account" class="dropdown-menu dropdown-menu-right text-right">diff --git a/frontend/app/views/spree/shared/_no_product_available.html.erb b/frontend/app/views/spree/shared/_no_product_available.html.erbindex 42928f3b3d..8ebe1c8093 100644--- a/frontend/app/views/spree/shared/_no_product_available.html.erb+++ b/frontend/app/views/spree/shared/_no_product_available.html.erb@@ -1,5 +1,5 @@<div class="p-0 justify-content-around mx-auto no-product-available">- <div id= "no-product-available-close-button" class="d-flex no-product-available-icon">+ <div id="no-product-available-close-button" class="d-flex no-product-available-icon"><%= inline_svg_tag "close.svg", class: "w-100 h-100" %></div>diff --git a/frontend/app/views/spree/shared/_order_details.html.erb b/frontend/app/views/spree/shared/_order_details.html.erbindex 8c7fda3148..a076017b74 100644--- a/frontend/app/views/spree/shared/_order_details.html.erb+++ b/frontend/app/views/spree/shared/_order_details.html.erb@@ -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 text-uppercase" data-hook="order_details_line_items_headers"><p class="d-table-cell pb-1"><%= Spree.t(:product) %></p>diff --git a/frontend/app/views/spree/shared/_payment.html.erb b/frontend/app/views/spree/shared/_payment.html.erbindex d4e9064c6d..fb6fc711a9 100644--- a/frontend/app/views/spree/shared/_payment.html.erb+++ b/frontend/app/views/spree/shared/_payment.html.erb@@ -6,7 +6,7 @@<%= Spree.t(:ending_in) %> <%= source.last_digits %><% end %></span>- <br />+ <br><span class="full-name"><%= source.name %></span><% else %><%= content_tag(:span, payment.payment_method.name) %>@@ -14,4 +14,4 @@<span class="payment-amount">(<%= payment.display_amount %>)</span>-<br />+<br>diff --git a/frontend/app/views/spree/shared/_payment_sources.html.erb b/frontend/app/views/spree/shared/_payment_sources.html.erbindex 11b6c90900..7d85ed626e 100644--- a/frontend/app/views/spree/shared/_payment_sources.html.erb+++ b/frontend/app/views/spree/shared/_payment_sources.html.erb@@ -1,8 +1,8 @@<td><% payment_sources.each do |payment_source| %><%= payment_source.class.to_s.underscore.split('/').second.humanize.titleize %>- <br/>+ <br><%= payment_source.last_digits.rjust(16, '*') %>- <br/>+ <br><% end %></td>diff --git a/frontend/app/views/spree/shared/_product_added_modal.html.erb b/frontend/app/views/spree/shared/_product_added_modal.html.erbindex 49632e92fd..b09d6d7d6c 100644--- a/frontend/app/views/spree/shared/_product_added_modal.html.erb+++ b/frontend/app/views/spree/shared/_product_added_modal.html.erb@@ -1,5 +1,5 @@<div class="modal product-added-modal" tabindex="-1" role="dialog" aria-hidden="true">- <div class="modal-dialog modal-lg" role="document" >+ <div class="modal-dialog modal-lg" role="document"><div class="modal-content"><div class="modal-header pb-0 px-4 pt-4 border-0"><button type="button" class="close" data-dismiss="modal" aria-label="Close">diff --git a/frontend/app/views/spree/shared/_search.html.erb b/frontend/app/views/spree/shared/_search.html.erbindex a65aa87395..2f175da5a4 100644--- a/frontend/app/views/spree/shared/_search.html.erb+++ b/frontend/app/views/spree/shared/_search.html.erb@@ -5,8 +5,7 @@title: Spree.t(:search),autofocus: true,'aria-label': Spree.t(:search),- class: " border-0 p-3"- %>+ class: " border-0 p-3" %><button type="submit" class="btn border-0 p-0" aria-label="Submit"><%= icon(name: 'search',classes: 'd-inline',diff --git a/frontend/app/views/spree/shared/_translations.html.erb b/frontend/app/views/spree/shared/_translations.html.erbindex e6b7e37fa4..ce0d04d800 100644--- a/frontend/app/views/spree/shared/_translations.html.erb+++ b/frontend/app/views/spree/shared/_translations.html.erb@@ -1,11 +1,11 @@<script>window.addEventListener('turbolinks:load', function() {Spree.translations = <%==- {- coupon_code_applied: Spree.t(:coupon_code_applied),- coupon_code_removed: Spree.t(:coupon_code_removed),- coupon_code_error_icon: image_path('error.svg')- }.to_json- %>+ {+ coupon_code_applied: Spree.t(:coupon_code_applied),+ coupon_code_removed: Spree.t(:coupon_code_removed),+ coupon_code_error_icon: image_path('error.svg')+ }.to_json+ %>});</script>diff --git a/frontend/app/views/spree/shared/carousel/_single.html.erb b/frontend/app/views/spree/shared/carousel/_single.html.erbindex 47b1755833..871e798ec8 100644--- a/frontend/app/views/spree/shared/carousel/_single.html.erb+++ b/frontend/app/views/spree/shared/carousel/_single.html.erb@@ -4,15 +4,13 @@data-product-carousel-group-identifier="<%= group_id %>"data-variant-change-trigger-identifier="<%= trigger_id %>"data-interval="false"- data-hook->+ data-hook><% if images.length > 1 %><aclass="d-none d-md-flex h-100 justify-content-center align-items-center product-carousel-control position-absolute product-carousel-control--previous"href="#<%= id %>"role="button"- data-slide="prev"- >+ data-slide="prev"><span class="d-flex justify-content-center align-items-center product-carousel-control-rounded" aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-left',@@ -26,8 +24,7 @@class="d-none d-md-flex h-100 justify-content-center align-items-center product-carousel-control position-absolute product-carousel-control--next"href="#<%= id %>"role="button"- data-slide="next"- >+ data-slide="next"><span class="d-flex justify-content-center align-items-center product-carousel-control-rounded" aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-right',@@ -47,8 +44,7 @@<divclass="carousel-item product-carousel-item<%= ' active' if imageIndex == 0 %>"data-variant-is-master="<%= image.viewable_id == @product.master_id %>"- data-variant-id="<%= image.viewable_id %>"- >+ data-variant-id="<%= image.viewable_id %>"><div class="product-carousel-item-squared <%= 'product-carousel-item-squared-only' if images.length == 1 %>"><% image_attrs = {src: main_app.url_for(image.url(zoomed ? :zoomed : :large)),@@ -68,8 +64,7 @@<lidata-target="#<%= id %>"data-slide-to="<%= imageIndex %>"- class="product-carousel-indicators-indicator product-carousel-indicators-indicator--visible<%= ' active' if imageIndex == 0 %>"- >+ class="product-carousel-indicators-indicator product-carousel-indicators-indicator--visible<%= ' active' if imageIndex == 0 %>"><%= lazy_image(src: main_app.url_for(image.url(:pdp_thumbnail)),class: 'd-block w-100',diff --git a/frontend/app/views/spree/shared/carousel/_thumbnails.html.erb b/frontend/app/views/spree/shared/carousel/_thumbnails.html.erbindex 5fb317a94c..06e7393570 100644--- a/frontend/app/views/spree/shared/carousel/_thumbnails.html.erb+++ b/frontend/app/views/spree/shared/carousel/_thumbnails.html.erb@@ -6,8 +6,7 @@data-product-carousel-per-page="<%= per_page %>"data-product-carousel-is-slave="true"data-interval="false"- data-hook->+ data-hook><div class="carousel-inner order-1 h-100"><% images.each_with_index do |image, image_index| %><% if image_index % per_page == 0 %>@@ -19,16 +18,13 @@class="product-thumbnails-carousel-item-single product-thumbnails-carousel-item-single--visible"data-product-carousel-to-slide="<%= image_index %>"data-variant-is-master="<%= image.viewable_id == @product.master_id %>"- data-variant-id="<%= image.viewable_id %>"- >+ data-variant-id="<%= image.viewable_id %>"><%= lazy_image(src: main_app.url_for(image.url(:pdp_thumbnail)),class: 'd-block w-100',alt: image.alt || @product.name,width: 57,- height: 70- )- %>+ height: 70) %></div><% if (image_index + 1) % per_page == 0 || (image_index + 1) == images.length %></div>@@ -42,8 +38,7 @@class="d-none d-sm-flex order-0 justify-content-center w-100 product-thumbnails-carousel-previous"href="#<%= id %>"role="button"- data-slide="prev"- >+ data-slide="prev"><span aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-up',@@ -56,8 +51,7 @@class="d-none d-sm-flex order-2 justify-content-center w-100 product-thumbnails-carousel-next"href="#<%= id %>"role="button"- data-slide="next"- >+ data-slide="next"><span aria-hidden="true"><%= icon(name: 'arrow-right',classes: 'spree-icon-arrow spree-icon-arrow-down',diff --git a/frontend/app/views/spree/users/_address_controls.html.erb b/frontend/app/views/spree/users/_address_controls.html.erbindex 9891b794b2..79cc49e9b8 100644--- a/frontend/app/views/spree/users/_address_controls.html.erb+++ b/frontend/app/views/spree/users/_address_controls.html.erb@@ -6,6 +6,5 @@<%= icon(name: 'garbage_2',classes: '',width: 24,- height: 24)- %>+ height: 24) %><% end %>diff --git a/frontend/app/views/spree/users/show.html.erb b/frontend/app/views/spree/users/show.html.erbindex 0e0fecd420..d014406baf 100755--- a/frontend/app/views/spree/users/show.html.erb+++ b/frontend/app/views/spree/users/show.html.erb@@ -1,5 +1,5 @@<div class="container account-page">- <h3 class="text-uppercase spree-mb-large spree-mt-large spree-header" ><%= accurate_title %></h3>+ <h3 class="text-uppercase spree-mb-large spree-mt-large spree-header"><%= accurate_title %></h3><div class="row"><div class="col-xs-12 col-lg-4">@@ -41,7 +41,7 @@</div><div data-hook="account_my_orders" class="account-page-orders" id="account-my-orders">- <h3 class="text-uppercase spree-mb-medium spree-mt-medium spree-header" ><%= Spree.t(:my_orders) %></h3>+ <h3 class="text-uppercase spree-mb-medium spree-mt-medium spree-header"><%= Spree.t(:my_orders) %></h3><% if @orders.present? %><table><thead class="active">@@ -73,7 +73,7 @@<% else %><p class="text-center"><%= Spree.t(:you_have_no_orders_yet) %></p><% end %>- <br />+ <br></div><div id="delete-address-popup" class="delete-address-popup-dropdown hide-on-esc"><%= render 'spree/shared/delete_address_popup' %>