spree_backend 4.4.1 → 4.5.0

data/app/views/spree/admin/products/stock.html.erb

@@ -6,10 +6,10 @@
     <%= render 'add_stock_form' %>
   </div>
 <% end %>
-<div class="card mb-3">
-  <div class="table-responsive">
+<div class="mb-3">
+  <div class="table-responsive border rounded bg-white">
     <table class="table" id="listing_product_stock">
-      <thead>
+      <thead class="text-muted">
         <tr data-hook="admin_product_stock_management_index_headers">
           <th colspan="2"><%= Spree.t(:variant) %></th>
           <th colspan="3"><%= Spree.t(:stock_location_info) %></th>
@@ -20,9 +20,7 @@
           <% if variant.stock_items.present? %>
             <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
               <td class="image text-center">
-                <% if variant.images.present? %>
-                  <%= image_tag main_app.url_for(variant.images.first.url(:mini)) %>
-                <% end %>
+                <%= small_image(variant) %>
               </td>
               <td>
                 <%= variant.sku_and_options_text %>
@@ -41,8 +39,8 @@
               </td>
 
               <td colspan="3" class="stock_location_info">
-                <table class="table table-bordered mb-0">
-                  <thead>
+                <table class="table border rounded mb-0">
+                  <thead class="text-muted">
                     <th><%= Spree.t(:stock_location) %></th>
                     <th class="text-center"><%= Spree.t(:count_on_hand) %></th>
                     <th class="text-center"><%= Spree.t(:backorderable) %></th>
@@ -52,7 +50,7 @@
                     <% variant.stock_items.each do |item| %>
                       <% next unless @stock_locations.include?(item.stock_location) %>
                       <tr id="stock-item-<%= item.id %>">
-                        <td><%= item.stock_location.name %></td>
+                        <td><%= link_to item.stock_location.name, spree.edit_admin_stock_location_path(item.stock_location) %></td>
                         <td class="text-center"><%= item.count_on_hand %></td>
                         <td class="text-center">
                           <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>

data/app/views/spree/admin/promotion_categories/index.html.erb

@@ -8,9 +8,9 @@
 
 <% if @promotion_categories.any? %>
 
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
       <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
       <th></th>
@@ -32,7 +32,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PromotionCategory)) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>

data/app/views/spree/admin/promotions/_actions.html.erb

@@ -1,11 +1,11 @@
 <div class="card-header">
-  <h1 class="card-title mb-0 h5">
+  <h5 class="card-title mb-0 h6">
     <%= Spree.t(:promotion_actions) %>
-  </h1>
+  </h5>
 </div>
 <div id="action_fields" class="card-body">
   <%= form_tag spree.admin_promotion_promotion_actions_path(@promotion), remote: true, id: 'new_promotion_action_form', class: 'mb-3' do %>
-    <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
+    <% options = options_for_select(  @actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
 
     <div class="form-group">
       <%= label_tag :action_type, Spree.t(:add_action_of_type) %>

data/app/views/spree/admin/promotions/_form.html.erb

@@ -72,7 +72,7 @@
            data-alt-format="<%= Spree.t(:fpr_human_friendly_date_time_format, scope: 'date_picker', default: 'M j, Y H:i') %>"
            data-max-date="<%= @promotion.expires_at %>">
         <%= f.datetime_field :starts_at,
-                             class: 'form-control shadow-none',
+                             class: 'form-control',
                              placeholder: Spree.t('starting_from'),
                              'data-input':'' %>
 
@@ -89,7 +89,7 @@
            data-min-date="<%= @promotion.starts_at %>">
         <%= f.datetime_field :expires_at,
                               placeholder:Spree.t('ends_at'),
-                              class: 'form-control shadow-none',
+                              class: 'form-control',
                               'data-input':'' %>
 
         <%= render partial: 'spree/admin/shared/cal_close' %>

data/app/views/spree/admin/promotions/_promotion_action.html.erb

@@ -2,7 +2,7 @@
   <% type_name = promotion_action.class.name.demodulize.underscore %>
   <div class="card-header d-flex justify-content-between">
     <%= link_to_with_icon 'delete.svg', '', spree.admin_promotion_promotion_action_path(@promotion, promotion_action), remote: true, method: :delete, class: 'delete order-2' %>
-    <h3 class="card-title h5 mb-0 promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h3>
+    <h5 class="card-title h5 mb-0 promotion-title"><%= Spree.t("promotion_action_types.#{type_name}.description") %></h5>
   </div>
   <% param_prefix = "promotion[promotion_actions_attributes][#{promotion_action.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_action.id %>

data/app/views/spree/admin/promotions/_promotion_rule.html.erb

@@ -6,9 +6,9 @@
       remote: true,
       method: :delete,
       class: 'delete order-2' %>
-    <h3 class='card-title h5 mb-0 promotion-title'>
+    <h5 class='card-title h5 mb-0 promotion-title'>
       <%= Spree.t("promotion_rule_types.#{type_name}.description") %>
-    </h3>
+    </h5>
   </div>
   <% param_prefix = "promotion[promotion_rules_attributes][#{promotion_rule.id}]" %>
   <%= hidden_field_tag "#{param_prefix}[id]", promotion_rule.id %>

data/app/views/spree/admin/promotions/_rules.html.erb

@@ -1,7 +1,7 @@
 <div class="card-header">
-  <h1 class="card-title mb-0 h5">
+  <h5 class="card-title mb-0 h6">
     <%= Spree.t(:rules) %>
-  </h1>
+  </h5>
 </div>
 <div id="rule_fields" class="card-body">
 

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -40,7 +40,7 @@
             name="{{valueField.name}}" type="text" value={{valueField.value}}>
         </div>
       </div>
-      <a class="js-remove-tier btn btn-outline-secondary btn-sm"><span class="icon icon-delete"></span></a>
+      <a class="js-remove-tier btn btn-light btn-sm"><span class="icon icon-delete"></span></a>
     </div>
   </div>
 </script>

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -40,7 +40,7 @@
             name="{{valueField.name}}" type="text" value={{valueField.value}}>
         </div>
       </div>
-      <a class="js-remove-tier btn btn-outline-secondary btn-sm"><span class="icon icon-delete"></span></a>
+      <a class="js-remove-tier btn btn-light btn-sm"><span class="icon icon-delete"></span></a>
     </div>
   </div>
 </script>

data/app/views/spree/admin/promotions/index.html.erb

@@ -43,9 +43,9 @@
 <% end %>
 
 <% if @promotions.any? %>
-  <div class="table-responsive">
+  <div class="table-responsive border rounded bg-white">
     <table class="table">
-      <thead>
+      <thead class="text-muted">
         <tr>
           <th><%= Spree.t(:name) %></th>
           <th><%= Spree.t(:code) %></th>
@@ -79,7 +79,7 @@
   </div>
   <%= render 'spree/admin/shared/index_table_options', collection: @promotions, simple: true %>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Promotion)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Promotion) %>!
   </div>

data/app/views/spree/admin/promotions/rules/_option_value.html.erb

@@ -2,7 +2,7 @@
   <div class="promo-rule-option-values">
     <div class="js-promo-rule-option-values"></div> <!-- display div for option value select -->
     <button class="btn btn-primary btn-success js-add-promo-rule-option-value">
-      <%= svg_icon name: "add.svg", width: '16', height: '16' %>
+      <%= svg_icon name: "plus-circle", width: '16', height: '16' %>
       <%= Spree.t(:add) %>
     </button>
   </div>

data/app/views/spree/admin/properties/_form.html.erb

@@ -1,14 +1,14 @@
 <div data-hook="admin_property_form" class="row">
   <div class="col-12 col-md-6">
     <%= f.field_container :name do %>
-      <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+      <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
     <%= f.field_container :presentation do %>
-      <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
+      <%= f.label :presentation, raw(Spree.t(:presentation) + required_span_tag) %>
       <%= f.text_field :presentation, class: 'form-control' %>
       <%= f.error_message_on :presentation %>
     <% end %>

data/app/views/spree/admin/properties/index.html.erb

@@ -47,9 +47,9 @@
 <% end %>
 
 <% if @properties.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_properties' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="listing_properties_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:presentation) %></th>
@@ -77,7 +77,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center w-100 no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Property)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::OptionType) %>!
   </div>

data/app/views/spree/admin/prototypes/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-hook="admin_prototype_form_fields">
   <%= f.field_container :name do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -1,6 +1,6 @@
-<div class="table-responsive">
-  <table class="table table-condensed table-bordered">
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded">
+    <thead class="text-muted">
       <tr data-hook="available_header">
         <th><%= Spree.t(:name) %></th>
         <th class="actions"></th>

data/app/views/spree/admin/prototypes/index.html.erb

@@ -7,9 +7,9 @@
 <% end if can?(:create, Spree::Prototype) %>
 
 <% if @prototypes.any? %>
-  <div class="table-responsive">
+  <div class="table-responsive border rounded bg-white">
     <table class="table" id='listing_prototypes' data-hook>
-      <thead>
+      <thead class="text-muted">
         <tr data-hook="prototypes_header">
           <th><%= Spree.t(:name) %></th>
           <th class="actions"></th>
@@ -31,7 +31,7 @@
     </table>
   </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Prototype)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Prototype) %>!
   </div>

data/app/views/spree/admin/reimbursement_types/index.html.erb

@@ -7,9 +7,9 @@
 <% end if can?(:create, Spree::ReimbursementType) %>
 
 <% if @reimbursement_types.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_reimbursement_types' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="reimbursement_types_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:type) %></th>
@@ -37,7 +37,7 @@
   </table>
   </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReimbursementType)) %>
   </div>
 <% end %>

data/app/views/spree/admin/reimbursements/edit.html.erb

@@ -9,9 +9,9 @@
 <%= form_for [:admin, @order, @reimbursement] do |f| %>
   <fieldset class='no-border-bottom'>
     <legend><%= Spree.t(:items_to_be_reimbursed) %></legend>
-    <div class="table-responsive">
-      <table class="table table-condensed table-bordered reimbursement-return-items-table">
-        <thead>
+    <div class="table-responsive border rounded bg-white">
+      <table class="table table-condensed border rounded reimbursement-return-items-table">
+        <thead class="text-muted">
           <tr>
             <th><%= Spree.t(:product) %></th>
             <th><%= Spree.t(:preferred_reimbursement_type) %></th>
@@ -68,8 +68,8 @@
 
 <fieldset class="mt-3">
   <legend><%= Spree.t(:calculated_reimbursements) %></legend>
-  <div class="table-responsive">
-    <table class="table table-condensed table-bordered">
+  <div class="table-responsive border rounded bg-white">
+    <table class="table table-condensed border rounded">
       <thead data-hook="customer_return_header">
         <tr>
           <th><%= Spree.t(:reimbursement_type) %></th>

data/app/views/spree/admin/reimbursements/index.html.erb

@@ -5,7 +5,7 @@
 <% end %>
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @customer_return } %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
     <thead data-hook="customer_return_header">
       <tr>

data/app/views/spree/admin/reimbursements/show.html.erb

@@ -8,9 +8,9 @@
 
 <fieldset class='no-border-bottom'>
   <legend><%= Spree.t(:items_reimbursed) %></legend>
-  <div class="table-responsive">
-    <table class="table table-condensed table-bordered reimbursement-reimbursement-items-table">
-      <thead>
+  <div class="table-responsive border rounded bg-white">
+    <table class="table table-condensed border rounded reimbursement-reimbursement-items-table">
+      <thead class="text-muted">
         <tr>
           <th><%= Spree.t(:product) %></th>
           <th><%= Spree.t(:preferred_reimbursement_type) %></th>
@@ -53,8 +53,8 @@
 
 <fieldset>
   <legend><%= Spree.t(:refunds) %></legend>
-  <div class="table-responsive">
-    <table class="table table-condensed table-bordered">
+  <div class="table-responsive border rounded bg-white">
+    <table class="table table-condensed border rounded">
       <thead data-hook="customer_return_header">
         <tr>
           <th><%= Spree.t(:description) %></th>
@@ -76,8 +76,8 @@
 <% if @reimbursement.credits.any? %>
   <fieldset>
     <legend><%= Spree.t(:credits) %></legend>
-    <div class="table-responsive">
-      <table class="table table-condensed table-bordered">
+    <div class="table-responsive border rounded bg-white">
+      <table class="table table-condensed border rounded">
         <thead data-hook="customer_return_header">
           <tr>
             <th><%= Spree.t(:description) %></th>

data/app/views/spree/admin/reports/index.html.erb

@@ -1,9 +1,9 @@
 <% content_for :page_title do %>
   <%= Spree.t(:reports) %> <%= Spree.t('admin.reports.for', store_name: current_store.unique_name) %>
 <% end %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="reports_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:description) %></th>

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -8,9 +8,9 @@
     <%= render partial: 'spree/admin/shared/report_order_criteria' %>
   </div>
 </div>
-<div class="table-responsive">
-  <table class="table table-bordered admin-report" data-hook="sales_total">
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table admin-report" data-hook="sales_total">
+    <thead class="text-muted">
       <tr>
         <th><%= Spree.t(:currency) %></th>
         <th><%= Spree.t(:item_total) %></th>

data/app/views/spree/admin/return_authorizations/_form.html.erb

@@ -1,9 +1,9 @@
 <% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
 
 <div data-hook="admin_return_authorization_form_fields">
-<div class="table-responsive">
-  <table class="table table-condensed table-bordered return-items-table">
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded return-items-table">
+    <thead class="text-muted">
       <tr data-hook="rma_header">
         <th>
           <% if allow_return_item_changes %>
@@ -83,13 +83,13 @@
   <% end %>
 
   <%= f.field_container :stock_location do %>
-    <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
+    <%= f.label :stock_location, raw(Spree.t(:stock_location) + required_span_tag) %>
     <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location %>
   <% end %>
 
   <%= f.field_container :reason do %>
-    <%= f.label :reason, Spree.t(:reason) %> <span class="required">*</span>
+    <%= f.label :reason,raw(Spree.t(:reason) + required_span_tag) %>
     <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
     <%= f.error_message_on :reason %>
   <% end %>

data/app/views/spree/admin/return_authorizations/index.html.erb

@@ -6,12 +6,8 @@
   <% end %>
 <% end %>
 
-<% content_for :page_title do %>
-  / <%= Spree.t(:return_authorizations) %>
-<% end %>
-
 <% if @order.shipments.any?(&:shipped?) && @order.return_authorizations.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
     <thead data-hook="rma_header">
       <tr>
@@ -27,9 +23,9 @@
         <tr id="<%= spree_dom_id(return_authorization) %>" data-hook="rma_row">
           <td><%= return_authorization.number %></td>
           <td>
-            <strong class="badge badge-<%= return_authorization.state %> text-uppercase">
+            <small class="badge badge-pill badge-<%= return_authorization.state %>">
               <%= Spree.t("return_authorization_states.#{return_authorization.state}") %>
-            </strong>
+            </small>
           </td>
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
@@ -47,11 +43,11 @@
   </table>
 </div>
 <% elsif @order.shipments.any?(&:shipped?) %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReturnAuthorization)) %>
   </div>
 <% else %>
-  <div data-hook="rma_cannot_create" class="alert alert-info no-objects-found">
+  <div data-hook="rma_cannot_create" class="text-center no-objects-found m-5">
     <%= Spree.t(:cannot_create_returns) %>
   </div>
 <% end %>

data/app/views/spree/admin/return_index/customer_returns.html.erb

@@ -21,9 +21,9 @@
 <% end %>
 
 <% if @collection.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="rate_header">
         <th><%= Spree.t(:created_at) %></th>
         <th><%= Spree.t(:number) %></th>
@@ -41,9 +41,9 @@
           <td><%= link_to customer_return.order.number, spree.edit_admin_order_path(customer_return.order) %></td>
           <td>
             <% if customer_return.fully_reimbursed? %>
-              <span class="badge badge-success text-uppercase"><%= Spree.t(:reimbursed) %></span>
+              <span class="badge badge-pill badge-success"><%= Spree.t(:reimbursed) %></span>
             <% else %>
-              <span class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></span>
+              <span class="badge badge-pill badge-inactive"><%= Spree.t(:incomplete) %></span>
             <% end %>
           </td>
           <td><%= customer_return.display_pre_tax_total.to_html %></td>
@@ -58,7 +58,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CustomerReturn)) %>.  </div>
 <% end %>
 

data/app/views/spree/admin/return_index/return_authorizations.html.erb

@@ -45,9 +45,9 @@
 <% end %>
 
 <% if @collection.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="rate_header">
         <th><%= Spree.t(:created_at) %></th>
         <th><%= Spree.t(:number) %></th>
@@ -63,7 +63,7 @@
           <td><%= link_to return_authorization.number, spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization) %></td>
           <td><%= link_to return_authorization.order.number, spree.edit_admin_order_path(return_authorization.order) %></td>
           <td>
-            <span class="badge badge-<%= return_authorization.state %> text-uppercase"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
+            <span class="badge badge-pill badge-<%= return_authorization.state %>"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
           </td>
           <td class="actions">
             <span class="d-flex justify-content-end">
@@ -76,7 +76,7 @@
   </table>
   </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::ReturnAuthorization)) %>.
   </div>
 <% end %>

data/app/views/spree/admin/roles/_form.html.erb

@@ -1,6 +1,6 @@
 <div data-hook="admin_role_form_fields">
   <%= f.field_container :name, 'data-hook' => "role_name" do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>

data/app/views/spree/admin/roles/index.html.erb

@@ -7,9 +7,9 @@
 <% end if can? :create, Spree::Role %>
 
 <% if @roles.any? %>
-  <div class="table-responsive">
+  <div class="table-responsive border rounded bg-white">
     <table class="table">
-      <thead>
+      <thead class="text-muted">
         <tr data-hook="admin_roles_index_headers">
           <th><%= Spree.t(:role_id) %></th>
           <th class="actions"></th>

data/app/views/spree/admin/shared/_account_nav.html.erb

@@ -7,12 +7,12 @@
 
     <div class="dropdown-menu dropdown-menu-right overflow-hidden mt-2 p-0 mr-2">
       <div class="dropdown-item px-0 text-center bg-light">
-        <span class="d-block text-dark py-2 px-4"><%= try_spree_current_user.email %></span>
+        <span class="d-block py-2 px-4"><%= try_spree_current_user.email %></span>
       </div>
       <div class="dropdown-divider m-0"></div>
 
       <% if spree.respond_to? :root_path %>
-          <%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item', data: { turbo: false } do %>
+          <%= link_to spree.root_path, target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item', data: { turbo: false } do %>
             <%= svg_icon name: "store.svg", width: '18', height: '18' %>
             &nbsp;
             <%= Spree.t(:back_to_store) %>
@@ -20,7 +20,7 @@
       <% end %>
 
       <% if can?(:manage, try_spree_current_user) %>
-          <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+          <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
             <%= svg_icon name: "user.svg", width: '18', height: '18' %>
             &nbsp;
             <%= Spree.t(:account) %>
@@ -28,7 +28,7 @@
       <% end %>
 
       <% if admin_logout_link %>
-          <%= link_to admin_logout_link, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+          <%= link_to admin_logout_link, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
             <%= svg_icon name: "exit.svg", width: '18', height: '18' %>
             &nbsp;
             <%= Spree.t(:logout) %>
@@ -37,19 +37,19 @@
 
       <div class="dropdown-divider m-0"></div>
 
-        <%= link_to 'http://spreecommerce.org/contact', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'http://spreecommerce.org/contact', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
         <%= svg_icon name: "info.svg", width: '18', height: '18' %>
           &nbsp;
           <%= Spree.t(:support) %>
         <% end %>
 
-        <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
         <%= svg_icon name: "slack.svg", width: '18', height: '18' %>
           &nbsp;
           <%= Spree.t(:join_slack) %>
         <% end %>
 
-        <%= link_to 'https://dev-docs.spreecommerce.org/extensions/extensions', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'https://dev-docs.spreecommerce.org/extensions/extensions', target: :blank, class: 'd-block py-2 px-4 my-1 dropdown-item' do %>
         <%= svg_icon name: "extensions.svg", width: '18', height: '18' %>
           &nbsp;
           <%= Spree.t(:extensions_directory) %>

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -38,7 +38,6 @@
 <% content_for :head do %>
   <script>
     document.addEventListener("spree:load", function() {
-      updateAddressState('<%= s_or_b %>');
       $('#<%= s_or_b %>country select').on('change', function() { updateAddressState('<%= s_or_b %>'); });
     })
   </script>

data/app/views/spree/admin/shared/_calculator_fields.html.erb

@@ -1,9 +1,9 @@
 <div id="calculator_fields" data-hook class="card mb-3">
 
   <div class="card-header">
-    <h1 class="card-title mb-0 h5">
+    <h5 class="card-title mb-0 h6">
       <%= Spree.t(:calculator) %>
-    </h1>
+    </h5>
   </div>
 
   <div id="preference-settings" data-hook class="card-body">