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
Improve UX of tooltips, bulk operations, sortable
Damian Legawiec1d295eb24263
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss b/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scssindex 6df84ea1df..dd3757e987 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss@@ -7,7 +7,11 @@box-shadow: $dropdown-box-shadow;animation: bounceInUp;animation-duration: 0.5s;- gap: 0.75rem;+ gap: 0.5rem;++ .btn {+ height: 2rem;+ }}#bulk-panel {@@ -38,4 +42,7 @@align-items: center;justify-content: center;gap: 0.25rem;+ margin-left: 1rem;+ margin-right: 1rem;+ border-left: 1px solid $gray-50;}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scssindex fce2dd140e..cfa763f46b 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss@@ -64,38 +64,38 @@ button[disabled] .show-when-enabled { display: none; }.btn-hover {&:hover, &:focus {- text-decoration: none !important;- background-color: $gray-50 !important;+ text-decoration: none;+ background-color: $gray-50;}}.hover-light {&:hover, &:focus {- background-color: $gray-25 !important;- text-decoration: none !important;+ background-color: $gray-25;+ text-decoration: none;}}.hover-gray {&:hover, &:focus {- background-color: $gray-100 !important;- text-decoration: none !important;+ background-color: $gray-100;+ text-decoration: none;}}.hover-gray-50 {&:hover, &:focus {- background-color: $gray-50 !important;- text-decoration: none !important;+ background-color: $gray-50;+ text-decoration: none;}}.hover-gray-200 {&:hover, &:focus {- background-color: $gray-200 !important;- text-decoration: none !important;+ background-color: $gray-200;+ text-decoration: none;}}.hover-primary {&:hover, &:focus {- background-color: theme-color('black') !important;- text-decoration: none !important;+ background-color: theme-color('black');+ text-decoration: none;}}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss b/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scssindex ff7f633f9e..5fac0c6b5a 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss@@ -35,8 +35,12 @@}.sortable-chosen {- border: 1px dashed var(--gray);- border-radius: 5px;+ background-color: transparent !important;+ border-color: transparent !important;+ .sortable-tree-item-row {+ background-color: $action !important;+ border: 1px dashed rgba($blue, 0.5) !important;+ }}.item_image_holder {diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scssindex f8ea5446de..fd7453cbfa 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss@@ -79,7 +79,7 @@ table.table {}}- tr:hover:not(.active) {+ tr:hover:not(.active):not(.sortable-chosen) {td {background-color: $gray-25;}diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scssindex a9e1ec6fa5..d64990db53 100644--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss@@ -224,19 +224,6 @@ strong {z-index: 99999999;}-figure.admin-img-holder {- max-width: 275px;- border: 2px dashed grey;- border-radius: $border-radius;- overflow: hidden;- display: inline-block;-- img {- max-width: 100%;- height: auto;- }-}-.image-container {.img-fluid {transition: transform .5s ease;@@ -388,8 +375,8 @@ small,}.sortable-chosen {- border: 2px dashed theme-color('primary') !important;- border-radius: 5px !important;+ background-color: theme-color('action') !important;+ border: 2px dashed $blue !important;}.handle {diff --git a/admin/app/helpers/spree/admin/bulk_operations_helper.rb b/admin/app/helpers/spree/admin/bulk_operations_helper.rbindex c12827ea79..8d64132b7b 100644--- a/admin/app/helpers/spree/admin/bulk_operations_helper.rb+++ b/admin/app/helpers/spree/admin/bulk_operations_helper.rb@@ -51,7 +51,13 @@ module Spreeoptions[:class] ||= 'btn btn-light'if options[:icon]- text = icon(options[:icon]) + ' ' + text+ if options[:only_icon]+ options[:title] = text+ text = icon(options[:icon], class: 'mr-0')+ options[:class] += ' with-tip'+ else+ text = icon(options[:icon]) + ' ' + text+ endendcontent_tag :span, data: { toggle: 'modal', target: '#bulk-modal' } do@@ -76,7 +82,7 @@ module Spree# render a counter for the bulk operations# @return [String]def bulk_operations_counter- content_tag(:span, class: 'bulk-operations-counter ml-1') do+ content_tag(:span, class: 'bulk-operations-counter') docontent_tag(:strong, '', data: { bulk_operation_target: 'counter' }) +Spree.t("admin.selected")enddiff --git a/admin/app/javascript/spree/admin/helpers/bootstrap.js b/admin/app/javascript/spree/admin/helpers/bootstrap.jsindex 3218fbbb51..7721e5201b 100644--- a/admin/app/javascript/spree/admin/helpers/bootstrap.js+++ b/admin/app/javascript/spree/admin/helpers/bootstrap.js@@ -4,11 +4,11 @@ import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'const initTooltips = () => {- $('.with-tip, .trix-button').each(function() {+ $('.with-tip, .trix-button, .uppy-Dashboard-close, time').each(function() {$(this).tooltip()})- $('.with-tip, .trix-button').on('show.bs.tooltip', function(event) {+ $('.with-tip, .trix-button, .uppy-Dashboard-close, time').on('show.bs.tooltip', function(event) {if (('ontouchstart' in window)) {event.preventDefault()}@@ -16,7 +16,7 @@ const initTooltips = () => {}const removeTooltips = () => {- $('.with-tip, .trix-button').each(function() {+ $('.with-tip, .trix-button, .uppy-Dashboard-close, time').each(function() {$(this).tooltip('dispose')})}diff --git a/admin/app/views/spree/admin/invitations/_invitation.html.erb b/admin/app/views/spree/admin/invitations/_invitation.html.erbindex dcd7f998b5..ddf8d9f533 100644--- a/admin/app/views/spree/admin/invitations/_invitation.html.erb+++ b/admin/app/views/spree/admin/invitations/_invitation.html.erb@@ -33,7 +33,7 @@<%= hidden_field_tag nil, spree.admin_invitation_url(invitation, token: invitation.token), data: { clipboard_target: "source" } %><button class="btn btn-sm btn-light" type="button" id="dropdownMenuButton-<%= invitation.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>+ <%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= invitation.id %>"><%= link_to_with_icon 'copy', Spree.t(:copy_link), '#',diff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erbindex 333e75a969..022aed2945 100644--- a/admin/app/views/spree/admin/orders/_customer.html.erb+++ b/admin/app/views/spree/admin/orders/_customer.html.erb@@ -5,7 +5,7 @@</h5><% if can?(:update_customer, @order) || can?(:update_addresses, @order) %><div class="dropdown ml-auto" id="customer-edit-dropdown">- <%= link_to_with_icon 'dots', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %>+ <%= link_to_with_icon 'dots-vertical', nil, '#', class: 'btn btn-light btn-sm px-2', data: { toggle: 'dropdown', test_id: 'dropdown-toggle' } %><div class="dropdown-menu dropdown-menu-right" ><div data-toggle="modal" data-target="#modal"><% if can?(:update_customer, @order) && [email protected]? %>diff --git a/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb b/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erbindex d9c35acb50..47c5de5b0e 100644--- a/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/_customer_return.html.erb@@ -35,7 +35,7 @@data-toggle="dropdown"aria-expanded="false">- <%= icon("dots", class: "mr-0") %>+ <%= icon('dots-vertical', class: "mr-0") %></button><div class="dropdown-menu"><%= link_to_edit(diff --git a/admin/app/views/spree/admin/payments/_payment.html.erb b/admin/app/views/spree/admin/payments/_payment.html.erbindex bbe179a75c..ab588515f1 100644--- a/admin/app/views/spree/admin/payments/_payment.html.erb+++ b/admin/app/views/spree/admin/payments/_payment.html.erb@@ -16,7 +16,7 @@<div class="dropdown"><button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>+ <%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu"><% if payment.try(:gateway_dashboard_payment_url).present? %>diff --git a/admin/app/views/spree/admin/products/_bulk_operations.html.erb b/admin/app/views/spree/admin/products/_bulk_operations.html.erbindex 50e610c7ca..6b1ee2c366 100644--- a/admin/app/views/spree/admin/products/_bulk_operations.html.erb+++ b/admin/app/views/spree/admin/products/_bulk_operations.html.erb@@ -25,7 +25,7 @@data-toggle="dropdown"aria-expanded="false">- <%= icon("dots", class: "mr-0") %>+ <%= icon('dots-vertical', class: "mr-0") %></button><divclass="dropdown-menu dropdown-menu-left"diff --git a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erbindex cd719f6684..19b811a4da 100644--- a/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/_promotion_action.html.erb@@ -6,7 +6,7 @@<% if can?(:update, promotion_action) || can?(:destroy, promotion_action) %><div class="dropdown"><button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>+ <%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu"><%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item' if can?(:update, promotion_action) %>diff --git a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erbindex d72802c7dc..a874e4958f 100644--- a/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/_promotion_rule.html.erb@@ -6,7 +6,7 @@<% if can?(:update, promotion_rule) || can?(:destroy, promotion_rule) %><div class="dropdown"><button class="btn btn-light btn-sm" type="button" data-toggle="dropdown" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>+ <%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu"><%= link_to_with_icon 'pencil', Spree.t('actions.edit'), spree.edit_admin_promotion_rule_path(promotion_rule.promotion, promotion_rule), class: 'dropdown-item' if can?(:update, promotion_rule) %>diff --git a/admin/app/views/spree/admin/shared/_alerts.html.erb b/admin/app/views/spree/admin/shared/_alerts.html.erbindex 6bff9cc4e5..e015d146d4 100644--- a/admin/app/views/spree/admin/shared/_alerts.html.erb+++ b/admin/app/views/spree/admin/shared/_alerts.html.erb@@ -5,7 +5,7 @@<divdata-controller="notification"data-notification-delay-value="5000"- class="animate__animated animate__fadeInDown animate__faster hidden alert d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">+ class="animate__animated animate__fadeInDown animate__faster hidden alert pr-2 d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;"><div class="d-flex align-items-center justify-content-between w-100"><div class="d-flex align-items-center justify-content-between"><span><%= text %></span>diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erbindex ec8f62cfb9..335464a742 100644--- a/admin/app/views/spree/admin/shared/_content_header.html.erb+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb@@ -30,7 +30,7 @@<% if show_record_subtitle || content_for(:page_actions_dropdown) %><div class="dropdown h-100" id="page_actions_dropdown"><%= link_to '#', class: 'btn btn-light bg-transparent h-100 p-2', data: { toggle: 'dropdown' }, id: 'more-actions-link' do %>- <%= icon 'dots', class: 'mr-0' %>+ <%= icon 'dots-vertical', class: 'mr-0' %><% end %><div class="dropdown-menu dropdown-menu-right"><%= yield :page_actions_dropdown if content_for(:page_actions_dropdown) %>diff --git a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb b/admin/app/views/spree/admin/shared/_user_dropdown.html.erbindex 646dce7567..b7b72047eb 100644--- a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/_user_dropdown.html.erb@@ -1,15 +1,20 @@<% if try_spree_current_user.present? %><div class="dropdown py-2 bg-gray-25 border-top" id="<%= dom_id(try_spree_current_user, 'account-dropdown') %>" data-turbo-permanent><button type="button"- class="btn d-flex align-items-center justify-content-between text-left w-100"+ class="btn d-flex align-items-center justify-content-between text-left w-100 pr-0"data-toggle="dropdown" aria-expanded="false" id="accountNav"><div class="d-flex align-items-center"><%= render_avatar(try_spree_current_user, width: 34, height: 34) %><span class="d-none d-lg-inline ml-lg-2">- <%= try_spree_current_user.name&.full&.truncate(15)&.presence || try_spree_current_user.email.truncate(15) %><br />- <span class="text-muted small"><%= try_spree_current_user.email.truncate(22) %></span>+ <% if try_spree_current_user.name.present? %>+ <%= try_spree_current_user.name&.full&.truncate(12)&.presence %><br />+ <span class="small"><%= try_spree_current_user.email.truncate(17) %></span>+ <% else %>+ <%= try_spree_current_user.email.truncate(12) %><br />+ <% end %></span></div>+ <%= icon('dots-vertical', class: 'ml-auto text-muted') %></button><div class="dropdown-menu dropdown-menu-right w-100 mb-1 mt-1 mt-lg-0"><% if can?(:update, try_spree_current_user) %>diff --git a/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb b/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erbindex cebfb028fb..acde14f347 100644--- a/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb+++ b/admin/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb@@ -31,7 +31,7 @@<div class="dropdown ml-2 h-100"><button class="btn btn-light btn-sm px-1 h-100" type="button" id="dropdownMenuButton-<%= taxon.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>+ <%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= taxon.id %>"><% if can?(:create, Spree::Taxon) %>diff --git a/admin/app/views/spree/admin/stock_locations/_stock_location.html.erb b/admin/app/views/spree/admin/stock_locations/_stock_location.html.erbindex 6234a2f778..ffcf178b63 100644--- a/admin/app/views/spree/admin/stock_locations/_stock_location.html.erb+++ b/admin/app/views/spree/admin/stock_locations/_stock_location.html.erb@@ -18,7 +18,7 @@<% if !stock_location.default? && can?(:mark_as_default, Spree::StockLocation) %><div class="dropdown"><button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>+ <%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton"><%= link_to_with_icon 'check',diff --git a/admin/app/views/spree/admin/themes/_theme.html.erb b/admin/app/views/spree/admin/themes/_theme.html.erbindex d816729b7a..2aa3780c4a 100644--- a/admin/app/views/spree/admin/themes/_theme.html.erb+++ b/admin/app/views/spree/admin/themes/_theme.html.erb@@ -38,7 +38,7 @@<%= link_to Spree.t('actions.publish'), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light mr-2', data: { turbo_method: :put } unless theme.default? %><div class="dropdown"><button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <%= icon('dots', class: 'mr-0') %>+ <%= icon('dots-vertical', class: 'mr-0') %></button><div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton"><%= link_to_edit theme, class: 'dropdown-item' %>