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
Admin: simplify/improve UI/CSS
Damian Legawiec883ea8b5316d
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss b/admin/app/assets/stylesheets/spree/admin/components/_alerts.scssindex 9220546463..e9a1b5f02d 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss@@ -59,7 +59,7 @@position: fixed;width: 100%;z-index: 1070;- top: 1rem;+ top: 0.4rem;.alert {border-width: 1px;diff --git a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss b/admin/app/assets/stylesheets/spree/admin/components/_cards.scssindex dfe0171d2f..91799c349d 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_cards.scss@@ -55,13 +55,18 @@font-family: $font-family-sans-serif;}}+.card-footer {+ border-top-width: 0;+}.card-footer.border-top, .card-body.border-top, .card .border-top, .card .border-bottom, .card .list-group-item {border-color: $gray-50 !important;}.card, .card-lg {- box-shadow: $card-box-shadow;+ border-width: $card-border-width;+ border-style: solid;+ border-color: $card-border-color;background-color: $card-bg;border-radius: $card-border-radius;}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scssindex edf42dbb47..9a9a1557e0 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss@@ -45,7 +45,6 @@background: transparent;padding-top: 0.4rem;padding-bottom: 0.4rem;- margin-bottom: 0.15rem;transition-property: background-color, color;transition-duration: 0.01s;diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scssindex 6dc9a7cb10..d7d2ef093a 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss@@ -7,10 +7,6 @@display: flex;align-items: center;background-color: $body-bg;- padding-left: 1.5rem;- padding-right: 1.5rem;- border-bottom: 1px solid $border-color;- margin-bottom: 1rem;&.sticky-top {padding-left: 1rem;@@ -18,6 +14,8 @@animation: slideDown 0.3s ease-out;height: $header-height;border-bottom: 1px solid $border-color;+ width: 100%;+ max-width: 100%;}}@@ -36,6 +34,12 @@height: $header-height;padding-left: 1rem;padding-right: 1rem;+ max-width: 100%;+ border-bottom: 1px solid $border-color;+ }++ #page-tabs {+ border-bottom: 1px solid $border-color;}}@@ -44,10 +48,6 @@}#page-tabs {- border-bottom: 1px solid $border-color;- margin-bottom: 1rem;- padding-left: 1.5rem;- padding-right: 1.5rem;margin-top: -1rem;.nav {@@ -74,15 +74,6 @@}}-.admin-settings {- #page-tabs, #page-alerts {- margin-top: 0;- margin-bottom: 0;- padding-left: 1rem;- padding-right: 1rem;- }-}-.store-dropdown {display: flex;align-items: center;@@ -92,8 +83,7 @@background-color: $sidebar-bg;width: $sidebar-width;border-right: 1px solid $border-color;- border-bottom: 1px solid $border-color;- height: $header-height;+ height: calc($header-height + 1px);}.store-dropdown-button {@@ -150,7 +140,6 @@overflow-x: hidden;position: fixed;top: $header-height;- color: $gray-600;padding-top: 0.8rem;@media (max-width: 992px) {@@ -166,7 +155,7 @@}.nav-link {- border-radius: $border-radius;+ border-radius: $nav-pills-border-radius;display: flex;align-items: center;padding-left: 0.35rem;@@ -178,7 +167,7 @@.ti {font-size: 1.125rem !important;margin-right: 0.5rem;- border-radius: $border-radius-sm;+ border-radius: $border-radius;padding: 0.2rem 0.2rem;}@@ -198,7 +187,6 @@.ti {background-color: theme-color('primary');color: $white;- box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.05) 0px 0px 0px 1px, rgba(0, 0, 0, 0.05) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;}}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss b/admin/app/assets/stylesheets/spree/admin/components/_navigation.scssindex 351685143c..20b5a64878 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss@@ -12,7 +12,6 @@position: relative;transition: background 0.15s, color 0.1s;will-change: background, color;- color: $gray-700;&:hover {color: theme-color('primary');diff --git a/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss b/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scssindex 5fac0c6b5a..a3891aa7f5 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss@@ -39,7 +39,8 @@border-color: transparent !important;.sortable-tree-item-row {background-color: $action !important;- border: 1px dashed rgba($blue, 0.5) !important;+ border: 2px solid $blue !important;+ margin: -1px;}}diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssindex 5ba00d6fd4..6438ad27ee 100644--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss@@ -95,7 +95,7 @@ $input-disabled-bg: $gray-25 !default;$input-focus-border-color: rgba($blue, 0.75) !default;$custom-select-disabled-bg: $gray-50 !default;-$text-muted: $gray-400 !default;+$text-muted: $gray-600 !default;$link-color: $primary !default;$link-hover-decoration: underline !default;@@ -114,8 +114,7 @@ $btn-box-shadow: $input-box-shadow !default;$btn-font-weight: 500 !default;-$card-border-width: 0px !default;-$card-box-shadow: 0 0 0 1px $card-border-color, 0 1px 2px 0 rgba(0, 0, 0, 0.05) !default;+$card-border-width: 1px !default;$card-bg: $white !default;$card-border-radius: $border-radius-lg !default;@@ -166,12 +165,12 @@ $dropdown-bg: $white !default;$dropdown-border-width: 0px !default;$dropdown-border-radius: $border-radius-lg !default;$dropdown-link-hover-bg: rgba($gray-100, 0.5) !default;-$dropdown-box-shadow: 0px 0px 0px 1px $border-color, 0px 6px 12px -3px $gray-50, 0px 6px 18px 0px $gray-50 !default;+$dropdown-box-shadow: 0px 0px 0px 1px $border-color, 0px 6px 12px -3px $gray-100, 0px 6px 18px 0px $gray-100 !default;$dropdown-padding-x: 0.25rem !default;$dropdown-padding-y: 0.25rem !default;$dropdown-divider-bg: $gray-50 !default;$dropdown-divider-margin-y: 0.25rem !default;-$dropdown-header-color: $gray-500 !default;+$dropdown-header-color: $text-muted !default;$zindex-dropdown: 1050;$modal-backdrop-bg: $body-bg !default;@@ -210,8 +209,8 @@ $embed-responsive-aspect-ratios: (// tables$table-cell-padding: 1.15rem .75rem !default;-$code-color: $gray-600 !default;-$code-bg: $gray-25 !default;+$code-color: $body-color !default;+$code-bg: $gray-50 !default;$list-group-bg: transparent !default;$list-group-item-padding-x: 1rem !default;@@ -222,3 +221,9 @@ $sidebar-width: 220px !default;$sidebar-bg: $light !default;$progress-bar-bg: rgba($blue, 0.75) !default;++$btn-border-radius: $border-radius-lg !default;+$btn-border-radius-lg: $border-radius-lg !default;+$btn-border-radius-sm: $border-radius !default;++$nav-pills-border-radius: $border-radius-lg !default;\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss b/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scssindex 96fae84c2b..d6a859cc86 100644--- a/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss+++ b/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss@@ -64,4 +64,11 @@.uppy-Dashboard-AddFiles-title {font-weight: $font-weight-base !important;font-size: $font-size-base !important;+}++.uppy-size--md .uppy-DashboardContent-bar {+ height: 56px !important;+}+.uppy-size--md .uppy-DashboardContent-title {+ line-height: 56px !important;}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scssindex c4b7a20de3..cb8ad51584 100644--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss@@ -690,22 +690,15 @@ div.uppy-Root {.breadcrumb {gap: 0.5rem;align-items: center;+ color: $text-muted;-- i {- opacity: 0.5;- }-li {a {- color: $gray-500;text-decoration: none;- border-radius: $border-radius;- padding: 0.35rem 0.5rem;&:hover {color: $primary;- background-color: $gray-25;+ text-decoration: underline;}}}diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scssindex 92d739ee95..f2d9463e95 100644--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss@@ -23,6 +23,7 @@ label {.form-text {font-size: $font-size-sm;+ color: $text-muted;margin-top: 0;}diff --git a/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss b/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scssindex 71941de187..ac19679edf 100644--- a/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss+++ b/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss@@ -1,5 +1,5 @@$sidebar-width: 345px;-$header-height: 43px;+$header-height: 50px;#page-builder {background-color: $gray-50;@@ -21,14 +21,14 @@ $header-height: 43px;}.nav-pills {- border-radius: $border-radius;background-color: $gray-50;- padding: 0.2rem;+ padding: 0.25rem;+ border-radius: $nav-pills-border-radius;.nav-link {background-color: transparent;padding: 0.25rem 0.5rem;- border-radius: $border-radius-sm;+ border-radius: $border-radius;&.active {background-color: $white;@@ -46,6 +46,7 @@ $header-height: 43px;height: $header-height;nav {width: 100%;+ height: $header-height;display: flex;align-items: center;gap: 0.5rem;diff --git a/admin/app/models/spree/admin/form_builder.rb b/admin/app/models/spree/admin/form_builder.rbindex d51c346358..703a044c1f 100644--- a/admin/app/models/spree/admin/form_builder.rb+++ b/admin/app/models/spree/admin/form_builder.rb@@ -215,7 +215,7 @@ module Spree# @option options [String] :help help text to display# @return [String] HTML string containing the help text or empty stringdef field_help(_method, options = {})- @template.content_tag(:span, options[:help], class: 'form-text text-muted mt-2')+ @template.content_tag(:span, options[:help], class: 'form-text mt-2')endprivatediff --git a/admin/app/views/layouts/spree/admin_settings.html.erb b/admin/app/views/layouts/spree/admin_settings.html.erbindex 7031f5f274..a6721506fc 100644--- a/admin/app/views/layouts/spree/admin_settings.html.erb+++ b/admin/app/views/layouts/spree/admin_settings.html.erb@@ -18,10 +18,10 @@</header><%= render "spree/admin/shared/sidebar" %>- <main id="content">+ <main id="content" class="pt-4"><%= render "spree/admin/shared/page_tabs" %>- <div class="container pt-4">- <%= yield(:page_alerts) %>+ <%= render "spree/admin/shared/page_alerts" %>+ <div class="container"><%= yield %></div><%= render "spree/admin/shared/footer" %>diff --git a/admin/app/views/layouts/spree/admin_wizard.html.erb b/admin/app/views/layouts/spree/admin_wizard.html.erbindex a3b843249f..e59b06713c 100644--- a/admin/app/views/layouts/spree/admin_wizard.html.erb+++ b/admin/app/views/layouts/spree/admin_wizard.html.erb@@ -4,7 +4,7 @@<%= render "spree/admin/shared/head" %></head>- <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>"+ <body class="admin admin-wizard min-vh-100 <%= controller_name %> <%= action_name %>"data-controller="admin drawer"data-action="keydown.ctrl+s->admin#save keydown.meta+s->admin#save">diff --git a/admin/app/views/spree/admin/dashboard/show.html.erb b/admin/app/views/spree/admin/dashboard/show.html.erbindex 2c032980cd..5fb33e1099 100644--- a/admin/app/views/spree/admin/dashboard/show.html.erb+++ b/admin/app/views/spree/admin/dashboard/show.html.erb@@ -1,4 +1,4 @@-<div class="row pt-3">+<div class="row pt-4"><div class="col-12"><h2 class="page-header-title"><%= Spree.t('admin.dashboard.hi') %> <%= try_spree_current_user.first_name %>!diff --git a/admin/app/views/spree/admin/oauth_applications/index.html.erb b/admin/app/views/spree/admin/oauth_applications/index.html.erbindex 520c38b3da..d0caf7a9ac 100644--- a/admin/app/views/spree/admin/oauth_applications/index.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/index.html.erb@@ -8,7 +8,7 @@<% end %><%= content_for :page_alerts do %>- <div class="alert alert-info mb-3">+ <div class="alert alert-info"><p>Here you can manage API keys to access the <%= link_to 'Platform API', 'https://spreecommerce.org/docs/api-reference/platform/authentication', target: '_blank' %>.For headless storefronts you don't need an API key, please use the <%= link_to 'Storefront API', 'https://spreecommerce.org/docs/api-reference/storefront/authentication', target: '_blank' %>.diff --git a/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb b/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erbindex cd63c6e5cb..70c6f9d54e 100644--- a/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb+++ b/admin/app/views/spree/admin/page_builder/_pages_dropdown.html.erb@@ -1,4 +1,4 @@-<div class="dropdown h-100" id="pages_dropdown">+<div class="dropdown" id="pages_dropdown"><button class="btn btn-light" type="button" data-toggle="dropdown" aria-expanded="false"><span class="d-flex align-items-center pr-5"><%= icon @page.icon_name, class: 'mr-2' %>diff --git a/admin/app/views/spree/admin/products/_product.html.erb b/admin/app/views/spree/admin/products/_product.html.erbindex ed2de83ffa..e8fbc0a907 100644--- a/admin/app/views/spree/admin/products/_product.html.erb+++ b/admin/app/views/spree/admin/products/_product.html.erb@@ -13,7 +13,7 @@<% end %></td><%= render 'spree/admin/products/product_status', product: product %>- <td class="text-muted w-20 cursor-pointer text-wrap" data-action="click->row-link#openLink">+ <td class="w-20 cursor-pointer text-wrap" data-action="click->row-link#openLink"><%= display_inventory(product) %></td><% if defined?(current_vendor) %>diff --git a/admin/app/views/spree/admin/products/form/_variants.html.erb b/admin/app/views/spree/admin/products/form/_variants.html.erbindex 2a3bb2465d..824d1fca40 100644--- a/admin/app/views/spree/admin/products/form/_variants.html.erb+++ b/admin/app/views/spree/admin/products/form/_variants.html.erb@@ -63,7 +63,7 @@action: "variants-form#handleSelectedOptionName tomSelectInitialized->variants-form#refreshOptionNameSelect"} %><% if can?(:manage, Spree::OptionType) %>- <p class="form-text text-muted mt-2">+ <p class="form-text mt-2"><%= Spree.t('admin.products.variants.option_types_link', link: spree.admin_option_types_path).html_safe %></p><% end %>diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_item_total.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_item_total.html.erbindex f8af8c82ed..a303961335 100644--- a/admin/app/views/spree/admin/promotion_rules/forms/_item_total.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/forms/_item_total.html.erb@@ -19,7 +19,7 @@<div class="col-6"><%= f.number_field :preferred_amount_max, class: 'form-control' %>- <span class="form-text text-muted mt-2">+ <span class="form-text mt-2">Leave this field blank to not limit the maximum amount.</span></div>diff --git a/admin/app/views/spree/admin/promotions/edit.html.erb b/admin/app/views/spree/admin/promotions/edit.html.erbindex 5b9a9c8150..8b8c66dda4 100644--- a/admin/app/views/spree/admin/promotions/edit.html.erb+++ b/admin/app/views/spree/admin/promotions/edit.html.erb@@ -14,7 +14,7 @@<%= f.label :name %><%= f.text_field :name, class: 'form-control', required: true, autofocus: true %><%= f.error_message_on :name %>- <span class="form-text text-muted mt-2">+ <span class="form-text mt-2">Customers will see this in their cart and at checkout.</span></div>diff --git a/admin/app/views/spree/admin/promotions/form/_kind.html.erb b/admin/app/views/spree/admin/promotions/form/_kind.html.erbindex db72aec366..6da675445a 100644--- a/admin/app/views/spree/admin/promotions/form/_kind.html.erb+++ b/admin/app/views/spree/admin/promotions/form/_kind.html.erb@@ -7,7 +7,7 @@<%= f.radio_button :multi_codes, false, data: { toggle: :collapse, target: '#single-code' }, class: 'custom-control-input' %><%= f.label :multi_codes_false, class: 'custom-control-label' do %>One code for all customers- <span class="form-text text-muted font-weight-normal mr-1">+ <span class="form-text font-weight-normal mr-1">You can limit the number of times this code can be used.</span><% end %>@@ -20,7 +20,7 @@<%= f.radio_button :multi_codes, true, data: { toggle: :collapse, target: '#multi-codes' }, class: 'custom-control-input' %><%= f.label :multi_codes_true, class: 'custom-control-label' do %>Generate unique codes- <span class="form-text text-muted font-weight-normal mr-1">+ <span class="form-text font-weight-normal mr-1">These codes are generated automatically and can be downloaded as a CSV file. Codes are unique and can only be used once.</span><% end %>@@ -28,7 +28,7 @@<div id="multi-codes" class="ml-3 mt-2 row collapse <% if @promotion.multi_codes? %>show<% end %>" data-parent="#coupon-code"><div class="col-6"><%= f.text_field :code_prefix, class: 'form-control text-uppercase', placeholder: 'Coupon Prefix (optional)' %>- <span class="form-text text-muted">+ <span class="form-text">eg. <strong>ABC</strong></span></div>@@ -36,7 +36,7 @@<% minimum_number_of_codes = @promotion.persisted? && @promotion.coupon_codes.count.positive? ? @promotion.coupon_codes.count : 1 %><% maximum_number_of_codes = ENV.fetch('PROMOTION_MAX_NUMBER_OF_CODES', 5000) %><%= f.number_field :number_of_codes, class: 'form-control', placeholder: 'Number of codes', min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %>- <span class="form-text text-muted">+ <span class="form-text">How many codes you want to generate.<% if @promotion.persisted? %>To add more codes just increase this number@@ -51,7 +51,7 @@<%= f.radio_button :kind, :automatic, data: { toggle: :collapse, target: '#coupon-code' }, class: 'custom-control-input' %><%= f.label :kind_automatic, Spree.t(:automatic_promotion), class: 'custom-control-label' %>- <p class="form-text text-muted mt-2 mb-0">+ <p class="form-text mt-2 mb-0">This promotion will be automatically applied to all eligible orders.</p></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/promotions/form/_settings.html.erb b/admin/app/views/spree/admin/promotions/form/_settings.html.erbindex f612f8303b..6c93c2b980 100644--- a/admin/app/views/spree/admin/promotions/form/_settings.html.erb+++ b/admin/app/views/spree/admin/promotions/form/_settings.html.erb@@ -12,7 +12,7 @@<%= f.label :expires_at %><%= f.datetime_field :expires_at, class: 'form-control' %><%= f.error_message_on :expires_at %>- <span class="form-text text-muted mt-2">+ <span class="form-text mt-2">Leave this field blank for no expiration.</span></div>diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erbindex 0ae7e954e5..b58e63450a 100644--- a/admin/app/views/spree/admin/shared/_content_header.html.erb+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb@@ -9,7 +9,7 @@<% end if show_record_subtitle && !content_for(:page_subtitle) %><% if content_for?(:page_title) %>- <header id="page-header" class="container-fluid" data-controller="sticky">+ <header id="page-header" class="container" data-controller="sticky"><h3 class="page-header-title mb-0 d-flex align-items-center gap-3"><%= yield :page_title %></h3>diff --git a/admin/app/views/spree/admin/shared/_no_resource_found.html.erb b/admin/app/views/spree/admin/shared/_no_resource_found.html.erbindex 73721c2ac7..16628c1c4a 100644--- a/admin/app/views/spree/admin/shared/_no_resource_found.html.erb+++ b/admin/app/views/spree/admin/shared/_no_resource_found.html.erb@@ -5,5 +5,5 @@<p><%= Spree.t(:no_resource_found, resource: resource_name) %></p>- <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-secondary btn-sm ml-3', data: { 'turbo-frame': '_top' } if can?(:create, model_class) && defined?(new_object_url) && new_object_url.present? %>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-primary btn-sm ml-3', data: { 'turbo-frame': '_top' } if can?(:create, model_class) && defined?(new_object_url) && new_object_url.present? %></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_page_alerts.html.erb b/admin/app/views/spree/admin/shared/_page_alerts.html.erbindex f0e50856e7..fba65eb367 100644--- a/admin/app/views/spree/admin/shared/_page_alerts.html.erb+++ b/admin/app/views/spree/admin/shared/_page_alerts.html.erb@@ -1,7 +1,5 @@<% if content_for(:page_alerts) %>- <div class="container" id="page-alerts">- <div class="page-alerts">- <%= yield(:page_alerts) %>- </div>+ <div class="container mb-2" id="page-alerts">+ <%= yield(:page_alerts) %></div><% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_page_tabs.html.erb b/admin/app/views/spree/admin/shared/_page_tabs.html.erbindex 50769a73b6..f9967f6115 100644--- a/admin/app/views/spree/admin/shared/_page_tabs.html.erb+++ b/admin/app/views/spree/admin/shared/_page_tabs.html.erb@@ -1,7 +1,9 @@<% if content_for?(:page_tabs) %>- <div class="container-fluid" id="page-tabs">- <ul class="nav">- <%= yield :page_tabs %>- </ul>+ <div id="page-tabs">+ <div class="container mb-2">+ <ul class="nav">+ <%= yield :page_tabs %>+ </ul>+ </div></div><% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erbindex 4a154b369d..e54a83b20e 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb@@ -98,7 +98,6 @@<%= render_admin_partials(:store_nav_partials) %>- <li class="nav-item border-top border-top-dashed my-1"></li><%= render 'spree/admin/shared/sidebar/storefront_nav' %><%= render 'spree/admin/shared/sidebar/integrations_nav' %></ul>diff --git a/admin/app/views/spree/admin/shipping_methods/form/_display.html.erb b/admin/app/views/spree/admin/shipping_methods/form/_display.html.erbindex 5f6efda2bc..140cff76fc 100644--- a/admin/app/views/spree/admin/shipping_methods/form/_display.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/form/_display.html.erb@@ -8,7 +8,7 @@<%= f.error_message_on :name %></div>- <p class="form-text text-muted small mt-2">+ <p class="form-text small mt-2">This will be displayed to customers.</p></div>@@ -30,7 +30,7 @@<%= f.error_message_on :admin_name %></div>- <p class="form-text text-muted small mt-2">+ <p class="form-text small mt-2">This will be displayed to admins.</p></div>diff --git a/admin/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb b/admin/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erbindex 5b6e12d3d2..d7f96d6a25 100644--- a/admin/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb@@ -10,7 +10,7 @@<%= f.error_message_on :tracking_url %></div>- <p class="form-text text-muted small mt-2">+ <p class="form-text small mt-2"><code>:tracking</code><span>will be replaced with the tracking number.</span></p>diff --git a/admin/app/views/spree/admin/stores/form/_checkout.html.erb b/admin/app/views/spree/admin/stores/form/_checkout.html.erbindex ab6811bb44..e720bce2f2 100644--- a/admin/app/views/spree/admin/stores/form/_checkout.html.erb+++ b/admin/app/views/spree/admin/stores/form/_checkout.html.erb@@ -9,7 +9,7 @@<div class="card-body"><%= f.spree_select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { label: Spree.t(:shipping_zone), autocomplete: true } %>- <small class="form-text text-muted mb-3">+ <small class="form-text mb-3"><%= Spree.t(:shipping_zone_help) %><%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %></small>diff --git a/admin/app/views/spree/admin/stores/form/_emails.html.erb b/admin/app/views/spree/admin/stores/form/_emails.html.erbindex 5de0bf3b2d..7a402200e8 100644--- a/admin/app/views/spree/admin/stores/form/_emails.html.erb+++ b/admin/app/views/spree/admin/stores/form/_emails.html.erb@@ -34,7 +34,7 @@<div class="card-body"><p class="text-muted">This logo is included in all email notifications such as order confirmation</p><%= render 'active_storage/upload_form', form: f, field_name: :mailer_logo, width: 204, height: 104 %>- <p class="form-text text-muted mb-0 mt-2">+ <p class="form-text mb-0 mt-2">We recommend images with a transparent background.<br />Only JPEG and PNG formats are supported.diff --git a/admin/app/views/spree/admin/stores/form/_policies.html.erb b/admin/app/views/spree/admin/stores/form/_policies.html.erbindex 6ceafd864e..5d55b11c8a 100644--- a/admin/app/views/spree/admin/stores/form/_policies.html.erb+++ b/admin/app/views/spree/admin/stores/form/_policies.html.erb@@ -2,7 +2,7 @@<%= Spree.t(:policies) %><% end %>-<div class="alert alert-info mb-3">+<div class="alert alert-info">Policies will be automatically added to footer of your store and will be available to customers during checkout.</div>diff --git a/admin/app/views/spree/admin/taxons/_form.html.erb b/admin/app/views/spree/admin/taxons/_form.html.erbindex cb6d844161..8aab2f6b1f 100644--- a/admin/app/views/spree/admin/taxons/_form.html.erb+++ b/admin/app/views/spree/admin/taxons/_form.html.erb@@ -60,7 +60,7 @@<% end %></div>- <div class="card-body border-bottom">+ <div class="card-body border-bottom pb-0"><div class="d-flex align-items-center"><%= f.spree_select :sort_order, taxon_sort_options_for_select, {}, { class: 'custom-select custom-select-sm w-auto ml-2', data: { action: 'change->auto-submit#submit' } } %></div>