spree_backend 4.7.2 → 4.8.1

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

@@ -15,7 +15,7 @@
               <%= link_to_with_icon 'save.svg',
                 Spree.t(:select),
                 select_admin_prototype_url(prototype),
-                class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
+                class: 'btn btn-primary btn-sm ajax select_properties_from_prototype',
                 no_text: true %>
             </span>
           </td>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-success", icon: 'add.svg', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
+  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-primary", icon: 'add.svg', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
 <% end if can?(:create, Spree::Prototype) %>
 
 <% if @prototypes.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-success", :icon => 'add.svg', :id => 'admin_new_reimbursement_type' } %>
+  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-primary", :icon => 'add.svg', :id => 'admin_new_reimbursement_type' } %>
 <% end if can?(:create, Spree::ReimbursementType) %>
 
 <% if @reimbursement_types.any? %>

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::ReturnAuthorization) %>
-    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), class: "btn-success", icon: 'add.svg' %>
+    <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), class: "btn-primary", icon: 'add.svg' %>
   <% end %>
 <% end %>
 

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_role_link' %>
+  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_role_link' %>
 <% end if can? :create, Spree::Role %>
 
 <% if @roles.any? %>

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

@@ -7,53 +7,67 @@
 
     <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 py-2 px-4"><%= try_spree_current_user.email %></span>
+        <span class="d-block"><%= try_spree_current_user.try(: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 py-2 px-4 my-1 dropdown-item', data: { turbo: false } do %>
-            <%= svg_icon name: "store.svg", width: '18', height: '18' %>
+          <%= link_to spree.root_path, target: :blank, class: 'd-block my-1 dropdown-item', data: { turbo: false } do %>
+            <%= svg_icon name: "store.svg", width: '14', height: '14' %>
             &nbsp;
             <%= Spree.t(:back_to_store) %>
           <% end %>
       <% end %>
 
-      <% if can?(:manage, try_spree_current_user) %>
-          <%= 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' %>
+      <% if can?(:manage, try_spree_current_user) && try_spree_current_user.persisted? %>
+          <%= link_to spree.edit_admin_user_path(try_spree_current_user), class: 'd-block my-1 dropdown-item' do %>
+            <%= svg_icon name: "user.svg", width: '14', height: '14' %>
             &nbsp;
             <%= Spree.t(:account) %>
           <% end %>
       <% end %>
 
       <% if admin_logout_link %>
-          <%= 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' %>
+          <%= link_to admin_logout_link, class: 'd-block my-1 dropdown-item' do %>
+            <%= svg_icon name: "exit.svg", width: '14', height: '14' %>
             &nbsp;
             <%= Spree.t(:logout) %>
           <% end %>
       <% end %>
 
-      <div class="dropdown-divider m-0"></div>
+      <div class="dropdown-divider"></div>
+
+        <%= link_to 'http://docs.spreecommerce.org', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "book.svg", width: '14', height: '14' %>
+          &nbsp;
+          <%= Spree.t(:documentation) %>
+        <% end %>
 
-        <%= 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' %>
+        <%= link_to 'http://spreecommerce.org/contact', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "chat-dots.svg", width: '14', height: '14' %>
           &nbsp;
-          <%= Spree.t(:support) %>
+          <%= Spree.t(:enterprise_support) %>
         <% end %>
 
-        <%= 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' %>
+        <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "slack.svg", width: '14', height: '14' %>
           &nbsp;
           <%= Spree.t(:join_slack) %>
         <% end %>
 
-        <%= 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' %>
+        <%= link_to 'https://docs.spreecommerce.org/developer/extending-spree/3rd-party-extensions', target: :blank, class: 'd-block my-1 dropdown-item' do %>
+        <%= svg_icon name: "extensions.svg", width: '14', height: '14' %>
           &nbsp;
-          <%= Spree.t(:extensions_directory) %>
+          <%= Spree.t(:extensions) %>
         <% end %>
+
+        <div class="dropdown-divider"></div>
+
+        <div class="dropdown-header">
+          Developed by
+        </div>
+
+        <%= link_to image_tag('vendo_logo.png', height: 24), 'https://getvendo.com?utm_source=spree-admin', target: :blank, class: 'dropdown-item mb-2 with-tip', title: 'Vendo - The fastest way to build your own e-commerce business', data: { toggle: 'tooltip', placement: 'left' } %>
     </div>
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+  <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-primary', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
   <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
 </div>

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

@@ -13,6 +13,12 @@
   <% end %>
 </title>
 
+<%= favicon_link_tag asset_path('favicon.png') %>
+
+<link rel="preconnect" href="https://fonts.googleapis.com">
+<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+<link href="https://fonts.googleapis.com/css2?family=Inter:wght@100..900&display=swap" rel="stylesheet">
+
 <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
 
 <script>
@@ -22,7 +28,7 @@
 </script>
 
 <%= render 'spree/admin/shared/paths' %>
-<%= javascript_include_tag "spree-dashboard", defer: true, data: { turbo_track: "reload" } %>
+<%= javascript_importmap_tags 'application-spree-backend' %>
 <%= javascript_include_tag 'spree/backend/all', data: { turbo_track: "reload" } %>
 <%= render "spree/admin/shared/translations" %>
 

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

@@ -1,22 +1,30 @@
-<header class="header logged-in">
-  <nav class="navbar fixed-top navbar-dark flex-nowrap bg-primary p-0">
-    <div class="col p-0 d-lg-none">
-      <button
-        id="sidebar-open"
-        class="navbar-toggler h-100 text-light px-3"
-        type="button"
-        aria-expanded="false"
-        aria-label="Toggle navigation">
-        <%= svg_icon name: "menu.svg", width: '20', height: '20' %>
-      </button>
-    </div>
+<% if try_spree_current_user %>
+  <header class="header logged-in" id="header-logged-in" data-turbo-permanent>
+    <nav class="navbar fixed-top navbar-dark flex-nowrap bg-primary p-0">
+      <div class="col p-0 d-lg-none">
+        <button
+          id="sidebar-open"
+          class="navbar-toggler h-100 text-light px-3"
+          type="button"
+          aria-expanded="false"
+          aria-label="Toggle navigation">
+          <%= svg_icon name: "menu.svg", width: '20', height: '20' %>
+        </button>
+      </div>
 
-    <div id="storeSwitcherDropdown" class="col-auto text-center text-lg-left px-0 px-lg-2 align-items-center dropdown">
-      <%= render partial: 'spree/admin/shared/store_switcher' %>
-    </div>
+      <div id="storeSwitcherDropdown" class="col-auto text-center text-lg-left px-0 px-lg-2 align-items-center dropdown">
+        <%= render partial: 'spree/admin/shared/store_switcher' %>
+      </div>
 
-    <div class="col text-right p-0">
-      <%= render partial: 'spree/admin/shared/account_nav' %>
+      <div class="col text-right p-0">
+        <%= render partial: 'spree/admin/shared/account_nav' %>
+      </div>
+    </nav>
+  </header>
+<% else %>
+  <header class="header">
+    <div class="text-center">
+      <%= image_tag 'logo_light.png', height: 48 %>
     </div>
-  </nav>
-</header>
+  </header>
+<% end %>

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

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+  <%= button Spree.t('actions.create'), 'save.svg', 'submit', {class: 'btn-primary', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
   <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg', data: { turbo: false } %>
 </div>

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

@@ -4,15 +4,5 @@
 <% end %>
 
 <% content_for :page_tabs do %>
-  <% order_tabs.items.each do |tab| %>
-    <% next unless tab.available?(current_ability, @order) %>
-      <%= content_tag :li, class: 'nav-item', data: { hook: tab.data_hook } do %>
-        <%= link_to_with_icon(
-          tab.icon_key,
-          Spree.t(tab.label_translation_key),
-          tab.url(@order),
-          class: tab.active?(current) ? 'active nav-link' : 'nav-link'
-        ) %>
-      <% end %>
-  <% end %>
+  <%= render partial: 'spree/admin/shared/tabs', locals: { tabs: order_tabs, object: @order, current: current } %>
 <% end %>

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

@@ -4,15 +4,5 @@
 <% end %>
 
 <% content_for :page_tabs do %>
-  <% product_tabs.items.each do |tab| %>
-    <% next unless tab.available?(current_ability, @product) %>
-      <li class="nav-item">
-        <%= link_to_with_icon(
-          tab.icon_key,
-          Spree.t(tab.label_translation_key),
-          tab.url(@product),
-          class: tab.active?(current) ? 'active nav-link' : 'nav-link'
-        ) %>
-      </li>
-  <% end %>
+  <%= render partial: 'spree/admin/shared/tabs', locals: { tabs: product_tabs, object: @product, current: current } %>
 <% end %>

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

@@ -1,10 +1,10 @@
 <% if can?(:admin, current_store) %>
     <span class="d-none d-lg-inline text-light pl-1 pr-2">
-      <%= svg_icon name: "spree-icon.svg", width: '28', height: '28' %>
+      <%= image_tag('favicon_dark_bg.png', alt: 'Spree Commerce', height: 28) %>
     </span>
 
     <a class="px-0 py-1 btn text-light" id="storeSelectorDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-     <span class="d-sm-none"><%= svg_icon name: "store.svg", width: '18', height: '18' %></span>
+     <span class="d-sm-none"><%= svg_icon name: "store.svg", width: '14', height: '14' %></span>
      <span class="d-none d-sm-inline"><%= current_store.name %></span> (<%= current_store.code %>) <%= svg_icon name: "chevron-down.svg", width: '12', height: '12', classes: 'ml-1 mb-0' %>
     </a>
 
@@ -14,9 +14,9 @@
       <% end %>
 
       <% if can?(:create, Spree::Store) %>
-        <div class="dropdown-divider m-0"></div>
-        <%= link_to spree.new_admin_store_path, class: 'py-2 px-4 mt-1 mb-0 dropdown-item', id: 'addNewStoreLink' do %>
-          <%= svg_icon name: "plus-circle", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
+        <div class="dropdown-divider"></div>
+        <%= link_to spree.new_admin_store_path, class: 'dropdown-item', id: 'addNewStoreLink' do %>
+          <%= svg_icon name: "plus-circle", width: '14', height: '14' %> <%= Spree.t(:add_new_store) %>
         <% end %>
       <% end %>
     </div>

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

@@ -0,0 +1,11 @@
+<% tabs.items.each do |tab| %>
+  <% next unless tab.available?(current_ability, object) %>
+  <%= content_tag :li, class: 'nav-item', data: { hook: tab.data_hook } do %>
+    <%= link_to_with_icon(
+      tab.icon_key,
+      Spree.t(tab.label_translation_key),
+      tab.url(object),
+      class: tab.active?(current) ? 'active nav-link' : 'nav-link'
+    ) %>
+  <% end %>
+<% end %>

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

@@ -1,9 +1,22 @@
-<% if can?(:admin, current_store) && Spree::Backend::Config[:admin_show_version] %>
-  <p
-    class="spree-version ml-3 my-3"
+<% if spree_admin_show_version? %>
+  <div
+    class="spree-version px-3 py-2"
     aria-label="Spree Commerce version">
-    <span class="badge badge-pill badge-info">
-    <%= Spree.version %>
-    </span>
-  </p>
+    <div class="d-flex align-items-center justify-content-between">
+      <span class="text-muted small">
+        <%= link_to Spree.version, "https://github.com/spree/spree/releases/tag/v#{Spree.version}", target: '_blank' %>
+      </span>
+      <% if spree_update_available? %>
+        <span class="small text-info">
+          <%= Spree.t(:update_available) %>!
+        </span>
+      <% end %>
+    </div>
+    
+    <% if spree_update_available? %>
+      <a href="https://docs.spreecommerce.org/developer/upgrades" target="_blank" class="mt-2 btn btn-sm btn-primary with-tip btn-block" title="Update your Spree instance to the latest version">
+        <%= Spree.t(:update_spree) %>
+      </a>
+    <% end %>
+  </div>
 <% end %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to new_button_text, new_object_url, { icon: 'add.svg', id: 'admin_new_named_type', class: "btn-success" } %>
+  <%= button_link_to new_button_text, new_object_url, { icon: 'add.svg', id: 'admin_new_named_type', class: "btn-primary" } %>
 <% end if can? :create, resource %>
 
 <% if @collection.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-success", icon: 'add.svg' %>
+  <%= button_link_to Spree.t(:new_shipping_category), new_object_url, class: "btn-primary", icon: 'add.svg' %>
 <% end if can? :create, Spree::ShippingCategory %>
 
 <% if @shipping_categories.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-success", icon: 'add.svg', id: 'admin_new_shipping_method_link' %>
+  <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  class: "btn-primary", icon: 'add.svg', id: 'admin_new_shipping_method_link' %>
 <% end if can? :create, Spree::ShippingMethod %>
 
 <% if @shipping_methods.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-success", icon: 'add.svg', id: 'new_state_link' } %>
+  <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { class: "btn-primary", icon: 'add.svg', id: 'new_state_link' } %>
 <% end if can? :create, Spree::State %>
 
 <div data-hook="country" class="form-group">

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_stock_location' } %>
+  <%= button_link_to Spree.t(:new_stock_location), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'admin_new_stock_location' } %>
 <% end if can? :create, Spree::StockLocation %>
 
 <% if @stock_locations.any? %>

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

@@ -4,7 +4,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add.svg', class: 'btn-success', id: 'admin_new_stock_movement_link' %>
+  <%= button_link_to Spree.t(:new_stock_movement), new_admin_stock_location_stock_movement_path(@stock_location), icon: 'add.svg', class: 'btn-primary', id: 'admin_new_stock_movement_link' %>
 <% end %>
 
 <% if @stock_movements.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add.svg', class: 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add.svg', class: 'btn-primary' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
 <% content_for :table_filter do %>

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

@@ -4,7 +4,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-success' } %>
+  <%= button_link_to Spree.t(:new_stock_transfer), new_admin_stock_transfer_path, { icon: 'add', class: 'btn-primary' } %>
 <% end if can? :create, Spree::StockTransfer %>
 
 <fieldset>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_store_credit_category_link' %>
+  <%= button_link_to Spree.t(:new_store_credit_category), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_store_credit_category_link' %>
 <% end if can? :create, Spree::StoreCreditCategory %>
 
 <% if @store_credit_categories.any? %>

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

@@ -9,7 +9,7 @@
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+      <%= button Spree.t('actions.update'), 'save.svg', 'submit', {class: 'btn-primary', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
 
       <%= link_to_with_icon 'delete.svg', Spree.t(:delete), spree.admin_store_url(@store), { class: 'btn btn-danger float-right', data: { confirm: Spree.t(:are_you_sure), method: :delete } } if can?(:delete, @store) && @store.can_be_deleted? %>
     </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-success", icon: 'add.svg' if can?(:create, Spree::Store) %>
+  <%= button_link_to Spree.t(:add_store), spree.new_admin_store_path(@user), class: "btn-primary", icon: 'add.svg' if can?(:create, Spree::Store) %>
 <% end %>
 
 <% if @stores.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_tax_categories_link' %>
+  <%= button_link_to Spree.t(:new_tax_category), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_tax_categories_link' %>
 <% end if can? :create, Spree::TaxCategory %>
 
 <% if @tax_categories.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-success", icon: 'add.svg' %>
+  <%= button_link_to Spree.t(:new_tax_rate), new_object_url, class: "btn-primary", icon: 'add.svg' %>
 <% end if can? :create, Spree::TaxRate %>
 
 <% if @tax_rates.any? %>

data/app/views/spree/admin/taxonomies/_list.html.erb

@@ -11,7 +11,7 @@
       <% @taxonomies.each do |taxonomy| %>
         <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
           <td class="move-handle">
-            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
           </td>
           <td><%= taxonomy.name %></td>
           <td class="actions">

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

@@ -13,7 +13,7 @@
               <%= button_link_to Spree.t('admin.taxonomies.edit_root_taxonomy', name: @taxonomy.root.name ), spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id), icon: 'edit.svg', class: 'no-wrap btn-light align-self-center' %>
             </div>
             <div class="col d-flex my-1 justify-content-end">
-              <%= button_link_to Spree.t('admin.taxonomies.add_new_taxon'), spree.new_admin_taxonomy_taxon_path(@taxonomy.id), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+              <%= button_link_to Spree.t('admin.taxonomies.add_new_taxon'), spree.new_admin_taxonomy_taxon_path(@taxonomy.id), icon: 'add.svg', class: 'no-wrap btn btn-primary align-self-center' %>
             </div>
           </div>
         </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_taxonomy_link' %>
+  <%= button_link_to Spree.t(:new_taxonomy), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_taxonomy_link' %>
 <% end if can?(:create, Spree::Taxonomy) %>
 
 <% if @taxonomies.any? %>

data/app/views/spree/admin/users/_tabs.html.erb

@@ -4,15 +4,5 @@
 <% end %>
 
 <% content_for :page_tabs do %>
-  <% user_tabs.items.each do |tab| %>
-    <% next unless tab.available?(current_ability, @user) %>
-      <li class="nav-item">
-        <%= link_to_with_icon(
-          tab.icon_key,
-          Spree.t(tab.label_translation_key),
-          tab.url(@user),
-          class: tab.active?(current) ? 'active nav-link' : 'nav-link'
-        ) %>
-      </li>
-  <% end %>
+  <%= render partial: 'spree/admin/shared/tabs', locals: { tabs: user_tabs, object: @user, current: current } %>
 <% end %>

data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb

@@ -23,7 +23,7 @@
             </td>
             <td class="actions">
               <span class="d-flex justify-content-center">
-                <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <button class="btn btn-sm btn-primary add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                    <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                 </button>
               </span>
@@ -39,7 +39,7 @@
               </td>
               <td class="actions">
                 <span class="d-flex justify-content-center">
-                  <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <button class="btn btn-sm btn-primary add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                      <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                   </button>
                 </span>
@@ -57,7 +57,7 @@
           </td>
           <td class="actions">
             <span class="d-flex justify-content-center">
-              <button class="btn btn-sm btn-success add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+              <button class="btn btn-sm btn-primary add_variant with-tip icon-add icon-link" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                 <%= svg_icon name: "add.svg", width: '16', height: '16' %>
               </button>
             </span>

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -19,7 +19,7 @@
             </td>
             <td class="actions">
               <span class="d-flex justify-content-center">
-                <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <button class="btn btn-sm btn-primary add_variant with-tip" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                   <%= svg_icon name: "add", width: '16', height: '16' %>
                 </button>
               </span>
@@ -35,7 +35,7 @@
               </td>
               <td class="actions">
                 <span class="d-flex justify-content-center">
-                  <button class="btn btn-sm btn-success add_variant with-tip icon-link" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <button class="btn btn-sm btn-primary add_variant with-tip icon-link" data-stock-location-id="{{this.stock_location.id}}" title="<%= Spree.t(:add) %>" data-action="add">
                     <%= svg_icon name: "add.svg", width: '16', height: '16' %>
                   </button>
                 </span>

data/app/views/spree/admin/variants/_split.js.erb

@@ -26,7 +26,7 @@
         <a href='#' class='cancel-split with-tip btn btn-sm btn-light' title='Cancel'>
           <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
         </a>
-        <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
+        <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-primary' title='Save'>
           <%= svg_icon name: "split", classes: 'icon-save', width: '16', height: '16' %>
         </a>
       </span>

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

@@ -20,7 +20,7 @@
       <tr id="<%= spree_dom_id variant %>" <%= 'style="color:red;"' if variant.deleted? %> data-hook="variants_row">
         <td class="move-handle">
           <% if can? :edit, variant %>
-            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
           <% end %>
         </td>
         <td><%= variant.sku %></td>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_webhooks_subscriber_link' %>
+  <%= button_link_to Spree.t('admin.webhooks_subscribers.new_webhooks_subscriber'), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_webhooks_subscriber_link' %>
 <% end if can?(:create, Spree::Webhooks::Subscriber) %>
 
 <% if @webhooks_subscribers.any? %>
@@ -37,7 +37,7 @@
             <%= password_field_tag :password, webhooks_subscriber.secret_key, class: 'form-control unhide text-muted border-0 shadow-none bg-transparent', data: { password_toggle_target: 'unhide' }, readonly: true %>
             <div class="input-group-append">
               <%= button_tag class: 'btn btn-link rounded', data: { action: 'click->password-toggle#password' } do %>
-                <%= svg_icon name: "view.svg", width: '18', height: '18' %>
+                <%= svg_icon name: "view.svg", width: '14', height: '14' %>
               <% end %>
             </div>
           </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_zone_link' %>
+  <%= button_link_to Spree.t(:new_zone), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_zone_link' %>
 <% end if can? :create, Spree::Zone %>
 
 <% if @zones.any? %>