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
Small UI Improvements
Damian Legawieca9d983f20bca
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scssindex 7162cc5914..6055beed93 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss@@ -31,9 +31,9 @@ button[disabled] .show-when-enabled { display: none; }}.ti {- font-size: 130%;+ font-size: 120%;vertical-align: middle;- line-height: 130%;+ line-height: 120%;}.btn {diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss b/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scssindex 5908ff8861..1cc4d80ba5 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss@@ -198,7 +198,6 @@ dialog:open {.btn {display: inline-flex;- height: 2.5rem;}}}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scssindex 70573d65be..c1a6905cec 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss@@ -149,27 +149,26 @@.nav {padding-left: 0.75rem;padding-right: 0.75rem;- gap: 0.2rem;+ gap: 0.25rem;display: flex;flex-direction: column;}.nav-link {- border-radius: $nav-pills-border-radius;+ border-radius: $border-radius-lg;display: flex;align-items: center;- padding-left: 0.35rem;- padding-right: 0.35rem;- padding-top: 0.35rem;- padding-bottom: 0.35rem;+ padding-left: 0.3rem;+ padding-right: 0.3rem;+ padding-top: 0.3rem;+ padding-bottom: 0.3rem;color: inherit;transition: background-color 0.1s ease-in-out;.ti {- font-size: 1.125rem !important;margin-right: 0.5rem;- border-radius: $border-radius;+ border-radius: $border-radius-sm;padding: 0.2rem 0.2rem;}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scssindex 01cc964fa3..23e8bdff33 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss@@ -35,8 +35,8 @@ table.table {th {background-color: $light;@extend .text-muted;- font-size: $font-size-base;- font-weight: $font-weight-normal;+ font-size: $font-size-sm;+ font-weight: $font-weight-medium;vertical-align: middle;padding-top: 0.45rem;padding-bottom: 0.45rem;diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssindex acd4d9e968..b8c67e0ec8 100644--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss@@ -73,7 +73,7 @@ $border-radius: 0.5rem !default;$border-radius-sm: 0.4rem !default;$border-radius-lg: 0.75rem !default;$border-color: rgba($gray-100, 0.85) !default;-$input-border-color: rgba($gray-200, 0.85) !default;+$input-border-color: $gray-200 !default;$list-group-border-color: $border-color !default;$list-group-hover-bg: $gray-25 !default;$list-group-active-bg: $action !default;@@ -103,12 +103,14 @@ $link-hover-decoration: underline !default;$btn-active-box-shadow: inset 0 3px 5px rgba($black, .025) !default;$btn-disabled-opacity: 0.7 !default;+$btn-padding-y: 0.35rem !default;+$btn-padding-x: 0.75rem !default;-$nav-link-padding-y: .5rem !default;-$nav-link-padding-x: .6rem !default;+$nav-link-padding-y: .35rem !default;+$nav-link-padding-x: .75rem !default;$box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1),0 2px 4px -1px rgba(0, 0, 0, 0.06) !default;-$box-shadow-xs: rgba(43, 34, 51, 0.03) 0px 1px 1px !default;+$box-shadow-xs: rgba(43, 34, 51, 0.05) 0px 1px 1px !default;$box-shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;$input-box-shadow: $box-shadow-xs !default;$btn-box-shadow: $input-box-shadow !default;@@ -174,7 +176,7 @@ $dropdown-padding-y: 0.25rem !default;$dropdown-divider-bg: $gray-50 !default;$dropdown-divider-margin-y: 0.25rem !default;$dropdown-header-color: $text-muted !default;-$dropdown-item-padding-y: 0.45rem !default;+$dropdown-item-padding-y: 0.35rem !default;$dropdown-item-padding-x: 0.65rem !default;$zindex-dropdown: 1050;@@ -223,7 +225,7 @@ $list-group-bg: transparent !default;$list-group-item-padding-x: 1.25rem !default;$list-group-item-padding-y: 0.75rem !default;$header-bg: $body-bg !default;-$header-height: 54px !default;+$header-height: 58px !default;$sidebar-width: 220px !default;$sidebar-bg: $light !default;diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scssindex 43c5dddf2f..deb0fb0d41 100644--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss@@ -1,6 +1,7 @@.custom-checkbox .custom-control-label::before {border-radius: 0.25rem !important;border-color: $input-border-color;+ box-shadow: $input-box-shadow;}label {@@ -73,7 +74,7 @@ input[type="file"] {}.custom-select, .form-control, .ts-control {&:hover:not(:focus):not(:active):not(.active):not(:focus-visible):not(:focus-within) {- border: 1px solid $gray-100;+ border: 1px solid $gray-300;}}diff --git a/admin/app/helpers/spree/admin/navigation_helper.rb b/admin/app/helpers/spree/admin/navigation_helper.rbindex 9765b8598d..569282a484 100644--- a/admin/app/helpers/spree/admin/navigation_helper.rb+++ b/admin/app/helpers/spree/admin/navigation_helper.rb@@ -248,7 +248,7 @@ module Spreeendlink_to url, class: 'd-flex align-items-center text-decoration-none' do- content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover-gray px-2 d-flex align-items-center') ++ content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover-gray shadow-none px-2 d-flex align-items-center shadow-none') +content_tag(:span, label, class: 'font-size-base text-black')endenddiff --git a/admin/app/views/spree/admin/invitations/new.html.erb b/admin/app/views/spree/admin/invitations/new.html.erbindex f28d6e803e..7026fad620 100644--- a/admin/app/views/spree/admin/invitations/new.html.erb+++ b/admin/app/views/spree/admin/invitations/new.html.erb@@ -12,7 +12,8 @@<%= f.spree_date_field :expires_at, required: true, data: { 'enable-button-target': 'input' } %></div><div class="dialog-footer">- <%= turbo_save_button_tag nil, class: 'btn btn-primary', data: { 'enable-button-target': 'button' } do %>+ <%= dialog_discard_button %>+ <%= turbo_save_button_tag do %><%= icon 'send' %><%= Spree.t('actions.send_invitation') %><% end %>diff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erbindex 4d5ad1b04f..fc39289544 100644--- a/admin/app/views/spree/admin/orders/_customer.html.erb+++ b/admin/app/views/spree/admin/orders/_customer.html.erb@@ -6,7 +6,7 @@<% if can?(:update_customer, @order) || can?(:update_addresses, @order) %><%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto' do %><%= dropdown_toggle class: 'btn-light btn-sm px-1', data: { test_id: 'dropdown-toggle' } do %>- <%= icon 'dots-vertical' %>+ <%= icon 'dots-vertical', class: 'mr-0' %><% end %><%= dropdown_menu class: 'dropdown-menu-right' do %><% if can?(:update_customer, @order) && [email protected]? %>diff --git a/admin/app/views/spree/admin/page_blocks/edit.html.erb b/admin/app/views/spree/admin/page_blocks/edit.html.erbindex ff8f348a31..776a839cba 100644--- a/admin/app/views/spree/admin/page_blocks/edit.html.erb+++ b/admin/app/views/spree/admin/page_blocks/edit.html.erb@@ -1,7 +1,7 @@<%= turbo_frame_tag :page_sidebar do %><% tab_selected ||= :content %><h6 class="sidebar-header">- <%= link_to spree.edit_admin_theme_path(@theme, page_id: @page&.id), data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>+ <%= link_to spree.edit_admin_theme_path(@theme, page_id: @page&.id), data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %><%= icon 'chevron-left', class: 'mr-0' %><% end %><%= @page_block.display_name %>@@ -11,10 +11,10 @@<div data-controller="tabs"><ul class="nav nav-pills nav-fill mb-3" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button>+ <button class="nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button></li><li class="nav-item" role="presentation">- <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button>+ <button class="nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button></li></ul><div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :content %>>diff --git a/admin/app/views/spree/admin/page_builder/_header.html.erb b/admin/app/views/spree/admin/page_builder/_header.html.erbindex 4e017ae8a1..1b786c58f9 100644--- a/admin/app/views/spree/admin/page_builder/_header.html.erb+++ b/admin/app/views/spree/admin/page_builder/_header.html.erb@@ -2,7 +2,7 @@<nav class="navbar navbar-expand-lg"><div data-controller="tooltip"><% back_url = @page.custom? ? spree.admin_pages_path : spree.admin_themes_path %>- <%= link_to back_url, class: 'btn hover-gray px-2' do %>+ <%= link_to back_url, class: 'btn hover-gray shadow-none px-2' do %><%= icon('x', class: 'mr-0') %><% end %><%= tooltip(Spree.t('admin.back_to_dashboard')) %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erbindex 17a10037c0..3530791827 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_block.html.erb@@ -20,7 +20,7 @@</div><div class="d-flex align-items-center d-none"><% if block.section.can_sort_blocks? %>- <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 px-1 handle-block">+ <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 px-1 handle-block shadow-none"><%= icon('grip-vertical', class: 'mr-0') %></button><% end %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erbindex f62afaef16..e2bc73f0e6 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_colors.html.erb@@ -7,10 +7,10 @@<div data-controller="tabs"><ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <button class="btn nav-link w-100 active" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="true">Color scheme</button>+ <button class="nav-link w-100 active" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="true">Color scheme</button></li><li class="nav-item" role="presentation">- <button class="btn nav-link w-100" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="false">Elements</button>+ <button class="nav-link w-100" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="false">Elements</button></li></ul><div id="pills-tabContent">diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erbindex 0bca8c8e22..c6b6a553eb 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb@@ -6,12 +6,12 @@<div data-controller="tabs"><ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <button class="btn nav-link w-100 active" id="pills-standard" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-standard" aria-selected="true">+ <button class="nav-link w-100 active" id="pills-standard" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-standard" aria-selected="true">Standard</button></li><li class="nav-item" role="presentation">- <button class="btn nav-link w-100" id="pills-custom" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-custom" aria-selected="false">+ <button class="nav-link w-100" id="pills-custom" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-custom" aria-selected="false">Custom</button></li>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erbindex 4fdb6d2cca..f6945af2a8 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_section.html.erb@@ -16,7 +16,7 @@%></div><div class="d-flex align-items-center d-none">- <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 handle-section">+ <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 handle-section shadow-none"><%= icon('grip-vertical', class: 'mr-0') %></button></div>diff --git a/admin/app/views/spree/admin/page_links/_list.html.erb b/admin/app/views/spree/admin/page_links/_list.html.erbindex deb3b16a73..c011005fdb 100644--- a/admin/app/views/spree/admin/page_links/_list.html.erb+++ b/admin/app/views/spree/admin/page_links/_list.html.erb@@ -12,7 +12,7 @@data-sortable-update-url="<%= spree.admin_page_link_path(link, sorting_only: true, format: :turbo_stream) %>"><%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'd-block py-2 px-3 text-dark flex-fill' %>- <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1">+ <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 shadow-none"><%= icon 'grip-vertical', class: 'mr-0' %></button></li>diff --git a/admin/app/views/spree/admin/page_links/edit.html.erb b/admin/app/views/spree/admin/page_links/edit.html.erbindex 2a1106c3ed..b603552d9e 100644--- a/admin/app/views/spree/admin/page_links/edit.html.erb+++ b/admin/app/views/spree/admin/page_links/edit.html.erb@@ -12,7 +12,7 @@<% else %><%= turbo_frame_tag :page_sidebar do %><h6 class="sidebar-header">- <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %><%= icon 'chevron-left', class: 'mr-0' %><% end %><%= @page_link.label %>diff --git a/admin/app/views/spree/admin/page_sections/edit.html.erb b/admin/app/views/spree/admin/page_sections/edit.html.erbindex 9e4d7caab6..7f7a51e794 100644--- a/admin/app/views/spree/admin/page_sections/edit.html.erb+++ b/admin/app/views/spree/admin/page_sections/edit.html.erb@@ -1,7 +1,7 @@<%= turbo_frame_tag :page_sidebar do %><% tab_selected ||= :content %><h6 class="sidebar-header">- <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %><%= icon 'chevron-left', class: 'mr-0 back' %><% end %><%= @page_section.display_name %>@@ -11,10 +11,10 @@<div data-controller="tabs"><ul class="nav nav-pills nav-fill mb-3" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button>+ <button class="nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button></li><li class="nav-item" role="presentation">- <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button>+ <button class="nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button></li></ul><div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :content %>>diff --git a/admin/app/views/spree/admin/page_sections/new.html.erb b/admin/app/views/spree/admin/page_sections/new.html.erbindex 04f38b6044..fb988ee522 100644--- a/admin/app/views/spree/admin/page_sections/new.html.erb+++ b/admin/app/views/spree/admin/page_sections/new.html.erb@@ -1,6 +1,6 @@<%= turbo_frame_tag :page_sidebar do %><h6 class="sidebar-header">- <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %><%= icon 'chevron-left', class: 'mr-0 back' %><% end %><%= Spree.t(:add_section) %>diff --git a/admin/app/views/spree/admin/shared/_index_table_options.html.erb b/admin/app/views/spree/admin/shared/_index_table_options.html.erbindex cb15e6a1bb..a95f8c33d3 100644--- a/admin/app/views/spree/admin/shared/_index_table_options.html.erb+++ b/admin/app/views/spree/admin/shared/_index_table_options.html.erb@@ -12,7 +12,7 @@<div class="d-none d-lg-block text-center text-muted"><%= page_entries_info(collection, entry_name: entry_name) %></div>- <div class="text-right pr-lg-2">+ <div class="text-right"><%= paginate collection, theme: 'admin-twitter-bootstrap-4' %></div></div>diff --git a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb b/admin/app/views/spree/admin/shared/_user_dropdown.html.erbindex d01cd83e07..49acbaa745 100644--- a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/_user_dropdown.html.erb@@ -1,6 +1,6 @@<% if try_spree_current_user.present? %><%= dropdown id: dom_id(try_spree_current_user, 'account-dropdown') do %>- <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0' do %>+ <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0 shadow-none' do %><%= render_avatar(try_spree_current_user, width: 32, height: 32) %><% end %><%= dropdown_menu class: 'dropdown-menu-right', style: 'min-width: 250px;' do %>diff --git a/admin/app/views/spree/admin/stores/form/_checkout_links.html.erb b/admin/app/views/spree/admin/stores/form/_checkout_links.html.erbindex 0a3405614f..65a62e82a8 100644--- a/admin/app/views/spree/admin/stores/form/_checkout_links.html.erb+++ b/admin/app/views/spree/admin/stores/form/_checkout_links.html.erb@@ -11,7 +11,7 @@><%= turbo_frame_tag spree_dom_id(link), class: 'd-flex align-items-center w-100 py-2 pl-3 pr-2' do %><%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'd-block text-dark flex-fill' %>- <button class="btn btn-sm pr-0 handle hover-gray h-100 px-1">+ <button class="btn btn-sm pr-0 handle shadow-none hover-grayh-100 px-1"><%= icon 'grip-vertical', class: 'mr-0' %></button><% end %>