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
Migrate Admin CSS to Tailwind CSS (#13342)
Damian Legawiecdc3e7bb5e2cf
diff --git a/.claude/settings.local.json b/.claude/settings.local.jsonindex 1246848569..cd4702f2fa 100644--- a/.claude/settings.local.json+++ b/.claude/settings.local.json@@ -12,7 +12,8 @@"Bash(curl:*)","Bash(bundle exec rake:*)","Bash(bin/importmap:*)",- "Bash(ruby -c:*)"+ "Bash(ruby -c:*)",+ "Bash(~/.rbenv/versions/3.4.7/lib/ruby/gems/3.4.0/gems/tailwindcss-ruby-4.1.16-arm64-darwin/exe/arm64-darwin/tailwindcss:*)"],"deny": []}diff --git a/.gitignore b/.gitignoreindex a5825594fc..d198ac4072 100644--- a/.gitignore+++ b/.gitignore@@ -57,3 +57,4 @@ vendor/bundle.ignoreTODObrakeman-*.*+*/app/assets/buildsdiff --git a/CLAUDE.md b/CLAUDE.mdindex f36abb2294..4ab19fdd61 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -271,7 +271,7 @@ For edit resource form:And the re-usable form partial should be in `app/views/spree/admin/products/_form.html.erb`, eg.```erb-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_settings) %>diff --git a/admin/.cursor/rules/admin.mdc b/admin/.cursor/rules/admin.mdcindex a7f13ec868..10f33d2eea 100644--- a/admin/.cursor/rules/admin.mdc+++ b/admin/.cursor/rules/admin.mdc@@ -52,7 +52,7 @@ For edit resource forms:### Reusable Form Partial PatternCreate `_form.html.erb` with proper card structure:```erb-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_settings) %>@@ -164,7 +164,7 @@ For edit resource forms:### Reusable Form Partial PatternCreate `_form.html.erb` with proper card structure:```erb-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_settings) %>diff --git a/admin/app/assets/config/spree_admin_manifest.js b/admin/app/assets/config/spree_admin_manifest.jsindex e9e72f45bf..48e72efe47 100644--- a/admin/app/assets/config/spree_admin_manifest.js+++ b/admin/app/assets/config/spree_admin_manifest.js@@ -1,4 +1,3 @@-//= link spree/admin/actiontext.css//= link spree/admin/application.css//= link_tree ../imagesdiff --git a/admin/app/assets/stylesheets/spree/admin/actiontext.css b/admin/app/assets/stylesheets/spree/admin/actiontext.cssdeleted file mode 100644index f00bf6ccd6..0000000000--- a/admin/app/assets/stylesheets/spree/admin/actiontext.css+++ /dev/null@@ -1,36 +0,0 @@-/*- * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and- * the trix-editor content (whether displayed or under editing). Feel free to incorporate this- * inclusion directly in any other asset bundle and remove this file.- *- *= require trix-*/--/*- * We need to override trix.css’s image gallery styles to accommodate the- * <action-text-attachment> element we wrap around attachments. Otherwise,- * images in galleries will be squished by the max-width: 33%; rule.-*/-.trix-content .attachment-gallery > action-text-attachment,-.trix-content .attachment-gallery > .attachment {- flex: 1 0 33%;- padding: 0 0.5em;- max-width: 33%;-}--.trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment,-.trix-content .attachment-gallery.attachment-gallery--2 > .attachment, .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment,-.trix-content .attachment-gallery.attachment-gallery--4 > .attachment {- flex-basis: 50%;- max-width: 50%;-}--.trix-content action-text-attachment .attachment {- padding: 0 !important;- max-width: 100% !important;-}--.trix-button--dialog {- width: auto !important;- height: auto !important;-}diff --git a/admin/app/assets/stylesheets/spree/admin/application.scss b/admin/app/assets/stylesheets/spree/admin/application.scssdeleted file mode 100644index f698649298..0000000000--- a/admin/app/assets/stylesheets/spree/admin/application.scss+++ /dev/null@@ -1,46 +0,0 @@-@import 'global/variables';--@import 'bootstrap';--@import 'components/navbar';-@import 'components/tables';-@import 'components/badges';-@import 'components/cards';-@import 'components/alerts';-@import 'components/dropdowns';-@import 'components/main';-@import 'components/buttons';-@import 'components/tooltips';-@import 'components/filters';-@import 'components/navigation';-@import 'components/modals'; // old bootstrap modals-@import 'components/dialogs'; // new native dialogs-@import 'components/variants_form';-@import 'components/media_form';-@import 'components/seo_form';-@import 'components/line_items_form';-@import 'components/search_picker';-@import 'components/sortable_tree';-@import 'components/sidebar';-@import 'components/bulk_panel';-@import 'components/wizard';--@import 'plugins/tinymce_custom';-@import 'plugins/trix_custom';-@import 'plugins/tom-select.bootstrap4';--@import url('https://unpkg.com/[email protected]/dist/trix.css');-@import url('https://esm.sh/@uppy/[email protected]/dist/style.min.css');-@import url('https://esm.sh/@uppy/[email protected]/dist/style.min.css');-@import url('https://esm.sh/@uppy/[email protected]/dist/style.min.css');-@import url('https://esm.sh/[email protected]/animate.min.css');-@import url('https://esm.sh/@simonwep/[email protected]/dist/themes/classic.min.css');-@import url('https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/styles/github-dark.min.css');--@import 'plugins/uppy_fixes';--@import 'shared/base';-@import 'shared/forms';--@import 'views/dashboard';-@import "views/page_builder";diff --git a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss b/admin/app/assets/stylesheets/spree/admin/components/_alerts.scssdeleted file mode 100644index 374ad1e7ab..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss+++ /dev/null@@ -1,69 +0,0 @@-.alert {- display: inline-block;-}--.alert {- background-repeat: no-repeat;- background-position: 1rem center;- background-size: 1rem 1rem;- padding-left: 44px;- min-height: 2.5rem;- display: inline-flex;- flex-direction: column;- justify-content: center;-- > p:last-child {- margin-bottom: 0;- }-- a {- font-weight: $font-weight-medium;- color: theme-color('primary');- }-}--.alert-info {- background-color: #f7fcff;- border-color: rgba($info, 0.1) !important;-- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-info-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0' /%3E%3Cpath d='M12 9h.01' /%3E%3Cpath d='M11 12h1v4h1' /%3E%3C/svg%3E");-}--.alert-warning {- border-color: rgba($warning, 0.1) !important;- color: inherit;- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-alert-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0' /%3E%3Cpath d='M12 8v4' /%3E%3Cpath d='M12 16h.01' /%3E%3C/svg%3E");-}--.alert-danger {- background-color: #FEF2F2;- border-color: #FBE3E3;- color: #450A09;- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-exclamation-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M12 9v4' /%3E%3Cpath d='M12 16v.01' /%3E%3C/svg%3E");-}--.alert-success {- background-color: #ECFDF5;- color: #092E26;- border-color: #D5F9E6;- background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-check-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M9 12l2 2l4 -4' /%3E%3C/svg%3E");-}--.page-alerts {- .alert {- @extend .rounded-lg;- }-}--.alerts-container {- position: fixed;- width: 100%;- z-index: 1070;- top: 0.4rem;-- .alert {- border-width: 1px;- box-shadow: $box-shadow-sm;- border-radius: $border-radius-lg;- }-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_badges.scss b/admin/app/assets/stylesheets/spree/admin/components/_badges.scssdeleted file mode 100644index 5f77a18341..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_badges.scss+++ /dev/null@@ -1,122 +0,0 @@-.badge {- cursor: default;- @extend .d-inline-flex;- @extend .align-items-center;- font-weight: $badge-font-weight;- font-size: $badge-font-size;-}-.badge i {- @extend .mr-1;- font-size: 100%;-}-.badge .ti {- font-size: $badge-font-size;- line-height: $badge-font-size-}--// Green-.badge-completed,-.badge-complete,-.badge-resumed,-.badge-considered_safe,-.badge-paid,-.badge-shipped,-.badge-active,-.badge-success,-.badge-sold,-.badge-open,-.badge-authorized,-.badge-published,-.badge-live,-.badge-processed,-.badge-success,-.badge-create,-.badge-approved,-.badge-resolved,-.badge-reimbursed,-.badge-allocation,-.bg-success {- border: 1px solid transparent !important;- background-color: #C6F6D5 !important;- color: #22543D !important;-}--// Red-.badge-failed,-.badge-considered_risky,-.badge-error,-.badge-errored,-.badge-invalid,-.badge-rejected,-.badge-destroy,-.badge-closed,-.badge-canceled,-.badge-partially_canceled,-.badge-void,-.badge-danger {- border: 1px solid transparent;- background-color: #fee2e1 !important;- color: #8e1f0b !important;-}--// Orange-.badge-returned,-.badge-credit_owed,-.badge-balance_due,-.badge-backorder,-.badge-checkout,-.badge-suspended,-.badge-archived,-.badge-warning,-.badge-ready, // unfulfilled-.bg-warning-{- border: 1px solid transparent;- background-color: rgba(255, 235, 120, 1);- color: rgba(79, 71, 0, 1);-}--// light-.badge-processing,-.badge-pending,-.badge-paused,-.badge-awaiting_return,-.badge-cart,-.badge-inactive,-.badge-address,-.badge-delivery,-.badge-payment,-.badge-confirm,-.badge-disabled,-.badge-draft,-.badge-onboarding,-.badge-light,-.badge-authorize,-.badge-eligible,-.badge-invited {- @extend .bg-white;- @extend .text-muted;- @extend .border;- font-weight: $font-weight-normal;-- &:hover {- @extend .bg-white;- @extend .text-muted;- }-}--.badge-notice,-.badge-update,-.badge-partial,-.badge-capture,-.badge-info {- border: 1px solid transparent;- background-color: #E0EFFE;- color: #00527c;-}--.badge-dark {- background-color: transparent !important;- border: 1px solid $gray-800 !important;- color: $white;-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss b/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scssdeleted file mode 100644index 2b1f159beb..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_bulk_panel.scss+++ /dev/null@@ -1,81 +0,0 @@-.bulk-panel-container {- display: inline-flex;- align-items: center;- border-radius: 1rem;- background-color: $dropdown-bg;- box-shadow: $dropdown-box-shadow;- animation: bounceInUp;- animation-duration: 0.5s;- height: 3rem;- gap: 0.5rem;-- .btn {- height: 2.5rem;- &:hover {- background-color: $gray-50;- }- }-- > * {- height: 2.5rem;- display: flex;- align-items: center;- justify-content: center;-- &:first-child {- border-top-left-radius: $border-radius-lg;- border-bottom-left-radius: $border-radius-lg;- }-- &:last-child {- border-top-right-radius: $border-radius-lg;- border-bottom-right-radius: $border-radius-lg;-- .btn {- border-top-right-radius: $border-radius-lg;- border-bottom-right-radius: $border-radius-lg;- }- }- }-- .btn-close {- width: 2.5rem;- }-}--#bulk-panel {- position: fixed;- width: 100%;- text-align: center;- bottom: 1rem;- left: 0;- z-index: 1020;-}--@include media-breakpoint-up(lg) {- #bulk-panel {- left: 25%;- width: 75%;- }-}--@include media-breakpoint-up(xl) {- #bulk-panel {- left: 16.66666667%;- width: 83.33333333%;- }-}--.bulk-operations-counter {- padding-left: 1rem;- padding-right: 0;-- .bulk-operations-counter-label {- padding-right: 1rem;- display: flex;- align-items: center;- justify-content: center;- gap: 0.5rem;- border-right: 1px solid $border-color;- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scssdeleted file mode 100644index 6b0cc609bc..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss+++ /dev/null@@ -1,178 +0,0 @@-// https://github.com/hotwired/turbo/pull/386-button .show-when-disabled { display: none; }-button[disabled] .show-when-disabled { display: initial; }--button .show-when-enabled { display: initial; }-button[disabled] .show-when-enabled { display: none; }--.payment-action-save {- @include button-variant(theme-color('success'), theme-color('success'), theme-color('success') );-}--.btn {- transition: background-color 0.1s linear 0s, border-color 0.2s linear 0s !important;-}--.btn-primary, .btn-light, .btn-secondary {- box-shadow: $btn-box-shadow;-}--.btn,-.nav-pills > li > a {- vertical-align: middle;- transition: color 0.1s linear 0s, background-color 0.1s linear 0s, opacity 0.2s linear 0s !important;-}--.btn:focus {- outline: none !important;- box-shadow: none !important;-}--.btn:disabled {- cursor: not-allowed;-}--.ti {- font-size: 120%;- vertical-align: middle;-}--.btn {- display: inline-flex;- align-items: center;- justify-content: center;- text-align: center;- vertical-align: middle;-- .ship {- color: #fff;- }-}--.btn-primary {- @extend .shadow-xs;-}--.btn-lg {- @extend .py-2;- @extend .px-4;-}--.btn-danger {- @extend .btn-light;- color: $danger !important;-- &:hover {- background: rgba($danger, 0.1) !important;- border-color: rgba($danger, 0.1) !important;- color: $danger !important;- }-}--.hover-light {- &:hover, &:focus {- background-color: rgba($light, 0.75);- text-decoration: none;- }-}-.hover-gray {- &:hover, &:focus {- background-color: $gray-50;- text-decoration: none;- }-}-.hover-gray-200 {- &:hover, &:focus {- background-color: $gray-200;- text-decoration: none;- }-}-.hover-primary {- &:hover, &:focus {- background-color: theme-color('black');- text-decoration: none;- }-}--.btn-secondary {- color: $primary;- border-color: rgba($primary, 0.1);-- &:hover, &:focus {- border-color: rgba($primary, 0.2) !important;- color: $primary !important;- }-- .arrow {- color: $primary !important;- }-}--.actions .btn {- margin-left: 5px;-}--.btn-close {- @extend .btn;- background: transparent url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23000'%3e%3cpath d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/%3e%3c/svg%3e") center/0.85em auto no-repeat;- width: 0.85em;- height: 0.85em;- opacity: 0.5;- padding: 12px;- border-radius: $border-radius;-- &:hover {- opacity: 0.8 !important;- background-color: $gray-50 !important;- }-}--.btn i {- margin-right: 0.5rem;-}-.btn-sm i {- margin-right: 0.25rem;-}--.btn-light {- background-color: $gray-25;- border-color: $border-color;- color: $gray-700;-- &:hover, &:focus {- border-color: $border-color;- background-color: $gray-50;- color: $gray-900;- }-- &:focus, &:active {- background: $gray-50 !important;- box-shadow: $btn-active-box-shadow !important;- }-- &.bg-transparent {- background: transparent;- }-}--.btn-dark {- background-color: $gray-900;- color: $gray-200;-- &:hover, &:focus {- background: linear-gradient($gray-900, $primary) !important;- border-color: $gray-700 !important;- color: $white !important;- }-}--.btn-clipboard {- @extend .btn-light;- @extend .btn-sm;- @extend .px-1;- @extend .ml-2;- @extend .font-size-sm;-- min-width: 24px;- height: 24px;-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss b/admin/app/assets/stylesheets/spree/admin/components/_cards.scssdeleted file mode 100644index 9235a0a851..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss+++ /dev/null@@ -1,146 +0,0 @@-.card {- > .table,- .table-responsive > .table {- border-right: 0;- border-left: 0;- margin-bottom: 0;-- &:last-child, &:last-of-type {- border-bottom: 0;- }-- td:first-child,- th:first-child {- border-left: 0;- }-- td:last-child,- th:last-child {- border-right: 0;- }-- tr:first-child td,- tr:first-child th {- border-top: 0;- }-- tr:last-child td {- border-bottom: 0;- }- }-- .card-header + .table,- .card-header + .table-responsive > .table {- border-top: 0;- }-}--.card .card {- border-radius: $border-radius;-}--.card-header, .card-footer {- background-color: transparent;-}-.card-header {- display: flex;- align-items: center;- height: 54px;- border-bottom: 1px solid $gray-50;- padding-right: 1rem;-- .card-title {- margin-bottom: 0;- font-size: $font-size-plus;- 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 {- border-width: $card-border-width;- border-style: solid;- border-color: $card-border-color;- background-color: $card-bg;- border-radius: $card-border-radius;-}-.card-lg {- margin-bottom: 1rem;- padding: 0;-}--.card-text {- overflow-wrap: anywhere;-}--.card-body .form-group:last-child {- margin-bottom: 0;-}--.card-header .arrow {- @extend .w-auto;- &:before {- transition: .3s transform ease-in-out;- }-}-.card-header .collapsed .arrow:before {- transform: rotate(-90deg);-}--.collapsable-card {- @extend .card;- @extend .overflow-hidden;-- .card-header {- &:hover {- background-color: $light !important;- }- }- .card-body {- border-top: 1px solid $gray-50;- }-- // Arrow rotation when details is open- &[open] .arrow {- transform: rotate(90deg) !important;- }-- &:not([open]) .arrow {- transform: rotate(0deg) !important;- }-}--.collapsable-card, .card {- // Details/Summary styling for cards- details {- summary {- cursor: pointer;- list-style: none;- user-select: none;-- &::-webkit-details-marker {- display: none;- }-- &::marker {- display: none;- }-- // Ensure summary is clickable and accessible- &[role="button"] {- outline: none;-- &:focus {- outline: 2px solid $primary;- outline-offset: -2px;- }- }- }- }-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss b/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scssdeleted file mode 100644index 0f478ca3e9..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss+++ /dev/null@@ -1,210 +0,0 @@-/* Prevent scrolling while dialog is open */-body:has(dialog[data-dialog-target="dialog"][open]) {- // overflow: hidden;-}--/* Customize the dialog backdrop */-dialog {- box-shadow: 0 0 0 100vw rgba($modal-backdrop-bg, $modal-backdrop-opacity);-}--dialog:-internal-dialog-in-top-layer::backdrop {- background-color: rgba($modal-backdrop-bg, $modal-backdrop-opacity);-}--@keyframes fade-in {- 0% {- opacity: 0;- }- 100% {- opacity: 1;- }-}--@keyframes fade-out {- 0% {- opacity: 1;- }- 100% {- opacity: 0;- }-}--/* Add animations */-dialog[data-dialog-target="dialog"][open] {- animation: fade-in 200ms forwards;-}--dialog[data-dialog-target="dialog"][closing] {- animation: fade-out 200ms forwards;-}--dialog {- display: none;- z-index: $zindex-modal;- border-radius: $modal-content-border-radius;- border: $modal-content-border-width solid $modal-content-border-color;- background: $modal-content-bg;- box-shadow: $modal-content-box-shadow-xs;- overflow-y: auto;- overflow-x: hidden;-}-dialog:open {- display: flex;-}--.drawer {- position: fixed;- top: 0;- right: 0;- left: auto;- height: calc(100dvh - 2rem);- max-height: calc(100dvh - 2rem);- width: calc(100vw - 2rem);- max-width: 600px;- min-width: 320px;- margin: 1rem;- flex-direction: column;- justify-content: space-between;- padding: 0;- overflow-y: hidden;- overflow-x: hidden;-- .drawer-title {- margin-bottom: 0;- }-- &:open {- display: flex;- }-- .alerts-container {- position: absolute;- }-- @media (max-width: 991.98px) {- max-width: 100vw;- min-width: 100vw;- }-- > turbo-frame:not(#drawer_alerts), turbo-frame > form {- display: flex;- width: 100%;- height: 100%;- flex-direction: column;- justify-content: space-between;- overflow: hidden;- }-- .drawer-header {- display: flex;- justify-content: space-between;- align-items: center;- padding: $modal-inner-padding;- border-bottom: 1px solid $gray-50;- }-- .drawer-body {- flex: 1 1 auto;- overflow-y: auto;- padding: $modal-inner-padding;- }-- .drawer-footer {- padding: $modal-inner-padding;- display: flex;- justify-content: space-between;- align-items: center;- border-top: 1px solid $gray-50;- background-color: $gray-25;- }-}-// safari fix-.drawer[open] {- display: flex;-}--// Native Dialog component (centered modal replacement)-.dialog {- position: fixed;- top: 50%;- left: 50%;- transform: translate(-50%, -50%);- width: 90%;- max-width: 500px;- max-height: 90vh;- margin: 0;- padding: 0;- flex-direction: column;- overflow-y: hidden;- overflow-x: hidden;-- &.dialog-lg {- max-width: 800px;- }-- &.dialog-xl {- max-width: 1140px;- }-- &:open {- display: flex;- }-- .dialog-title {- margin-bottom: 0;- font-weight: $font-weight-medium;- }-- .alerts-container {- position: absolute;- }-- > turbo-frame:not(#dialog_alerts), turbo-frame > form {- display: flex;- width: 100%;- flex: 1 1 auto;- min-height: 0;- flex-direction: column;- }-- .dialog-header {- display: flex;- justify-content: space-between;- align-items: center;- padding: $modal-inner-padding;- border-bottom: 1px solid $gray-50;-- .btn-close {- margin-right: -0.25rem;- }- }-- .dialog-body {- flex: 1 1 auto;- overflow-y: auto;- padding: $modal-inner-padding;- max-height: calc(90vh - 200px);- }-- .dialog-footer {- position: sticky;- bottom: 0;- padding: $modal-inner-padding;- display: flex;- gap: 0.5rem;- align-items: center;- justify-content: space-between;- border-top: 1px solid $gray-50;- background-color: $gray-25;- border-radius: 0 0 $modal-content-border-radius $modal-content-border-radius;-- .btn {- display: inline-flex;- }- }-}-// safari fix-.dialog[open] {- display: flex;-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scssdeleted file mode 100644index 30ee17e2ff..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss+++ /dev/null@@ -1,151 +0,0 @@-.dropdown .btn .text-muted {- color: $gray-500 !important;-}--.dropdown {- .arrow {- color: $gray-300;- }-- &:hover {- .arrow {- color: $gray-500;- }- }-}--.dropdown.show {- .arrow {- transform: rotate(3.142rad);- }-}--.dropdown-menu, .dropdown-container {- margin-top: 0.25rem !important;- overflow: hidden !important;- box-shadow: $dropdown-box-shadow;- border-radius: $dropdown-border-radius;- box-shadow: $dropdown-box-shadow;- background-color: $dropdown-bg;- z-index: $zindex-dropdown;- min-width: $dropdown-min-width;- padding: $dropdown-padding-y $dropdown-padding-x;- font-size: $dropdown-font-size;- color: $dropdown-color;- max-width: 20rem;-- .dropdown-item, .dropdown-header {- padding-top: $dropdown-item-padding-y;- padding-bottom: $dropdown-item-padding-y;- padding-left: $dropdown-item-padding-x;- padding-right: $dropdown-item-padding-x;- }- .dropdown-header {- margin-bottom: 0.25rem;- margin-top: 0.25rem;- }-- .dropdown-item {- margin-bottom: 0.25rem;- border-radius: $dropdown-inner-border-radius;- display: flex;- align-items: center;- justify-content: flex-start;- background: transparent;- height: 2rem;- padding-right: 2rem;-- transition-property: background-color, color;- transition-duration: 0.01s;- transition-timing-function: ease;-- &:hover {- background-color: $dropdown-link-hover-bg;- color: $dropdown-link-hover-color;- }-- i {- margin-right: 0.5rem;- }-- .badge {- @extend .ml-auto;- @extend .align-self-center;- }- &.btn {- font-weight: $font-weight-base !important;- }- &.btn-danger {- box-shadow: none;- }- }- .dropdown-item.active {- color: theme-color('black') !important;-- i {- color: theme-color('black') !important;- }-- &::after {- content: '';- display: inline-block;- position: absolute;- right: 0.75rem;- width: 1rem;- height: 1rem;- background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-check text-primary"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l5 5l10 -10"/></svg>') no-repeat center center;- }- }- .dropdown-item.active {- font-weight: 600 !important;- background-color: $dropdown-link-hover-bg !important;- }- .button_to {- width: 100%;- }- .dropdown-header {- font-weight: $font-weight-base;- font-size: $font-size-base;- }-- .dropdown-item:last-child {- margin-bottom: 0px;- }-}-// new non-bootstrap dropdowns-.dropdown-container {- // Position is handled by Floating UI via inline styles- // Keep position: absolute but let Floating UI set top/left/right/bottom- position: absolute;- animation: fadeIn 0.15s ease-in-out;-- // Legacy classes kept for backward compatibility but no longer apply positioning- // Floating UI handles all positioning automatically- &.dropdown-container-left {- // No longer needed - Floating UI handles placement- }- &.dropdown-container-top {- // No longer needed - Floating UI handles placement- }-}--.dropdown-toggle {- &:after {- border: none;- content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-chevron-down'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M6 12l6 6l6 -6'/%3E%3C/svg%3E");- transition: transform 0.2s ease-in-out;- transform: rotate(0deg);- opacity: 0.5;- }-}-.dropdown-toggle:hover {- &:after {- opacity: 1;- }-}-.dropdown-toggle:focus, .dropdown-toggle:active, .dropdown-toggle[aria-expanded="true"] {- &:after {- transform: rotate(180deg);- opacity: 1;- }-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss b/admin/app/assets/stylesheets/spree/admin/components/_filters.scssdeleted file mode 100644index b1ab95e3c8..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss+++ /dev/null@@ -1,97 +0,0 @@-.filter-wrap {- padding: 0.55rem;- border-bottom: 1px solid $table-border-color;- gap: 0.55rem;- position: sticky;- top: $header-height;- z-index: 1000;- background-color: $card-bg;- border-top-left-radius: $card-border-radius;- border-top-right-radius: $card-border-radius;-- .btn {- height: 2.125rem;- }-}--#filters-search-bar {- max-width: 300px;- margin-right: auto;- height: 2.125rem;-}--#table-filter {- position: absolute;- padding: 1rem;- border-radius: $dropdown-border-radius;- box-shadow: $dropdown-box-shadow;- background-color: $dropdown-bg;- margin-top: 0.5rem;- right: 0.5rem;- animation: fadeIn 0.2s ease-in-out;- width: 100%;- z-index: $zindex-dropdown;- max-height: calc(100vh - #{$header-height} - 4rem);- overflow-y: auto;-- @include media-breakpoint-up(md) {- width: 50%;-- flex-direction: column;- }-- &.hidden {- display: none !important;- }-- &.d-none {- display: none !important;- }-}---.collapsed .arrow {- transform: rotate(-90deg);- transition: .3s ease-in-out;-}--i.js-delete-filter {- margin-bottom: 0;-}--.sort_link {- color: $gray-600;- padding: 0.25rem;- border-radius: $border-radius-sm;-- &:hover {- color: theme-color('primary') !important;- text-decoration: none !important;- background-color: $gray-50;- }-- &.asc, &.desc {- font-weight: $font-weight-medium;- svg {- color: $gray-600 !important;- }- }-- .icon, svg {- margin-left: 5px;- margin-bottom: 2px;- width: 0.8rem;- height: 0.8rem;- }-- svg.default-filter-arrow {- opacity: 0.3;- }-}--.filter-badges-container:has(*) {- @extend .mt-3;- display: flex;- gap: 0.5rem;- flex-wrap: wrap;-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_line_items_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_line_items_form.scssdeleted file mode 100644index 8755a9d6b8..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_line_items_form.scss+++ /dev/null@@ -1,32 +0,0 @@-.order-line-items {- &__form {- padding: 0.75rem;- border-bottom: 1px solid #e9ecef;- }-- &__form:last-child {- border-bottom: none;- }-- &__form {- &:hover {- background-color: $gray-25;- }- }-}--.shipment-line-items {- &__row,- &__form {- display: grid;- grid-template-columns: [product_description] 1fr [price] 10% [quantity] 15% [total] 10% [actions] 5%;- grid-auto-flow: row;- padding-bottom: 0.75rem;- padding-top: 0.75rem;- }-- &__form {- grid-column: 1/-1;- row-gap: 0.5rem;- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scssdeleted file mode 100644index fe81eb1f56..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss+++ /dev/null@@ -1,87 +0,0 @@-#page-header {- height: 80px;- display: flex;- align-items: center;- background-color: $body-bg;-- &.sticky-top {- padding-left: 1rem;- padding-right: 1rem;- animation: slideDown 0.3s ease-out;- height: $header-height;- border-bottom: 1px solid $border-color;- width: 100%;- max-width: 100%;- }-}--#settings-header {- height: $header-height;- background-color: $header-bg;- z-index: 1000;- position: sticky;- top: 0;- display: flex;- align-items: center;- padding: 0 0;-- #page-header {- margin-bottom: 0;- 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;- }-}--.page-header-title {- font-size: 1.25rem;-}--#page-tabs {- margin-top: -1rem;-- .nav {- gap: 1rem;- display: flex;- flex-wrap: nowrap;- overflow-x: auto;- padding-left: 0;- margin-bottom: -1px;-- .nav-link {- border-radius: 0;- padding-bottom: 1rem;- padding-top: 1rem;- padding-left: 0rem;- padding-right: 0rem;-- &.active {- background-color: transparent;- color: theme-color('primary');- font-weight: 600;- }- }- }-}--#content {- transition: margin-left 0.1s ease;-- @media (min-width: 992px) {- margin-left: $sidebar-width + 1px;- }-}---.documentation-link-container {- font-size: $font-size-sm;- text-align: center;- margin-top: 2rem;- color: $gray-400;-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_media_form.scssdeleted file mode 100644index 9621824357..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss+++ /dev/null@@ -1,111 +0,0 @@-.upload-area {- display: flex;- flex-direction: column;- gap: 0.5rem;- justify-content: center;- align-items: center;- overflow: hidden;- border-radius: $border-radius-lg;- border: 1px dashed $border-color;- background-color: $light;- padding: 0.5rem;- cursor: pointer;- color: $gray-500;-- transition-property: background-color, border-color, color;- transition-duration: 0.5s;- transition-timing-function: ease;-- &:hover {- background-color: $action;- border-color: rgba($blue, 0.25);- color: rgba($primary, 0.75);-- .text-muted {- color: rgba($primary, 0.5) !important;- }- }-- &:active {- background-color: $action;- border-color: rgba($blue, 0.5);- box-shadow: 0 0 0 2px $white, 0 0 0 4px $blue !important;- }-}--.media-form {- display: grid;- grid-template-columns: repeat(6, 1fr);- grid-gap: 0.5rem;- width: 100%;- height: 100%;- user-select: none;-- &__add-button {- aspect-ratio: 1/1;-- &:only-child {- grid-column: 1 / span 6;- grid-row: 1 / span 1;- aspect-ratio: 12/1;- max-width: 200px;- height: 200px;- }-- &:not(:only-child) {- height: 100% !important;- }- }-- &__image {- padding: 0.5rem;- border: none;- overflow: hidden;- display: flex;- width: 100%;- height: 100%;- aspect-ratio: 1/1;- border-radius: $border-radius;- position: relative;- justify-content: space-between;- align-items: flex-start;- transition-property: box-shadow;- transition-duration: 0.2s;- transition-timing-function: ease-in-out;- box-shadow: rgba(209, 217, 224, 0.5) 0px 0px 0px 1px;-- & img {- top: 0;- left: 0;- }-- & .move-handle {- z-index: 2;- color: white;- }-- .custom-checkbox:has(input:checked) {- display: inline !important;- }-- &:hover {- .custom-checkbox {- display: inline !important;- }- .move-handle {- display: inline !important;- }-- box-shadow: rgba(209, 217, 224, 0.8) 0px 0px 0px 1px, rgba(37, 41, 46, 0.04) 0px 3px 6px -3px, rgba(37, 41, 46, 0.12) 0px 2px 6px 0px !important;- }-- &:has(input:checked) {- box-shadow: 0 0 0 2px $blue !important;- }-- &:first-of-type {- grid-column: 1 / span 2;- grid-row: 1 / span 2;- }- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss b/admin/app/assets/stylesheets/spree/admin/components/_modals.scssdeleted file mode 100644index 0eea2bbd36..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss+++ /dev/null@@ -1,45 +0,0 @@-body.modal-open, .modal.fade.show {- padding-right: 0 !important;-}--body.modal-open {- width: 100%;- overflow-y: scroll !important;- overflow-x: clip;-}--.modal-content {- box-shadow: $modal-content-box-shadow-xs;-}--.modal-header {- @extend .align-items-center;- border-color: $gray-50;-- .modal-title {- margin-bottom: 0;- font-weight: $font-weight-medium;- }-- .btn-close {- margin-right: -0.25rem;- }-}-.modal-footer {- display: flex;- justify-content: end;- padding: $modal-inner-padding;- background-color: $gray-25;- border-top: 1px solid $gray-50;-- .btn {- display: inline-flex ;- width: auto !important;- height: 2.5rem;- }-}--.modal-dialog turbo-frame {- display: block;- width: 100%;-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_navbar.scss b/admin/app/assets/stylesheets/spree/admin/components/_navbar.scssdeleted file mode 100644index 8536f59db6..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_navbar.scss+++ /dev/null@@ -1,6 +0,0 @@-#header {- height: $header-height;- background-color: $header-bg;-- box-shadow: inset 0 -1px 0 $border-color;-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss b/admin/app/assets/stylesheets/spree/admin/components/_navigation.scssdeleted file mode 100644index 20b5a64878..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss+++ /dev/null@@ -1,51 +0,0 @@-.nav-link.disabled {- cursor: not-allowed;- opacity: 0.5;-}--.arrow {- width: 1rem;-}--.nav-link {- cursor: pointer;- position: relative;- transition: background 0.15s, color 0.1s;- will-change: background, color;-- &:hover {- color: theme-color('primary');- }-}--#header {- nav {- padding-top: 0.75rem;- padding-bottom: 0.75rem;- }-- .dropdown-menu {- min-width: 12rem;- }-}--.nav-pills {- .nav-item {- @extend .mr-1;-- &:last-child {- @extend .mr-0;- }-- .nav-link {- &:hover {- color: theme-color('primary') !important;- background-color: theme-color('active');- }- &.active, &:focus, &:active {- background-color: $gray-50;- color: theme-color('primary') !important;- }- }- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_search_picker.scss b/admin/app/assets/stylesheets/spree/admin/components/_search_picker.scssdeleted file mode 100644index 946c686ce1..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_search_picker.scss+++ /dev/null@@ -1,47 +0,0 @@-.search-results {- height: 250px;-}--.search-picker__option {- position: relative;- margin-bottom: 0.5rem;- display: flex;- cursor: pointer;- align-items: center;- border: 1px solid transparent;- border-radius: $border-radius;- padding-right: 2rem;-- label {- margin-bottom: 0;- width: 100%;- height: 100%;- padding: 0.5rem;- display: flex;- align-items: center;- justify-content: start;- }-- input[type="checkbox"], input[type="radio"] {- display: none;- }-- &:hover {- background-color: $gray-25;- }-- &:has(input:checked) {- background-color: theme-color('action');- border: 1px solid theme-color('action-border');-- &::after {- content: '';- display: inline-block;- position: absolute;- right: 0.5rem;- width: 24px;- height: 24px;- background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-check text-primary"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l5 5l10 -10"/></svg>') no-repeat center center;- }- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_seo_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_seo_form.scssdeleted file mode 100644index 822960a62f..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_seo_form.scss+++ /dev/null@@ -1,16 +0,0 @@-.seo-form {- .card-body {- gap: 1rem;- }-- .seo__preview {- gap: 0.125rem;-- &__title {- color: #1a0dab;- }- &__link {- color: #006625;- }- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_sidebar.scss b/admin/app/assets/stylesheets/spree/admin/components/_sidebar.scssdeleted file mode 100644index 503215c746..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_sidebar.scss+++ /dev/null@@ -1,693 +0,0 @@-.store-dropdown {- display: flex;- align-items: center;- justify-content: space-between;- padding-left: 0.5rem;- padding-right: 0.75rem;- background-color: $sidebar-bg;- width: $sidebar-width;- border-right: 1px solid $border-color;- height: calc($header-height + 1px);- transition: width 0.1s ease;-}--.store-dropdown-button {- padding: 0.25rem;- display: flex;- align-items: center;- justify-content: space-between;- text-align: left;- gap: 0.5rem;- box-shadow: none !important;-- &:hover {- background-color: $gray-50;- }-}--.store-chooser {- display: flex;- flex-direction: column;- gap: 0.25rem;- padding: 0.25rem;- margin: 0.25rem;- border: 1px solid $border-color;- border-radius: $border-radius-lg;-- .store-chooser-item {- display: flex;- align-items: center;- gap: 0.5rem;- border-radius: $border-radius;- padding: 0.25rem;- text-wrap: nowrap;-- &:hover {- text-decoration: none;- background-color: $dropdown-link-hover-bg;- }-- &.active {- cursor: not-allowed;- background-color: $action;- }- }-}--// User dropdown in sidebar-.user-dropdown {- position: fixed;- bottom: 0;- left: 0;- display: none;- align-items: center;- justify-content: space-between;- padding: 0.75rem 0.5rem;- background-color: $sidebar-bg;- width: $sidebar-width;- border-right: 1px solid $border-color;- border-top: 1px solid $border-color;- transition: width 0.1s ease;- z-index: 10;-- @media (min-width: 992px) {- display: flex;- }-- > .dropdown {- width: 100%;- overflow: hidden;- }-}--.user-dropdown-button {- padding: 0.25rem;- display: flex;- align-items: center;- justify-content: flex-start;- text-align: left;- gap: 0.5rem;- box-shadow: none !important;- width: 100%;- overflow: hidden;-- &:hover {- background-color: $gray-50;- }-- .user-name {- flex: 1;- width: 0;- min-width: 0;- overflow: hidden;- text-overflow: ellipsis;- white-space: nowrap;- font-size: 0.875rem;- }-}--// Toggle button-.sidebar-toggle-btn {- width: 32px;- height: 32px;- padding: 0;- display: flex;- align-items: center;- justify-content: center;- border-radius: $border-radius;- background-color: transparent;- border: none;- z-index: 10;-- &:hover {- background-color: $gray-50;- }-}--#main-sidebar {- display: flex;- flex-direction: column;- gap: 0.5rem;- width: $sidebar-width;- background-color: $sidebar-bg;- box-shadow: inset -1px 0 0 $border-color;- height: calc(100vh - $header-height);- overflow-x: hidden;- position: fixed;- top: $header-height;- padding-top: 0.8rem;- transition: width 0.1s ease, padding 0.1s ease;-- @media (max-width: 992px) {- display: none;- }-- // Sidebar content- .sidebar-content {- opacity: 1;- transition: opacity 0.2s ease;- }-- .nav {- padding-left: 0.75rem;- padding-right: 0.75rem;- gap: 0.25rem;- display: flex;- flex-direction: column;- }-- .nav-link {- border-radius: $border-radius-lg;- display: flex;- align-items: center;- padding-left: 0.25rem;- padding-right: 0.25rem;- padding-top: 0.25rem;- padding-bottom: 0.25rem;- color: inherit;- white-space: nowrap;- transition: background-color 0.1s ease-in-out;-- .ti {- margin-right: 0.5rem;- border-radius: $border-radius;- padding: 0.2rem 0.2rem;- flex-shrink: 0;- }-- &:hover {- background-color: $gray-50;-- .ti {- color: theme-color('primary');- }- }- &.active {- color: theme-color('primary');- background-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.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;- font-weight: $font-weight-medium;-- .ti {- background-color: theme-color('primary');- color: $white;- }- }-- .badge:not(.badge-info) {- @extend .badge-light;- border-radius: $border-radius;- }- }-- .nav-submenu {- display: flex;- flex-direction: column;- list-style: none;- padding-top: 0.25rem;- padding-left: 2rem;- &:before {- content: '';- position: absolute;- left: 1rem;- top: 0;- bottom: 0.25rem;- width: 1px;- background-color: $gray-200;- }- position: relative;-- .nav-link {- font-weight: 400;- padding-top: 0.25rem;- padding-bottom: 0.25rem;-- &:hover {- background-color: $gray-50;- }- &.active, &:active, &:focus {- font-weight: 600;- background-color: transparent !important;- box-shadow: none;-- &:before {- content: '';- position: absolute;- left: calc(-1rem - 1px);- top: 10%;- width: 3px;- height: 80%;- background-color: theme-color('primary');- border-radius: $border-radius-sm;- }- }- }- }-- .dropdown {- padding-left: 0.5rem;- padding-right: 0.5rem;-- .btn {- padding: 0.25rem 0.25rem;- border-radius: $border-radius;- display: flex;- align-items: center;-- &:hover, &:focus, &:active {- background-color: $gray-50;- }- }-- .dropdown-menu {- width: calc(100% - 1rem) !important;- }- }-}--// Disable transitions during initial page load to prevent animation flash-body.sidebar-no-transition {- #main-sidebar,- .store-dropdown,- .user-dropdown,- #content,- .sidebar-toggle-btn {- transition: none !important;- }-}--// Collapsed state-body.sidebar-collapsed {- .sidebar-toggle-btn {- transform: rotate(180deg);- }-- #main-sidebar {- width: $sidebar-width-collapsed;- padding-left: 0;- padding-right: 0;-- .sidebar-content {- // Keep content visible but modify layout- opacity: 1;- pointer-events: auto;-- .nav > .nav-item > .nav-link {- justify-content: center;- padding-left: 0;- padding-right: 0;- width: 40px;- height: 40px;- margin: 0 auto;- overflow: visible;- font-size: 0;- position: relative;-- .ti {- margin-right: 0;- font-size: 1.25rem;- }-- // Hide text labels (direct text nodes)- span:not(.badge) {- display: none;- }-- // Position badges as notification counters- .badge {- display: flex;- position: absolute;- top: 0;- right: 0;- transform: translate(25%, -25%);- min-width: 18px;- height: 18px;- padding: 0 0.25rem;- font-size: 0.625rem;- line-height: 18px;- border-radius: 9px;- justify-content: center;- align-items: center;- }- }-- #nav-link-vendors .badge {- display: none !important;- }-- .nav-section-header {- width: $sidebar-width-collapsed - 20px;- span {- display: none;- }- }- }-- .nav {- padding-left: 0;- padding-right: 0;- align-items: center;- }-- // Hide submenus and dropdowns when collapsed- .nav-submenu,- .dropdown {- display: none;- }-- // Hide enterprise edition notice- #enterprise-edition-notice {- display: none;- }-- // Hide any mt-auto sections- .mt-auto {- display: none;- }-- .nav-submenu {- gap: 0.25rem !important;- }- }-- .store-dropdown {- width: $sidebar-width-collapsed;- overflow: visible;- justify-content: center;- padding-left: 0;- padding-right: 0;-- #new-item-dropdown,- .store-name {- display: none !important;- }-- .store-dropdown-button {- width: 44px;- height: 44px;- padding: 0.25rem;- justify-content: center;- overflow: hidden;-- // Hide dropdown toggle arrow- &::after {- display: none;- }-- .store-logo, img, .ti {- margin: 0;- }-- // Keep the icon/logo element visible- .rounded-sm, .bg-white, .border, .text-dark, .bg-gray-200,- div[class*="rounded"], div[class*="bg-"] {- display: flex !important;- width: 32px;- height: 32px;- font-size: 1rem;- }-- // Hide all text spans and chevron when collapsed- span:not([class*="rounded"]):not([class*="bg-"]),- .ti-chevron-down,- small,- strong {- display: none;- }-- // Keep only icons/logos visible- img, .ti:not(.ti-chevron-down) {- display: block;- }- }- }-- .user-dropdown {- width: $sidebar-width-collapsed;- overflow: visible;- justify-content: center;- padding-left: 0;- padding-right: 0;-- .dropdown {- display: block !important;- }-- .user-name {- display: none !important;- }-- .user-dropdown-button {- width: 44px;- height: 44px;- padding: 0.25rem;- justify-content: center;- overflow: visible;-- // Hide dropdown toggle arrow- &::after {- display: none;- }-- // Keep avatar visible and centered- .avatar {- display: flex !important;- margin: 0;- }- }- }-- #content {- @media (min-width: 992px) {- margin-left: $sidebar-width-collapsed + 1px;- }- }-}--// Mobile Sidebar-.sidebar-mobile {- position: fixed;- inset: 0;- z-index: 1050;- visibility: hidden;- pointer-events: none;-- .sidebar-backdrop {- position: absolute;- inset: 0;- background-color: rgba($black, 0.5);- opacity: 0;- transition: opacity 0.1s ease;- }-- .sidebar-panel {- position: absolute;- left: 0;- top: 0;- bottom: 0;- width: $sidebar-width;- background-color: $sidebar-bg;- overflow-y: auto;- transform: translateX(-100%);- transition: transform 0.1s ease;- box-shadow: $box-shadow-lg;- display: flex;- flex-direction: column;-- .sidebar-mobile-header {- display: flex;- justify-content: flex-end;- padding: 0.75rem;- border-bottom: 1px solid $border-color;- background-color: $sidebar-bg;- position: sticky;- top: 0;- z-index: 1;-- .btn {- padding: 0.25rem;- width: 32px;- height: 32px;- display: flex;- align-items: center;- justify-content: center;- }- }-- .sidebar-mobile-content {- padding-top: 0.5rem;- flex: 1;- overflow-y: auto;-- // Match desktop expanded sidebar styles- .nav {- padding-left: 0.75rem;- padding-right: 0.75rem;- gap: 0.25rem;- display: flex;- flex-direction: column;- }-- .nav-link {- border-radius: $border-radius-lg;- display: flex;- align-items: center;- padding-left: 0.25rem;- padding-right: 0.25rem;- padding-top: 0.25rem;- padding-bottom: 0.25rem;- color: inherit;- white-space: nowrap;- transition: background-color 0.1s ease-in-out;-- .ti {- margin-right: 0.5rem;- border-radius: $border-radius;- padding: 0.2rem 0.2rem;- flex-shrink: 0;- }-- &:hover {- background-color: $gray-50;-- .ti {- color: theme-color('primary');- }- }-- &.active {- color: theme-color('primary');- background-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.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;- font-weight: $font-weight-medium;-- .ti {- background-color: theme-color('primary');- color: $white;- }- }-- .badge:not(.badge-info) {- @extend .badge-light;- border-radius: $border-radius;- }- }-- .nav-submenu {- display: flex;- flex-direction: column;- list-style: none;- padding-top: 0.25rem;- padding-left: 2rem;- position: relative;-- &:before {- content: '';- position: absolute;- left: 1rem;- top: 0;- bottom: 0.25rem;- width: 1px;- background-color: $gray-200;- }-- .nav-link {- font-weight: 400;- padding-top: 0.25rem;- padding-bottom: 0.25rem;-- &:hover {- background-color: $gray-50;- }-- &.active, &:active, &:focus {- font-weight: 600;- background-color: transparent !important;- box-shadow: none;-- &:before {- content: '';- position: absolute;- left: calc(-1rem - 1px);- top: 10%;- width: 3px;- height: 80%;- background-color: theme-color('primary');- border-radius: $border-radius-sm;- }- }- }- }-- .dropdown {- padding-left: 0.5rem;- padding-right: 0.5rem;-- .btn {- padding: 0.25rem 0.25rem;- border-radius: $border-radius;- display: flex;- align-items: center;-- &:hover, &:focus, &:active {- background-color: $gray-50;- }- }-- .dropdown-menu {- width: calc(100% - 1rem) !important;- }- }- }-- // User dropdown in mobile sidebar- .user-dropdown {- position: relative;- display: flex;- width: 100%;- border-right: none;- border-top: 1px solid $border-color;- margin-top: auto;- }- }-- &.sidebar-mobile-open {- visibility: visible;- pointer-events: auto;-- .sidebar-backdrop {- opacity: 1;- }-- .sidebar-panel {- transform: translateX(0);- }- }-}--#enterprise-edition-notice {- @extend .alert;- @extend .alert-info;-- background-image: none;- position: relative;- font-size: $font-size-sm;- padding: 0.5rem 1rem;- margin: 0.75rem;- border-width: 1px;- box-shadow: $box-shadow-xs;- p {- margin-bottom: 0.5rem;- }-- .btn-close {- position: absolute;- right: 0.25rem;- top: 0.25rem;- color: inherit !important;-- &:hover {- background-color: transparent !important;- }- }-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss b/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scssdeleted file mode 100644index a3891aa7f5..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_sortable_tree.scss+++ /dev/null@@ -1,63 +0,0 @@-#itemImgContainer {- width: 200px;- img {- max-width: 100%;- }-}--#sortableTreeArea {- .space-buttons {- box-shadow: -11px 0 16px 6px white;- z-index: 9;- a {- margin: 2px;- }- }-- .sortable-tree-item-row {- margin: 2px;- background-color: white;- }-- .sortable-tree-item {- border: solid 1px transparent;- padding: 0;-- [data-sortable-tree-parent-id-value] {- margin-left: 25px;- }-- @include media-breakpoint-up(sm) {- [data-sortable-tree-parent-id-value] {- margin-left: 50px;- }- }- }-- .sortable-chosen {- background-color: transparent !important;- border-color: transparent !important;- .sortable-tree-item-row {- background-color: $action !important;- border: 2px solid $blue !important;- margin: -1px;- }- }-- .item_image_holder {- position: relative;- border: 1px solid $border-color;- border-radius: 7px;- overflow: hidden;- width: 45px;- height: 45px;- img {- position: absolute;- left: 50%;- top: 50%;- height: 100%;- width: auto;- transform: translate(-50%,-50%);- }- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scssdeleted file mode 100644index 23e8bdff33..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss+++ /dev/null@@ -1,230 +0,0 @@-.list-group, .table {- color: $gray-800;-}--#filters-search-bar {- max-width: 300px;- margin-right: auto;-}--table.table {- margin-bottom: 0;-- th {- border-top: 0;- @extend .text-nowrap;- border-bottom: 0;-- &.handel-head {- width: 50px;- }- a.sort_link {- white-space: nowrap;- }- }-- td.move-handle {- width:45px;- }-- td > a:not(.btn):not(.text-primary) {- @extend .text-dark;- }-- thead {- th {- background-color: $light;- @extend .text-muted;- font-size: $font-size-sm;- font-weight: $font-weight-medium;- vertical-align: middle;- padding-top: 0.45rem;- padding-bottom: 0.45rem;- }- th:first-child {- border-top-left-radius: $card-border-radius;- }- th:last-child {- border-top-right-radius: $card-border-radius;- }- }-- tbody {- tr {- td {- vertical-align: middle;- .filterable {- margin-left: .2em;- cursor: pointer;- width: 0.9rem;- height:0.9rem;- opacity: 0.25;- &:hover {- opacity: 1;- }- }-- a:hover {- text-decoration: none;- }- }-- &.active {- td {- background-color: theme-color('action');- border-color: theme-color('action-border');- }- }- }-- tr:hover:not(.active):not(.sortable-chosen) {- td {- background-color: rgba($gray-25, 0.75);- }- }-- tr:last-child {- td:first-child {- border-bottom-left-radius: $card-border-radius;- }- td:last-child {- border-bottom-right-radius: $card-border-radius;- }- }- }-- tr > td:first-child, tr > th:first-child {- padding-left: 1rem;- }- tr > td:last-child, tr > th:last-child {- padding-right: 1rem;- }-}--.table-active-filters {- padding: 0.75rem;-- &:not(:has(:first-child)) {- display: none;- }-- .js-filter {- .icon {- cursor: pointer;- }- }-- .badge-secondary {- .icon {- filter: invert(1);- }- }-- .badge {- display: inline-block;- margin-right: .5em;- margin-bottom: .5em;-- &:hover {- opacity: .8;- }- }-}--.table-responsive tr td, .table-responsive tr th {- white-space: nowrap;-}--.table-responsive.border {- border-color: $table-border-color !important;-}--.table-responsive:has(.dropdown.show) {- overflow: visible;-}--.sortable-drag-v {- border: 1px solid theme-color('info');- border-radius: $border-radius;- width:100%;- text-align: right;- opacity: 0;- td {- border-top: none;- opacity:0;- &:first-child {- opacity: 1;- }- }-}--td.actions {- @extend .text-right;-- .btn {- @extend .text-nowrap;- }-- .btn:not(.btn-sm) {- @extend .py-2;- }- .btn-sm {- @extend .py-1;- }-}--.select2-container--open {- z-index: 1060;-}--.bulk-edit-panel {- top: 59px;-- @media (min-width: 768px) {- top: 0px;- }-}--.card-lg {- .with-filters, turbo-frame {- table {- thead {- th:first-child {- border-top-left-radius: 0;- }- th:last-child {- border-top-right-radius: 0;- }- }- }- }-}--.pagination-container {- border-top: 1px solid $table-border-color;- padding-top: 0.5rem;- padding-bottom: 0.5rem;-- position: sticky;- bottom: 0;- background-color: $card-bg;- z-index: 100;- border-bottom-left-radius: $card-border-radius;- border-bottom-right-radius: $card-border-radius;-- .page-link {- @extend .btn;- @extend .btn-sm;- @extend .btn-light;- @extend .ml-1;- @extend .p-2;-- .ti {- @extend .mr-0;- }- }- .page-item.disabled {- cursor: not-allowed;- opacity: 0.2;- }-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_tooltips.scss b/admin/app/assets/stylesheets/spree/admin/components/_tooltips.scssdeleted file mode 100644index b93bc1352e..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_tooltips.scss+++ /dev/null@@ -1,20 +0,0 @@-.tooltip-container {- position: absolute;- display: none;- opacity: 1 !important; // Ensure fully opaque- pointer-events: none;- z-index: $zindex-tooltip;- background-color: $tooltip-bg;- color: $tooltip-color;- border: 0 none;- box-shadow: 0px 0px 0px 1px $border-color, 0px 3px 6px -1px rgba($gray-300, 0.35), 0px 3px 6px 0px rgba($gray-300, 0.35);- border-radius: $tooltip-border-radius;- padding: $tooltip-padding-y $tooltip-padding-x;- font-size: $font-size-base !important;- font-weight: $font-weight-normal !important;- max-width: $tooltip-max-width;- white-space: normal;- overflow-wrap: anywhere;- word-break: break-word;- text-wrap: wrap;-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scssdeleted file mode 100644index 70ac4fd30f..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss+++ /dev/null@@ -1,206 +0,0 @@-.variants-form {- display: flex;- flex-direction: column;- gap: 2rem;-- .options-creator {- margin: 1rem;- padding: 0.5rem;- border: 1px solid $border-color;- border-radius: $border-radius;-- &:not(:has(.options-creator__options_container .options-creator__option)) {- margin: 0;- border: none;-- .options-creator__option--new {- padding-left: 1rem;- }- }- &:has(.options-creator__option--new:not(.d-none)) {- border: 1px solid $border-color;- border-radius: $border-radius;- margin: 1rem;- margin-bottom: 1rem;- }-- &__option {- display: flex;- border-bottom: 1px solid $border-color;- padding: 0.5rem 0.5rem 1rem 0;- margin-bottom: 0.5rem;-- .label {- margin-bottom: 0.5rem;- font-weight: $font-weight-medium;- display: inline-block;- }-- .draggable {- @extend .btn;- @extend .px-2;- @extend .py-0;- @extend .mr-3;- cursor: grab !important;- padding-right: 1rem;- align-items: center;- justify-content: center;- min-width: calc(16px + 1rem);-- i {- margin-right: 0;- }-- &:hover {- background-color: $gray-25;- }- }-- &--new {- padding-left: calc(1.13px + 3.25rem);- border-bottom: none;- margin-bottom: 0;- padding-bottom: 0.5rem;-- .values-inputs {- display: flex;- flex-direction: column;- gap: 0.25rem;- }- }-- &--form {- @extend .options-creator__option--new;- }- }- &__option:first-child {- border-top: 0;- }-- .new_option_button {- @extend .btn;- @extend .btn-secondary;- @extend .py-2;- width: 100%;- justify-content: flex-start;- }- }-- .variants-table {- display: flex;- flex-direction: column;-- .column-checkbox,- .column-variant,- .column-price,- .column-quantity,- .column-actions {- display: inline-flex;- align-items: center;- }-- .column-checkbox {- justify-content: center;- flex-grow: 0;- flex-basis: 2rem;- }- .column-variant {- user-select: none;- flex-grow: 3;- flex-basis: 0;- }- .column-price {- flex-grow: 1;- flex-basis: 0;- }- .column-actions {- flex-grow: 0;- flex-basis: 5rem;- }- .column-quantity {- justify-content: space-between;- width: 100%;- line-height: 28px;- flex-grow: 1;- flex-basis: 0;- }-- .delete-button {- @extend .btn;- @extend .btn-danger;- @extend .btn-sm;- }-- &__actions {- display: none;- width: 100%;- justify-content: flex-end;- padding: 1rem;- padding-top: 0;-- &:has(*) {- display: flex;- }-- &__select {- width: min-content;- padding-right: 1.75rem;- }- }-- &__header,- &__footer {- display: flex;- @extend .text-muted;- width: 100%;- padding: 0 1rem;- gap: 0.25rem;- background-color: rgba($gray-25, 0.5);-- &__cell {- display: inline-block;- }- }-- &__footer {- justify-content: center;- align-items: center;- padding-top: 0.5rem;- padding-bottom: 0.5rem;- border-radius: $border-radius;- border-top-left-radius: 0;- border-top-right-radius: 0;- border-bottom-left-radius: $border-radius-lg;- border-bottom-right-radius: $border-radius-lg;- }-- &__body {- display: flex;- flex-direction: column;-- &__row {- padding: 0 1rem;- width: 100%;- display: flex;- gap: 0.25rem;-- border-bottom: 1px solid $table-border-color;-- &.nested {- .column-checkbox,- .column-variant {- left: 1.25rem;- position: relative;- }- .column-variant {- width: calc(100% - 1.25rem);- }- }- }- &__cell {- padding: 0.5rem 0;- display: block;- }- }- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_wizard.scss b/admin/app/assets/stylesheets/spree/admin/components/_wizard.scssdeleted file mode 100644index 2b45b52c71..0000000000--- a/admin/app/assets/stylesheets/spree/admin/components/_wizard.scss+++ /dev/null@@ -1,27 +0,0 @@-.admin-wizard {- .store-dropdown {- border-bottom: 1px solid $border-color;- }-- h1 {- margin-bottom: 1.5rem;- }-- footer {- position: fixed;- bottom: 0;- left: 0;- width: 100%;- border-top: 1px solid $border-color;- padding-left: 1.5rem;- padding-right: 1.5rem;- padding-top: 1rem;- padding-bottom: 1rem;- background-color: $gray-25;- display: flex;- align-items: center;- justify-content: space-between;- gap: 1rem;- z-index: 1000;- }-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssdeleted file mode 100644index 07ee6f64fe..0000000000--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ /dev/null@@ -1,242 +0,0 @@-// https://github.com/twbs/bootstrap/blob/v4.6.2/scss/_variables.scss--$gray-25: #FAFAFA;-$gray-50: #F3F3F3;-$gray-100: #E3E3E3 !default;-$gray-200: #D5D5D5 !default;-$gray-300: #B3B3B3 !default;-$gray-400: #999999 !default;-$gray-500: #808080 !default;-$gray-600: #666666 !default;-$gray-700: #4D4D4D !default;-$gray-800: #333333 !default;-$gray-900: #1A1A1A !default;--$light: $gray-25 !default;--$primary: #061932 !default;-$black: #000000 !default;-$blue: #0090FE !default;-$white: #FFFFFF !default;--$action: #F4F9FF !default;-$action-border: #e2ecff !default;--// Override Bootstrap 4.6 breakpoints-$container-max-widths: (- sm: 540px,- md: 720px,- lg: 960px,- xl: 1250px-) !default;-$grid-gutter-width: 16px !default;--$theme-colors: (- "white": $white,- "black": $black,- "primary": $primary,- "secondary": rgba($blue, 0.05),- "action": $action,- "action-border": $action-border,- "active": $gray-25,- "partial": #E2E8F0,- "warning": #ffe17d,- "danger": #ee4266,- "info": #44c1ff,- "blue": $blue,- "gray-100": $gray-100,- "gray-200": $gray-200,- "gray-300": $gray-300,- "gray-400": $gray-400,- "gray-500": $gray-500,- "gray-600": $gray-600,- "gray-700": $gray-700,- "gray-800": $gray-800,- "gray-900": $gray-900-);--$body-color: #333 !default;-$body-bg: $white !default;-$enable-shadows: false;-$enable-responsive-font-sizes: true;-$font-family-sans-serif: Inter, sans-serif !default;-$font-size-base: 0.875rem !default;-$font-size-plus: 0.875rem !default;-$font-size-sm: 0.75rem !default;-$font-size-lg: 1rem !default;-$font-weight-normal: 400 !default;-$font-weight-medium: 500 !default;-$font-weight-bold: 600 !default;-$headings-font-family: $font-family-sans-serif;-$line-height-base: 1.5 !default;-$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: $gray-200 !default;-$list-group-border-color: $border-color !default;-$list-group-hover-bg: $gray-25 !default;-$list-group-active-bg: $action !default;-$list-group-active-border-color: $action-border !default;--$thumbnail-border-color: $border-color !default;-$hr-border-color: $border-color !default;-$table-border-color: $border-color !default;-$card-border-color: $border-color !default;-$input-btn-focus-width: 0.18rem !default;--$card-spacer-y: 1rem !default;-$card-spacer-x: 1.25rem !default;--$component-active-bg: $blue !default;--$input-placeholder-color: $gray-500;-$input-padding-y: .5rem !default;-$input-disabled-bg: $gray-25 !default;-$input-focus-border-color: $blue !default;-$custom-select-disabled-bg: $gray-50 !default;--$text-muted: $gray-600 !default;--$link-color: $primary !default;-$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: .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.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: $box-shadow-xs !default;--$btn-font-weight: $font-weight-medium !default;--$card-border-width: 1px !default;-$card-bg: $white !default;-$card-border-radius: 1rem !default;--$tooltip-border-radius: $border-radius-lg !default;-$tooltip-opacity: 1 !default;-$tooltip-margin: 0.25rem 0 !default;-$tooltip-padding-y: .35rem !default;-$tooltip-padding-x: .65rem !default;-$tooltip-bg: $white !default;-$tooltip-color: $body-color !default;-$tooltip-arrow-color: transparent !default;-$tooltip-max-width: 210px !default;-$tooltip-font-size: $font-size-base !default;--$transition-base: all .1s ease-in-out !default;-$transition-fade: opacity .15s linear !default;-$transition-collapse: height .15s ease !default;-$transition-collapse-width: width .15s ease !default;--$badge-font-size: $font-size-sm !default;-$badge-font-weight: $font-weight-normal !default;-$badge-padding-y: .35em !default;-$badge-padding-x: .45em !default;-$badge-border-radius: $border-radius-sm !default;--$transition-collapse: height .15s ease !default;--$link-hover-decoration: none !default;--$headings-line-height: 1 !default;--$h1-font-size: $font-size-base * 2.5 !default;-$h2-font-size: $font-size-base * 2 !default;-$h3-font-size: 1.5rem !default;-$h4-font-size: 1.25rem !default;-$h5-font-size: $font-size-lg !default;-$h6-font-size: $font-size-base !default;--$display1-size: 7rem !default;-$display2-size: 5rem !default;-$display3-size: 4rem !default;-$display4-size: 3.5rem !default;-$display1-weight: 400 !default;-$display2-weight: 400 !default;-$display3-weight: 400 !default;-$display4-weight: 400 !default;--$dropdown-bg: $white !default;-$dropdown-border-width: 0px !default;-$dropdown-border-radius: 1rem !default;-$dropdown-inner-border-radius: 0.8rem !default;-$dropdown-link-hover-bg: rgba($gray-100, 0.5) !default;-$dropdown-box-shadow: 0px 0px 0px 1px rgba($gray-300, 0.5), 0px 6px 12px -3px rgba($gray-300, 0.35), 0px 6px 18px 0px rgba($gray-300, 0.35) !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: $text-muted !default;-$dropdown-item-padding-y: 0.5rem !default;-$dropdown-item-padding-x: 0.65rem !default;--$zindex-dropdown: 1050;--$modal-backdrop-bg: $body-bg !default;-$modal-backdrop-opacity: 0.8 !default;-$modal-content-border-color: $border-color !default;-$modal-content-border-width: 0px !default;-$modal-header-padding: 1rem 1.25rem 1rem 1.25rem !default;-$modal-inner-padding: 1rem 1.25rem 1rem 1.25rem !default;-$modal-fade-transform: translate(0, 0) !default;-$modal-show-transform: none !default;-$modal-transition: transform .2s ease-out !default;-$modal-scale-transform: scale(1.02) !default;-$modal-header-border-width: 1px !default;-$modal-content-box-shadow-xs: $dropdown-box-shadow;-$modal-content-box-shadow-sm-up: $modal-content-box-shadow-xs !default;-$modal-footer-margin-between: 0 !default;--$alert-padding-y: 0.5rem !default;-$alert-padding-x: 1rem !default;-$alert-border-radius: $border-radius;-$alert-border-width: 0px !default;--$breadcrumb-bg: transparent !default;-$breadcrumb-padding-y: 0 !default;-$breadcrumb-padding-x: 1rem !default;-$breadcrumb-margin-bottom: 0 !default;--$embed-responsive-aspect-ratios: (- (21 9),- (16 9),- (9 16),- (4 3),- (1 1)-) !default;--// tables-$table-cell-padding: 1rem .75rem !default;--$code-color: $body-color !default;-$code-bg: $gray-50 !default;--$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: 58px !default;-$sidebar-width: 220px !default;-$sidebar-width-collapsed: 59px !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;--$modal-content-inner-border-radius: 1rem !default;-$modal-content-border-radius: 1rem !default;\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/plugins/_dropdown.scss b/admin/app/assets/stylesheets/spree/admin/plugins/_dropdown.scssdeleted file mode 100644index cad7329bce..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/_dropdown.scss+++ /dev/null@@ -1,102 +0,0 @@---.#{$select-ns}-dropdown {- position: absolute;- top: 100%;- left: 0;- width: 100%;- z-index: 10;-- border: $select-dropdown-border;- background: $select-color-dropdown;- margin: 0.25rem 0 0 0;- border-top: 0 none;- box-sizing: border-box;- box-shadow: 0 1px 3px rgba(0,0,0,0.1);- border-radius: 0 0 $select-border-radius $select-border-radius;--- [data-selectable] {- cursor: pointer;- overflow: hidden;- .highlight {- background: $select-color-highlight;- border-radius: 1px;- }- }-- .option,- .optgroup-header,- .no-results,- .create {- padding: $select-padding-dropdown-item-y $select-padding-dropdown-item-x;- }-- .option, [data-disabled], [data-disabled] [data-selectable].option {- cursor: inherit;- opacity: 0.5;- }-- [data-selectable].option {- opacity: 1;- cursor: pointer;- }-- .optgroup:first-child .optgroup-header {- border-top: 0 none;- }-- .optgroup-header {- color: $select-color-optgroup-text;- background: $select-color-optgroup;- cursor: default;- }-- .active {- background-color: $select-color-dropdown-item-active;- color: $select-color-dropdown-item-active-text;- &.create {- color: $select-color-dropdown-item-create-active-text;- }- }-- .create {- color: $select-color-dropdown-item-create-text;- }-- .spinner{- display: inline-block;- width: $select-spinner-size;- height: $select-spinner-size;- margin: $select-padding-dropdown-item-y $select-padding-dropdown-item-x;--- &:after {- content: " ";- display: block;- width: $select-spinner-size * .8;- height: $select-spinner-size * .8;- margin: $select-spinner-size * .1;- border-radius: 50%;- border: $select-spinner-border-size solid $select-spinner-border-color;- border-color: $select-spinner-border-color transparent $select-spinner-border-color transparent;- animation: lds-dual-ring 1.2s linear infinite;- }- @keyframes lds-dual-ring {- 0% {- transform: rotate(0deg);- }- 100% {- transform: rotate(360deg);- }- }- }-}--.#{$select-ns}-dropdown-content {- overflow-y: auto;- overflow-x: hidden;- max-height: $select-max-height-dropdown;- overflow-scrolling: touch;- scroll-behavior: smooth;-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/_items.scss b/admin/app/assets/stylesheets/spree/admin/plugins/_items.scssdeleted file mode 100644index 8a03bda27a..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/_items.scss+++ /dev/null@@ -1,115 +0,0 @@---.#{$select-ns}-control {-- border: $select-border;- padding: $select-padding-y $select-padding-x;- width: 100%;- overflow: hidden;- position: relative;- z-index: 1;- box-sizing: border-box;- box-shadow: $select-shadow-input;- border-radius: $select-border-radius;- display: flex;- flex-wrap: wrap;-- .#{$select-ns}-wrapper.multi.has-items & {- $padding-x: $select-padding-x;- $padding-top: calc( #{$select-padding-y} - #{$select-padding-item-y} - #{$select-width-item-border});- $padding-bottom: calc( #{$select-padding-y} - #{$select-padding-item-y} - #{$select-margin-item-y} - #{$select-width-item-border});- padding: $padding-top $padding-x $padding-bottom;- }-- .full & {- background-color: $select-color-input-full;- }-- .disabled &,- .disabled & * {- cursor: default !important;- }-- .focus & {- box-shadow: $select-shadow-input-focus;- }-- > * {- vertical-align: baseline;- display: inline-block;- }-- .#{$select-ns}-wrapper.multi & > div {- cursor: pointer;- margin: 0 $select-margin-item-x $select-margin-item-y 0;- padding: $select-padding-item-y $select-padding-item-x;- background: $select-color-item;- color: $select-color-item-text;- border: $select-width-item-border solid $select-color-item-border;-- &.active {- background: $select-color-item-active;- color: $select-color-item-active-text;- border: $select-width-item-border solid $select-color-item-active-border;- }- }-- .#{$select-ns}-wrapper.multi.disabled & > div {- &, &.active {- color: lighten(desaturate($select-color-item-text, 100%), $select-lighten-disabled-item-text);- background: lighten(desaturate($select-color-item, 100%), $select-lighten-disabled-item);- border: $select-width-item-border solid lighten(desaturate($select-color-item-border, 100%), $select-lighten-disabled-item-border);- }- }-- > input {- &::-ms-clear {- display: none;- }-- flex: 1 1 auto;- min-width: 7rem;- display: inline-block !important;- padding: 0 !important;- min-height: 0 !important;- max-height: none !important;- max-width: 100% !important;- margin: 0 !important;- text-indent: 0 !important;- border: 0 none !important;- background: none !important;- line-height: inherit !important;- user-select: auto !important;- box-shadow: none !important;- &:focus { outline: none !important; }- }-- .has-items & > input{- margin: $select-caret-margin !important;- }-- &.rtl {- text-align: right;- &.single .#{$select-ns}-control:after {- left: $select-arrow-offset;- right: auto;- }- .#{$select-ns}-control > input {- margin: $select-caret-margin-rtl !important;- }- }-- .disabled & {- opacity: $select-opacity-disabled;- background-color: $select-color-disabled;- }-- // hide input, while retaining its focus, and maintain layout so users can still click on the space to bring the display back- // visibility:hidden can prevent the input from receiving focus- .input-hidden & > input{- opacity: 0;- position: absolute;- left: -10000px;- }--}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/_tinymce_custom.scss b/admin/app/assets/stylesheets/spree/admin/plugins/_tinymce_custom.scssdeleted file mode 100644index 91b282f92d..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/_tinymce_custom.scss+++ /dev/null@@ -1,74 +0,0 @@-// Removes Tiny MCE branding-.tox-statusbar__branding {- display: none;-}--.tox.tox-tinymce {- border-radius: $input-border-radius !important;- border: 0 none !important;-}-.tox-edit-area__iframe {- background-color: $input-bg !important;-}--.tox-tinymce--disabled .tox-edit-area__iframe {- background-color: $gray-50 !important;-}--.tox .tox-edit-area::before {- border-color: $primary !important;-}--// Grey out the readonly textarea-.rich-text-area-container:has(textarea.spree-rte[contenteditable='false']) {- textarea.spree-rte + .tox-tinymce {- .tox-edit-area__iframe {- background-color: $gray-50 !important;- }- }-}--.tox {- .tox-tbtn {- @extend .btn;- border-radius: $border-radius !important;- color: rgba(0, 0, 0, 0.6) !important;-- svg {- // same color as trix- fill: rgba(0, 0, 0, 0.6) !important;- }- }-- .tox-editor-header {- padding: 0 !important;- }-- .tox-edit-focus {- display: none !important;- }-}-.tox-statusbar {- display: none !important;-}--/* Override TinyMCE UI font size */-.tox-toolbar__group {- font-size: $font-size-base !important; /* Change this value to your desired font size */-}-.tox-mbtn__select-label {- font-size: $font-size-base !important; /* Change this value to your desired font size */-}-/* Override TinyMCE Content font size */-.tox-tinymce {- font-size: $font-size-base !important; /* Change this value to your desired font size */-}-.tox .tox-collection__item-label, .tox-tbtn__select-label {- font-size: $font-size-base !important; /* Change this value to your desired font size */- font-family: $font-family-sans-serif;-}--.tox.tox-tinymce-aux .tox-toolbar__overflow, .tox .tox-menu {- border-radius: $border-radius !important;-}-diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/_trix_custom.scss b/admin/app/assets/stylesheets/spree/admin/plugins/_trix_custom.scssdeleted file mode 100644index bbb9faf858..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/_trix_custom.scss+++ /dev/null@@ -1,115 +0,0 @@-.trix-container {- @extend .rich-text-area-container-}--trix-toolbar {- @extend .p-1;- @extend .border-bottom;- background-color: $gray-25 !important;- width: 100%;-- .trix-button.trix-active {- background-color: $gray-100!important;- }-- .trix-button-group {- @extend .gap-1;- margin-left: 0 !important;- }-- .trix-button {- @extend .rounded-sm;-- width: 36px !important;- height: 30px !important;- padding: 6px !important;- }-- .trix-dialogs > .trix-dialog > .trix-dialog__link-fields > .trix-button-group > .trix-button--dialog {- width: 100% !important;- height: 100% !important;- padding: 0.5rem 0.75rem !important;- }-- .trix-dialog--x-video-embed {- max-width: 600px;- }-}--trix-editor {- @extend .m-2;- border-radius: $input-border-radius;- border: 0 none !important;-}--.trix-container, trix-editor {- background-color: $input-bg;-}--.trix-container:has(trix-editor[contenteditable='false']) {- background-color: $gray-50;-- &:active {- background-color: $gray-50 !important;- }-- trix-editor {- background-color: $gray-50;- }-}--trix-toolbar .trix-button--icon::before {- margin: 4px;-}--trix-toolbar .trix-button, trix-toolbar .trix-button-group {- border: 0 none !important;- margin-bottom: 0 !important;-}--trix-toolbar .trix-button {- width: 32px !important;- height: 28px !important;- padding: 4px;-}-trix-toolbar .trix-button:hover {- background-color: $border-color !important;- color: theme-color('black') !important;-}--trix-toolbar .trix-button-row {- flex-wrap: wrap !important;- display: flex;- width: 100%;-}--trix-toolbar .trix-dialog {- background-color: $white !important;- border-top: 0 none !important;- border-radius: $border-radius !important;- top: 4px !important;-}--trix-toolbar .trix-dialog .trix-input {- @extend .form-control;-}--trix-toolbar .trix-dialog .trix-button {- @extend .btn;- @extend .btn-light;- @extend .px-4;- @extend .py-2;- @extend .my-0;- @extend .mr-1;- border: 1px solid $gray-200 !important;-}--trix-toolbar .trix-dialog__link-fields {- align-items: center;-}--// icons-.trix-button--icon-embed::before {- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>');- top: 8% !important;-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/checkbox_options.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/checkbox_options.scssdeleted file mode 100644index 71f67e2dd9..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/checkbox_options.scss+++ /dev/null@@ -1,5 +0,0 @@-.plugin-checkbox_options {- .option input{- margin-right: 0.5rem;- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/clear_button.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/clear_button.scssdeleted file mode 100644index 8d26d6c536..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/clear_button.scss+++ /dev/null@@ -1,30 +0,0 @@--.plugin-clear_button{-- .#{$select-ns}-control{- padding-right: calc( 1em + (3 * #{$select-padding-item-x}) ) !important;- }-- .clear-button{- opacity: 0;- position: absolute;- top: $select-padding-y;- right: calc(#{$select-padding-x} - #{$select-padding-item-x});- margin-right: 0 !important;- background: transparent !important;- transition: opacity 0.5s;- cursor: pointer;- }-- &.single .clear-button{- right: calc(#{$select-padding-x} - #{$select-padding-item-x} + 2rem);- }-- &.focus.has-items .clear-button,- &:not(.disabled):hover.has-items .clear-button{- opacity: 1;- }----}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/drag_drop.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/drag_drop.scssdeleted file mode 100644index d48a0e1d84..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/drag_drop.scss+++ /dev/null@@ -1,16 +0,0 @@-.#{$select-ns}-wrapper.plugin-drag_drop {- &.multi > .#{$select-ns}-control > div.ui-sortable-placeholder {- visibility: visible !important;- background: #f2f2f2 !important;- background: rgba(0,0,0,0.06) !important;- border: 0 none !important;- box-shadow: inset 0 0 12px 4px #fff;- }- .ui-sortable-placeholder::after {- content: '!';- visibility: hidden;- }- .ui-sortable-helper {- box-shadow: 0 2px 5px rgba(0,0,0,0.2);- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/dropdown_header.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/dropdown_header.scssdeleted file mode 100644index c2bd1a0b00..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/dropdown_header.scss+++ /dev/null@@ -1,23 +0,0 @@--.#{$select-ns}-wrapper{- .dropdown-header {- position: relative;- padding: ($select-padding-dropdown-item-y * 2) $select-padding-dropdown-item-x;- border-bottom: 1px solid $select-color-border;- background: mix($select-color-dropdown, $select-color-border, 85%);- border-radius: $select-border-radius $select-border-radius 0 0;- }- .dropdown-header-close {- position: absolute;- right: $select-padding-dropdown-item-x;- top: 50%;- color: $select-color-text;- opacity: 0.4;- margin-top: -12px;- line-height: 20px;- font-size: 20px !important;- }- .dropdown-header-close:hover {- color: darken($select-color-text, 25%);- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/dropdown_input.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/dropdown_input.scssdeleted file mode 100644index e249f6c81f..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/dropdown_input.scss+++ /dev/null@@ -1,47 +0,0 @@--.plugin-dropdown_input{-- &.focus.dropdown-active .#{$select-ns}-control{- box-shadow: none;- border: $select-border;- @if variable-exists(input-box-shadow) {- box-shadow: $input-box-shadow;- }- }-- .dropdown-input {- border: 1px solid $select-color-border;- border-width: 0 0 1px 0;- display: block;- padding: $select-padding-y $select-padding-x;- box-shadow: $select-shadow-input;- width: 100%;- background: transparent;- }-- &.focus .#{$select-ns}-dropdown .dropdown-input{- @if variable-exists(input-focus-border-color) {- border-color: $input-focus-border-color;-- outline: 0;- @if $enable-shadows {- box-shadow: $input-box-shadow, $input-focus-box-shadow;- } @else {- box-shadow: $input-focus-box-shadow;- }-- }-- }-- .items-placeholder{- border: 0 none !important;- box-shadow: none !important;- width: 100%;- }-- &.has-items .items-placeholder,- &.dropdown-active .items-placeholder{- display: none !important;- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/input_autogrow.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/input_autogrow.scssdeleted file mode 100644index e4758810d9..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/input_autogrow.scss+++ /dev/null@@ -1,18 +0,0 @@--.#{$select-ns}-wrapper.plugin-input_autogrow{-- &.has-items .#{$select-ns}-control > input {- min-width: 0;- }-- &.has-items.focus .#{$select-ns}-control > input {- flex: none;- min-width: 4px;-- &::placeholder {- color:transparent;- }- }---}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/optgroup_columns.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/optgroup_columns.scssdeleted file mode 100644index 1485b93d6c..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/optgroup_columns.scss+++ /dev/null@@ -1,23 +0,0 @@-.#{$select-ns}-dropdown.plugin-optgroup_columns {-- .ts-dropdown-content{- display: flex;- }-- .optgroup {- border-right: 1px solid #f2f2f2;- border-top: 0 none;- flex-grow: 1;- flex-basis: 0;- min-width: 0;- }- .optgroup:last-child {- border-right: 0 none;- }- .optgroup:before {- display: none;- }- .optgroup-header {- border-top: 0 none;- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/remove_button.scss b/admin/app/assets/stylesheets/spree/admin/plugins/plugins/remove_button.scssdeleted file mode 100644index 808fd7c7f0..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/plugins/remove_button.scss+++ /dev/null@@ -1,44 +0,0 @@-.#{$select-ns}-wrapper.plugin-remove_button{-- .item{- display: inline-flex;- align-items: center;- padding-right: 0 !important;- }-- .item .remove {- color: inherit;- text-decoration: none;- vertical-align: middle;- display: inline-block;- padding: 0 $select-padding-item-x;- border-left: 1px solid $select-color-item-border;- border-radius: 0 2px 2px 0;- box-sizing: border-box;- margin-left: $select-padding-item-x;- }-- .item .remove:hover {- background: rgba(0,0,0,0.05);- }-- .item.active .remove {- border-left-color: $select-color-item-active-border;- }-- &.disabled .item .remove:hover {- background: none;- }-- &.disabled .item .remove {- border-left-color: lighten(desaturate($select-color-item-border, 100%), $select-lighten-disabled-item-border);- }-- .remove-single {- position: absolute;- right: 0;- top: 0;- font-size: 23px;- }--}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap4.scss b/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap4.scssdeleted file mode 100644index 415ed33d12..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap4.scss+++ /dev/null@@ -1,220 +0,0 @@-/**- * Tom Select bootstrap 4- */--//Import Boostrap 4 functions and variables--$state-valid: map-get($form-validation-states,'valid') !default;-$state-invalid: map-get($form-validation-states,'invalid') !default;--$enable-shadows: true !default;-$select-font-family: inherit !default;-$select-font-size: $input-font-size !default;-$select-line-height: $input-btn-line-height !default; //formerly line-height-computed--$select-color-text: gray("800") !default; //$gray-800-$select-color-highlight: rgba(255,237,40,0.4) !default;-$select-color-input: $input-bg !default;-$select-color-input-full: $input-bg !default;-$select-color-input-error: map-get($state-invalid,'color') !default;-$select-color-input-error-focus: darken($select-color-input-error, 10%) !default;-$select-color-disabled: $input-disabled-bg !default;-$select-color-item: #efefef !default;-$select-color-item-border: $border-color !default;-$select-color-item-active: $component-active-bg !default;-$select-color-item-active-text: #fff !default;-$select-color-item-active-border: rgba(0,0,0,0) !default;-$select-color-optgroup: $dropdown-bg !default;-$select-color-optgroup-text: $dropdown-header-color !default;-$select-color-optgroup-border: $dropdown-divider-bg !default;-$select-color-dropdown: $dropdown-bg !default;-$select-color-dropdown-border-top: mix($input-border-color, $input-bg, 0.8) !default;-$select-color-dropdown-item-active: $gray-50 !default;-$select-color-dropdown-item-active-text: $gray-900 !default;-$select-color-dropdown-item-create-active-text: $gray-900 !default;-$select-opacity-disabled: 0.5 !default;--$select-border: 1px solid $input-border-color !default;-$select-border-radius: $input-border-radius !default;--$select-width-item-border: 0px !default;-$select-padding-x: $input-btn-padding-x !default;-$select-padding-y: $input-btn-padding-y !default;-$select-padding-dropdown-item-x: $input-btn-padding-x !default;-$select-padding-dropdown-item-y: 3px !default;-$select-padding-item-x: 5px !default;-$select-padding-item-y: 1px !default;-$select-margin-item-x: 3px !default;-$select-margin-item-y: 3px !default;--$select-arrow-size: 5px !default;-$select-arrow-color: $select-color-text !default;-$select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;---@import "tom-select";-@include ts-caret();--.#{$select-ns}-wrapper.form-control,-.#{$select-ns}-wrapper.form-select{- padding:0 !important;-}--.#{$select-ns}-dropdown,-.#{$select-ns}-dropdown.form-control {- height: auto;- padding: 0;- z-index: $zindex-dropdown;- background: $select-color-dropdown;- border: 1px solid $dropdown-border-color; //$dropdown-fallback-border- border-radius: $border-radius-lg;- box-shadow: 0 6px 12px rgba(0,0,0,.175);- top: 110%;-}--.#{$select-ns}-dropdown {- .optgroup-header {- font-size: $font-size-sm;- line-height: $line-height-base;- }- .optgroup:first-child:before {- display: none;- }- .optgroup:before {- content: ' ';- display: block;- height: 0;- margin: $dropdown-divider-margin-y 0;- overflow: hidden;- border-top: 1px solid $dropdown-divider-bg;- margin-left: $select-padding-dropdown-item-x * -1;- margin-right: $select-padding-dropdown-item-x * -1;- }-- .create {- padding-left: $select-padding-dropdown-item-x;- }-}--.#{$select-ns}-dropdown-content {- padding: 5px 0;-}--.#{$select-ns}-control {- min-height: $input-height;- @include box-shadow($input-box-shadow);- @include transition($input-transition);- display:flex;- align-items: center;-- .focus & {- border-color: $input-focus-border-color;- outline: 0;- @if $enable-shadows {- box-shadow: $input-box-shadow, $input-focus-box-shadow;- } @else {- box-shadow: $input-focus-box-shadow;- }- }-}--.is-invalid .#{$select-ns}-control,-.was-validated .invalid .#{$select-ns}-control{- border-color: $select-color-input-error;-- .focus & {- border-color: $select-color-input-error-focus;- box-shadow: 0 0 0 $input-focus-width rgba($select-color-input-error, .25);- }-}--.is-valid .#{$select-ns}-control{- $_color: map-get($state-valid,'color');- //$_icon: map-get($state-valid,'icon');-- border-color: $_color;-- .focus & {- border-color: $_color;- box-shadow: 0 0 0 $input-focus-width rgba($_color, .25);- }-}--.#{$select-ns}-wrapper {-- .input-group-sm > &,- &.form-control-sm{-- .#{$select-ns}-control{- min-height: $input-height-sm;- padding: 0 .75rem;- //padding: $input-padding-y-sm $input-padding-x-sm;- @include border-radius($input-border-radius-sm);- @include font-size($input-font-size-sm);- }-- &.has-items .#{$select-ns}-control{- min-height: $input-height-sm !important;- font-size: $input-font-size-sm;- padding-bottom: 0;- }- }--- .input-group-sm > &.multi.has-items,- &.form-control-sm.multi.has-items{- .#{$select-ns}-control{- // padding-top = ($input-height-sm - border-width - item-height) / 2;- // item-height = ($select-line-height * $input-font-size-sm) + ($select-padding-item-y * 2)- $border-and-padding: add($input-border-width,$select-padding-item-y) * 2;- $ts-select-padding-sm: calc( (#{$input-height-sm} - (#{$select-line-height} * #{$input-font-size-sm}) - #{$border-and-padding})/2);- padding-top: $ts-select-padding-sm !important;- }- }--- &.multi {- &.has-items .#{$select-ns}-control {- padding-left: calc(#{$select-padding-x} - #{$select-padding-item-x});- --ts-pr-min: calc(#{$select-padding-x} - #{$select-padding-item-x});- }- .#{$select-ns}-control > div {- border-radius: calc(#{$select-border-radius} - 1px);- }- }-- .input-group-lg > & >,- &.form-control-lg{- .#{$select-ns}-control{- min-height: $input-height-lg;- @include border-radius($input-border-radius-lg);- @include font-size($input-font-size-lg);- }- }-}--.form-control.#{$select-ns}-wrapper {- padding: 0;- height: auto;- border: none;- background: none;- //box-shadow: none;- border-radius: 0;-}--.input-group{-- & > .#{$select-ns}-wrapper{- flex-grow: 1;- }-- & > .#{$select-ns}-wrapper:not(:nth-child(2)) > .#{$select-ns}-control{- border-top-left-radius: 0;- border-bottom-left-radius: 0;- }-- & > .#{$select-ns}-wrapper:not(:last-child) > .#{$select-ns}-control{- border-top-right-radius: 0;- border-bottom-right-radius: 0;- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap5.scss b/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap5.scssdeleted file mode 100644index 6139272461..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap5.scss+++ /dev/null@@ -1,274 +0,0 @@-/**- * Tom Select bootstrap 5- */--//Import Boostrap 5 functions and variables-$state-valid: map-get($form-validation-states,'valid') !default;-$state-invalid: map-get($form-validation-states,'invalid') !default;---$enable-shadows: true !default;-$select-font-family: inherit !default;-$select-font-size: inherit !default;-$select-line-height: $input-btn-line-height !default; //formerly line-height-computed--$select-color-text: $gray-800 !default;-$select-color-highlight: rgba(255,237,40,0.4) !default;-$select-color-input: $input-bg !default;-$select-color-input-full: $input-bg !default;---$select-color-disabled: $input-disabled-bg !default;-$select-color-item: #efefef !default;-$select-color-item-border: $border-color !default;-$select-color-item-active: $component-active-bg !default;-$select-color-item-active-text: #fff !default;-$select-color-item-active-border: rgba(0,0,0,0) !default;-$select-color-optgroup: $dropdown-bg !default;-$select-color-optgroup-text: $dropdown-header-color !default;-$select-color-optgroup-border: $dropdown-divider-bg !default;-$select-color-dropdown: $dropdown-bg !default;-$select-color-dropdown-border-top: mix($input-border-color, $input-bg, 0.8) !default;-$select-color-dropdown-item-active: $dropdown-link-hover-bg !default;-$select-color-dropdown-item-active-text: $dropdown-link-hover-color !default;-$select-color-dropdown-item-create-active-text: $dropdown-link-hover-color !default;-$select-opacity-disabled: 0.5 !default;--$select-border: 1px solid $input-border-color !default;-$select-border-radius: $input-border-radius !default;--$select-width-item-border: 0px !default;-$select-padding-x: $input-padding-x !default;-$select-padding-y: $input-padding-y !default;-$select-padding-dropdown-item-x: $input-btn-padding-x !default;-$select-padding-dropdown-item-y: 3px !default;-$select-padding-item-x: 5px !default;-$select-padding-item-y: 1px !default;-$select-margin-item-x: 3px !default;-$select-margin-item-y: 3px !default;--$select-arrow-size: 5px !default;-$select-arrow-color: $select-color-text !default;-$select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;---@import "tom-select";---@mixin ts-form-validation-state-selector($state) {-- $state-map: map-get($form-validation-states,$state);-- .#{$select-ns}-wrapper.is-#{$state},- .was-validated .#{$state},- .was-validated :#{$state} + .#{$select-ns}-wrapper{-- $color: map-get($state-map,'color');- $icon: map-get($state-map,'icon');-- border-color: $color;-- &:not(.single){- background-image: escape-svg($icon);- background-position: right $input-height-inner-quarter center;- background-size: $input-height-inner-half $input-height-inner-half;- background-repeat: no-repeat;- }-- &.single{- background-image: escape-svg($form-select-indicator), escape-svg($icon);- background-position: $form-select-bg-position, $form-select-feedback-icon-position;- background-size: $form-select-bg-size, $form-select-feedback-icon-size;- background-repeat: no-repeat;- }-- &.focus .#{$select-ns}-control{- border-color: $color;- box-shadow: 0 0 $input-btn-focus-blur $input-focus-width rgba($color, $input-btn-focus-color-opacity);- }-- }-}---.#{$select-ns}-wrapper.form-control,-.#{$select-ns}-wrapper.form-select{- padding:0 !important;- height: auto;- box-shadow: none;- display: flex;-}--.#{$select-ns}-dropdown,-.#{$select-ns}-dropdown.form-control,-.#{$select-ns}-dropdown.form-select{- height: auto;- padding: 0;- z-index: $zindex-dropdown;- background: $select-color-dropdown;- border: 1px solid $dropdown-border-color; //$dropdown-fallback-border- border-radius: $border-radius;- box-shadow: 0 6px 12px rgba(0,0,0,.175);-}--.#{$select-ns}-dropdown {- .optgroup-header {- font-size: $font-size-sm;- line-height: $line-height-base;- }- .optgroup:first-child:before {- display: none;- }- .optgroup:before {- content: ' ';- display: block;- height: 0;- margin: $dropdown-divider-margin-y 0;- overflow: hidden;- border-top: 1px solid $dropdown-divider-bg;- margin-left: $select-padding-dropdown-item-x * -1;- margin-right: $select-padding-dropdown-item-x * -1;- }-- .create {- padding-left: $select-padding-dropdown-item-x;- }-}--.#{$select-ns}-dropdown-content {- padding: 5px 0;-}--.#{$select-ns}-control {- @include box-shadow($input-box-shadow);- @include transition($input-transition);- display:flex;- align-items: center;-- &.dropdown -active {- border-radius: $select-border-radius;- }-- .focus &{- border-color: $input-focus-border-color;- outline: 0;- @if $enable-shadows {- box-shadow: $input-box-shadow, $input-focus-box-shadow;- } @else {- box-shadow: $input-focus-box-shadow;- }- }-- .item{- display: flex;- align-items: center;- }-}---@include ts-form-validation-state-selector('invalid');-@include ts-form-validation-state-selector('valid');---.#{$select-ns}-wrapper {- min-height: $input-height;- display:flex;-- .input-group-sm > &,- &.form-select-sm,- &.form-control-sm{- min-height: $input-height-sm;-- .#{$select-ns}-control{- padding: 0 .75rem;- //padding: $input-padding-y-sm $input-padding-x-sm;- @include border-radius($input-border-radius-sm);- @include font-size($input-font-size-sm);- }-- &.has-items .#{$select-ns}-control{- font-size: $input-font-size-sm;- padding-bottom: 0;- }- }--- .input-group-sm > &.multi.has-items,- &.form-select-sm.multi.has-items,- &.form-control-sm.multi.has-items{- .#{$select-ns}-control{- // padding-top = ($input-height-sm - border-width - item-height) / 2;- // item-height = ($select-line-height * $input-font-size-sm) + ($select-padding-item-y * 2)- $border-and-padding: add($input-border-width,$select-padding-item-y) * 2;- $ts-select-padding-sm: calc( (#{$input-height-sm} - (#{$select-line-height} * #{$input-font-size-sm}) - #{$border-and-padding})/2);- padding-top: $ts-select-padding-sm !important;- }- }--- &.multi {- &.has-items .#{$select-ns}-control {- padding-left: calc(#{$select-padding-x} - #{$select-padding-item-x});- padding-right: calc(#{$select-padding-x} - #{$select-padding-item-x});- }- .#{$select-ns}-control > div {- border-radius: calc(#{$select-border-radius} - 1px);- }- }-- .input-group-lg > &,- &.form-control-lg,- &.form-select-lg{- min-height: $input-height-lg;- .#{$select-ns}-control{- @include border-radius($input-border-radius-lg);- @include font-size($input-font-size-lg);- }- }-}---.#{$select-ns}-wrapper:not(.form-control):not(.form-select){- padding: 0;- border: none;- height: auto;- box-shadow: none;- background: none;-- &.single .#{$select-ns}-control{- background-image: escape-svg($form-select-indicator);- background-repeat: no-repeat;- background-position: $form-select-bg-position;- background-size: $form-select-bg-size;- padding-right: 2rem;- }--}--.#{$select-ns}-wrapper.form-control,-.#{$select-ns}-wrapper.form-select{-- .#{$select-ns}-control,- &.single.input-active .#{$select-ns}-control{- border: none !important;- background: transparent !important; // let the background of .form-select show through- }--}--.input-group{-- & > .#{$select-ns}-wrapper{- flex-grow: 1;- }-- & > .#{$select-ns}-wrapper:not(:nth-child(2)) > .#{$select-ns}-control{- border-top-left-radius: 0;- border-bottom-left-radius: 0;- }-- & > .#{$select-ns}-wrapper:not(:last-child) > .#{$select-ns}-control{- border-top-right-radius: 0;- border-bottom-right-radius: 0;- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.default.scss b/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.default.scssdeleted file mode 100644index 3b1b08ebbf..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.default.scss+++ /dev/null@@ -1,87 +0,0 @@---$select-color-item: #1da7ee;-$select-color-item-text: #fff;-$select-color-item-active-text: #fff;-$select-color-item-border: #0073bb;-$select-color-item-active: #92c836;-$select-color-item-active-border: #00578d;-$select-width-item-border: 1px;--$select-shadow-input: inset 0 1px 1px rgba(0,0,0,0.1) !default;-$select-shadow-input-focus: inset 0 1px 2px rgba(0,0,0,0.15) !default;---@import "tom-select";-@include ts-caret();--.#{$select-ns}-wrapper {- display:flex;- min-height:$select-line-height + ($select-padding-y*2) + ($select-border-width *2);-- &.multi {-- &.has-items .#{$select-ns}-control {- $padding-x: $select-padding-x - 3px;- padding-left: $padding-x;- padding-right: $padding-x;- }-- .#{$select-ns}-control {- [data-value] {- text-shadow: 0 1px 0 rgba(0,51,83,0.3);- border-radius: 3px;- @include selectize-vertical-gradient(#1da7ee, #178ee9);- box-shadow: 0 1px 0 rgba(0,0,0,0.2),inset 0 1px rgba(255,255,255,0.03);- &.active {- @include selectize-vertical-gradient(#008fd8, #0075cf);- }- }- }-- &.disabled .#{$select-ns}-control [data-value] {- color: #999;- text-shadow: none;- background: none;- box-shadow: none;-- &, .remove {- border-color: #e6e6e6;- }- .remove {- background: none;- }- }-- }- &.single {- .#{$select-ns}-control {- box-shadow: 0 1px 0 rgba(0,0,0,0.05), inset 0 1px 0 rgba(255,255,255,0.8);- @include selectize-vertical-gradient(#fefefe, #f2f2f2);- }- }-}--.#{$select-ns}-wrapper.single .#{$select-ns}-control, .#{$select-ns}-dropdown.single {- border-color: #b8b8b8;-}--.#{$select-ns}-control {- .dropdown-active & {- border-radius: $select-border-radius $select-border-radius 0 0;- }-}--.#{$select-ns}-dropdown {- .optgroup-header {- padding-top: $select-padding-dropdown-item-y + 2px;- font-weight: bold;- font-size: 0.85em;- }- .optgroup {- border-top: 1px solid $select-color-dropdown-border-top;- &:first-child {- border-top: 0 none;- }- }-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.scss b/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.scssdeleted file mode 100644index 8bfcff83f7..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.scss+++ /dev/null@@ -1,175 +0,0 @@-/**- * tom-select.css (v2.1.0)- * Copyright (c) contributors- *- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this- * file except in compliance with the License. You may obtain a copy of the License at:- * http://www.apache.org/licenses/LICENSE-2.0- *- * Unless required by applicable law or agreed to in writing, software distributed under- * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF- * ANY KIND, either express or implied. See the License for the specific language- * governing permissions and limitations under the License.- *- */---// base styles-$select-ns: 'ts' !default;-$select-font-family: inherit !default;-$select-font-smoothing: inherit !default;-$select-font-size: 13px !default;-$select-line-height: 18px !default;--$select-color-text: #303030 !default;-$select-color-border: #d0d0d0 !default;-$select-color-highlight: rgba(125,168,208,0.2) !default;-$select-color-input: #fff !default;-$select-color-input-full: $select-color-input !default;-$select-color-disabled: #fafafa !default;-$select-color-item: #f2f2f2 !default;-$select-color-item-text: $select-color-text !default;-$select-color-item-border: #d0d0d0 !default;-$select-color-item-active: #e8e8e8 !default;-$select-color-item-active-text: $select-color-text !default;-$select-color-item-active-border: #cacaca !default;-$select-color-dropdown: #fff !default;-$select-color-dropdown-border: $select-color-border !default;-$select-color-dropdown-border-top: #f0f0f0 !default;-$select-color-dropdown-item-active: #f5fafd !default;-$select-color-dropdown-item-active-text: #495c68 !default;-$select-color-dropdown-item-create-text: rgba(red($select-color-text), green($select-color-text), blue($select-color-text), 0.5) !default;-$select-color-dropdown-item-create-active-text: $select-color-dropdown-item-active-text !default;-$select-color-optgroup: $select-color-dropdown !default;-$select-color-optgroup-text: $select-color-text !default;-$select-lighten-disabled-item: 30% !default;-$select-lighten-disabled-item-text: 30% !default;-$select-lighten-disabled-item-border: 30% !default;-$select-opacity-disabled: 0.5 !default;--$select-shadow-input: none !default;-$select-shadow-input-focus: none !default;-$select-border-width: 1px !default;-$select-border: $select-border-width solid $select-color-border !default;-$select-dropdown-border: 1px solid $select-color-dropdown-border !default;-$select-border-radius: 3px !default;--$select-width-item-border: 0px !default;-$select-max-height-dropdown: 200px !default;--$select-padding-x: 8px !default;-$select-padding-y: 8px !default;-$select-padding-item-x: 6px !default;-$select-padding-item-y: 2px !default;-$select-padding-dropdown-item-x: $select-padding-x !default;-$select-padding-dropdown-item-y: 5px !default;-$select-margin-item-x: 3px !default;-$select-margin-item-y: 3px !default;--$select-arrow-size: 5px !default;-$select-arrow-color: #808080 !default;-$select-arrow-offset: 15px !default;--$select-caret-margin: 0px 4px !default;-$select-caret-margin-rtl: 0px 4px 0px -2px !default;--$select-spinner-size: 30px !default;-$select-spinner-border-size: 5px !default;-$select-spinner-border-color: $select-color-border !default;--@mixin selectize-vertical-gradient($color-top, $color-bottom) {- background-color: mix($color-top, $color-bottom, 60%);- background-image: linear-gradient(to bottom, $color-top, $color-bottom);- background-repeat: repeat-x;-}---.#{$select-ns}-wrapper.single{- .#{$select-ns}-control {- &, input {- cursor: default;- }- }-}---@mixin ts-caret(){-- .#{$select-ns}-wrapper.single{-- .#{$select-ns}-control {- padding-right: 2rem;-- &:after {- content: ' ';- display: block;- position: absolute;- top: 50%;- right: $select-arrow-offset;- margin-top: round(-0.5 * $select-arrow-size);- width: 0;- height: 0;- border-style: solid;- border-width: $select-arrow-size $select-arrow-size 0 $select-arrow-size;- border-color: $select-arrow-color transparent transparent transparent;- }- }-- &.dropdown-active .#{$select-ns}-control::after {- margin-top: $select-arrow-size * -0.8;- border-width: 0 $select-arrow-size $select-arrow-size $select-arrow-size;- border-color: transparent transparent $select-arrow-color transparent;- }-- &.input-active .#{$select-ns}-control,- &.input-active .#{$select-ns}-control input {- cursor: text;- }-- }-}--@import "./plugins/drag_drop.scss";-@import "./plugins/checkbox_options.scss";-@import "./plugins/clear_button.scss";-@import "./plugins/dropdown_header.scss";-@import "./plugins/dropdown_input.scss";-@import "./plugins/input_autogrow.scss";-@import "./plugins/optgroup_columns.scss";-@import "./plugins/remove_button.scss";---.#{$select-ns}-wrapper {- position: relative;-}--.#{$select-ns}-dropdown,-.#{$select-ns}-control,-.#{$select-ns}-control input {- color: $select-color-text;- font-family: $select-font-family;- font-size: $select-font-size;- line-height: $select-line-height;- font-smoothing: $select-font-smoothing;-}--.#{$select-ns}-control,-.#{$select-ns}-wrapper.single.input-active .#{$select-ns}-control {- background: $select-color-input;- cursor: text;-}--@import 'items';-@import 'dropdown';--.ts-hidden-accessible{- border: 0 !important;- clip: rect(0 0 0 0) !important;- clip-path: inset(50%) !important;- //height: 1px !important;- overflow: hidden !important;- padding: 0 !important;- position: absolute !important;- width: 1px !important;- white-space: nowrap !important;-}diff --git a/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss b/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scssdeleted file mode 100644index d6a859cc86..0000000000--- a/admin/app/assets/stylesheets/spree/admin/plugins/uppy_fixes.scss+++ /dev/null@@ -1,74 +0,0 @@-.uppy-Root {- font-family: $font-family-base !important;- font-size: $font-size-base !important;- color: $body-color !important;- line-height: $line-height-base !important;-}--.uppy-Dashboard-inner {- background-color: $light;- border-color: $border-color;-}--.uppy-Dashboard-innerWrap, .uppy-Dashboard-inner, .uppy-Dashboard-AddFiles {- border-radius: $border-radius-lg !important;-}--.uppy-Dashboard-Item-previewInnerWrap {- background-color: transparent !important;- border-radius: $border-radius-lg !important;- box-shadow: none !important;-}--.uppy-Dashboard--modal .uppy-Dashboard-overlay {- background-color: $modal-backdrop-bg !important;- opacity: $modal-backdrop-opacity !important;-}--.uppy-Dashboard--modal .uppy-Dashboard-inner {- box-shadow: $modal-content-box-shadow-xs !important;- border-color: $modal-content-border-color !important;-}--.uppy-Dashboard-browse, .uppy-DashboardContent-back {- @extend .btn;- @extend .btn-light;-}-.uppy-Dashboard-browse {- @extend .ml-2;-}-.uppy-DashboardContent-save {- @extend .btn;- @extend .btn-primary;-}--.uppy-Dashboard-close {- @extend .btn-close;- background-color: $white !important;-- span {- display: none;- }-}--.uppy-StatusBar-actionBtn {- @extend .btn;- @extend .btn-sm;- @extend .btn-light;-}--.uppy-StatusBar.is-complete .uppy-StatusBar-progress {- background-color: theme-color('blue') !important;-}--.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.scssdeleted file mode 100644index 82ed17c89c..0000000000--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss+++ /dev/null@@ -1,737 +0,0 @@-// https://twitter.com/NatalieMarleny/status/1662402066365526016-html {- min-height: 100%;- letter-spacing: normal;- text-rendering: optimizeLegibility;- text-size-adjust: 100%;-}-body {- @extend .h-100;- overflow-y: scroll;-}--body * {- &:focus {- outline-color: theme-color('blue') !important;- }-}--html, body {- overscroll-behavior: none;-}--body.modal-open #multi-backdrop {- z-index: 1040;- width: 100vw;- height: 100vh;-}--strong {- @extend .font-weight-bold;-}--.font-weight-semibold {- font-weight: $font-weight-medium !important;-}--.text-size-lg, .font-size-lg {- font-size: $font-size-lg;-}-.text-size-sm, .font-size-sm {- font-size: $font-size-sm;-}-.text-size-base, .font-size-base {- font-size: $font-size-base;-}-.text-size-plus, .font-size-plus {- font-size: $font-size-plus;-}--.bg-gray-25 {- background-color: $gray-25;-}-.bg-gray-50 {- background-color: $gray-50;-}-.bg-gray, .bg-gray-100 {- background-color: $gray-100;-}-.bg-gray-200 {- background-color: $gray-200;-}-.bg-gray-300 {- background-color: $gray-300;-}-.bg-gray-400 {- background-color: $gray-400;-}-.border-gray {- border-color: $gray-400 !important;-}--.display-5 {- font-size: 1.75rem;- font-weight: 400;-- @include media-breakpoint-up(lg) {- font-size: 2.5rem;- }-}--.fill-black {- & > * {- fill: #000;- }- fill: #000;-}--.w-5 {- width: 5%;-}-.w-10 {- width: 10%;-}-.w-15 {- width: 15%;-}-.w-20 {- width: 20%;-}-.w-25 {- width: 25%;-}-.w-30 {- width: 30%;-}-.w-35 {- width: 35%;-}-.w-40 {- width: 40%;-}-.w-60 {- width: 60%;-}-.w-70 {- width: 70%;-}-.w-80 {- width: 80%;-}-.w-90 {- width: 90%;-}-.w-auto {- width: auto;-}-.min-vh-40 {- min-height: 40vh;-}-.min-vh-60 {- min-height: 60vh;-}-.min-vh-70 {- min-height: 70vh;-}-.min-vh-80 {- min-height: 80vh;-}-.min-vh-90 {- min-height: 90vh;-}--.top-0 {- top: 0;-}-.bottom-0 {- bottom: 0;-}-.right-0 {- right: 0;-}-.left-0 {- left: 0;-}--/* for heroicons to work in admin */-.h-6 {- height: 24px;-}--.shadow-xs {- box-shadow: $box-shadow-xs;-}-.focus-shadow {- &:focus, &:focus-within, &:active {- box-shadow: $input-focus-box-shadow;- }-}-.focus-border {- &:focus, &:focus-within {- border-color: theme-color('blue') !important;- }-}--.disabled {- cursor: not-allowed;-}--.cursor-not-allowed {- cursor: not-allowed !important;-}-.cursor-help {- cursor: help;-}--.active {- color: theme-color('primary');- background-color: theme-color('active');-}-.tab-pane.active {- color: inherit !important;- background-color: transparent !important;-}-.hover {- background-color: $gray-100 !important;-}-.hover-none {- text-decoration: none !important;-- &:hover {- text-decoration: none !important;- background-color: transparent !important;- }-}--.rich-text-area-container {- min-height: 113px;- font-size: $font-size-plus;- border: 1px solid $input-border-color;- margin-bottom: 1rem;- @extend .overflow-hidden;- text-wrap: wrap;- border-radius: $input-border-radius;-- &:focus, &:focus-within, &:active {- background-color: $input-focus-bg !important;- border-color: $input-focus-border-color !important;- outline: 0 !important;- box-shadow: $input-focus-box-shadow !important;- }-- h1, h2, h3, h4, h5, h6 {- font-weight: normal;- margin-top: 1rem;- margin-bottom: 1rem;- }-}--.is-hidden {- display: none;-}--.tooltip{- pointer-events: none;- z-index: 99999999;-}--.image-container {- .img-fluid {- transition: transform .5s ease;- }-- &:hover {- text-decoration: none;- .img-fluid {- transform: scale(1.1);- opacity: 0.6;- }- }-}--.admin-product-image-container {- background-color: $white;- border: 1px solid $gray-200;- border-radius: $border-radius;- overflow: hidden;- display: flex;- justify-content: center;- align-items: center;-- a {- display: flex- }-- img {- max-width: 100%;- align-self: center;- transition: transform .5s ease;- }-- &:hover {- img {- transform: scale(1.2)- }- }-}--.img-thumbnail {- @extend .bg-transparent;- @extend .p-0;-}--.cursor-zoom {- cursor: -moz-zoom-in;- cursor: -webkit-zoom-in;- cursor: zoom-in;-}--.js-remove-promo-rule-option-value {- color: theme-color('black') !important;- &:hover {- color: darken(theme-color('primary'), 10) !important;- }-}--.button_to {- display: inline-block;-}--.move-handle {- cursor: grab;-}--.badge-light-muted-text {- color: rgba(0, 0, 0, 0.50);-}--.truncate {- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;-}--[data-show-info] {- color: theme-color('primary');- cursor: pointer;-}--small,-.small {- font-size: $font-size-sm !important;-}--// tailwind matchers--.gap-1 {- gap: calc($spacer / 4);-}--.gap-2 {- gap: calc($spacer / 2);-}--.gap-3 {- gap: $spacer;-}--.min-h-14 {- min-height: 3.5rem;-}--.hidden {- @extend .d-none;-}--.select-input {- @extend .custom-select;-}--.text-input {- @extend .form-control;-}--.flex {- @extend .d-flex;-}-.flex-col {- @extend .flex-column;-}-.w-full {- width: 100%;-}--.has-float-label label {- display: none;-}--#noscript-alert {- z-index: 2000;-}--.input-group-text {- @extend .text-muted;- background-color: $gray-50;-}--.sortable-chosen {- background-color: theme-color('action') !important;- border: 2px dashed $blue !important;-}--.sort-handle {- cursor: grab;-}--.handle {- cursor: grab !important;-}--.vr {- width: 1px;- background-color: $gray-200;-}--.verified-badge {- color: #0ce8b1;-}--.cursor-default {- cursor: default;-}-.cursor-pointer {- cursor: pointer;-}-.cursor-text {- cursor: text;-}--.list-group-item-action {- @extend .rounded;- @extend .border-0;-}-.list-group-item-action:hover, .list-group-item-action:focus {- a:not(.btn) {- color: theme-color('black');- text-decoration: none !important;- }-}--.progress {- background-color: $gray-50;- height: 0.5rem;-- .progress-bar {- @extend .rounded;- @extend .border-0;- }-}--.reveal {- opacity: 0;- transform: translateY(20px);- transition: 1s cubic-bezier(0.5, 0, 0, 1);- transition-property: opacity, transform;-}--.reveal.in {- opacity: 1;- transform: none;-}--.easepick-wrapper .container.inline {- box-shadow: none !important;-}--.opacity-100 {- opacity: 1;-}-.opacity-50 {- opacity: 0.5;-}-.opacity-75 {- opacity: 0.75;-}-.opacity-0 {- opacity: 0;-}--.blurred {- filter: opacity(50%);-- .form-actions {- display: none;- }-- .cm-editor {- visibility: hidden;- }-}--#turbo-spinner {- display: none !important;-}--main turbo-frame[busy] {- opacity: 0.5;-}-turbo-frame[busy] #turbo-spinner {- position: absolute;- display: flex !important;- height: 300px;- z-index: 1020;-- .spinner-border {- width: 2rem;- height: 2rem;- }-}-turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {- display: block !important;-}--.fill-primary {- & > * {- fill: #000;-- &:hover {- fill: darken(#000, 10);- }- }- fill: #000;-- &:hover {- fill: darken(#000, 10);-- & > * {- fill: darken(#000, 10);- }- }-}--// https://w3bits.com/css-image-hover-zoom/-.img-hover-zoom {- overflow: hidden; /* [1.2] Hide the overflowing of child elements */-}--/* [2] Transition property for smooth transformation of images */-.img-hover-zoom img {- transition: transform .5s ease;-}--/* [3] Finally, transforming the image when container gets hovered */-.img-hover-zoom:hover img {- transform: scale(1.5);-}--.tag {- display: inline-block;- @extend .rounded-pill;- @extend .text-uppercase;- font-size: 0.875rem;- font-weight: $font-weight-medium;- padding: 5px 16px ;- letter-spacing: 2.24px;- border: 1px solid $gray-200;- color: theme-color('black');- background-color: #fff;-- &:hover {- color: theme-color('black');- text-decoration: none;- }-- &:active {- color: #fff;- background-color: $gray-800;- border-color: $gray-800;- }-- &.active {- @extend .bg-black;- color: #fff !important;- border-color: theme-color('black') !important;- }-- &.small {- padding: 2px 8px !important;- font-size: $font-size-sm * 0.875 !important;- letter-spacing: 1.5px;- }-}--.thumb-preview {- background-size: cover;- background-position: center center;- background-repeat: no-repeat;-}---.border-lg {- @include media-breakpoint-up(xl) {- border: 1px solid $border-color;- }-}--.blurry {- color: transparent !important;- text-shadow: 0 0 8px #000 !important;-}--@media (min-width: 992px) {- .w-lg-50 {- width: 50% !important;- }-}--.text-decoration-underline {- text-decoration: underline;-}--.overflow-auto, .overflow-y-auto, .ts-dropdown-content {- &::-webkit-scrollbar {- width: 0.35rem !important;- }- &::-webkit-scrollbar-track {- border-radius: 0.25rem !important;- background-color: transparent;- }- &::-webkit-scrollbar-thumb {- border-radius: 0.25rem !important;- background-color: rgba($gray-500, 0.25);- }-}-.overflow-visible {- overflow-y: visible !important;- overflow-x: visible !important;-}--.outline-none {- outline: none !important;-}--.overflow-y-auto {- overflow-y: auto;-}-.overflow-x-hidden {- overflow-x: hidden;-}--.overlay-background {- background-color: rgba($white, 0.3);- transition: background-color 0.3s ease-in-out;-}--.border-dashed {- border-style: dashed !important;-}-.border-bottom-dashed {- border-bottom-style: dashed !important;-}-.border-top-dashed {- border-top-style: dashed !important;-}--body:has(.lg-container.lg-show) .modal {- z-index: 1040;-}--.z-10 {- z-index: 10;-}-.z-index-1000 {- z-index: 1000;-}--.turbo-frame-error {- display: flex;- width: 100%;- height: 100%;- align-items: center;- justify-content: center;- font-weight: normal;- padding: 2rem;- color: theme-color('danger');- font-weight: $font-weight-normal;-}--div.uppy-Root {- z-index: 1050;-}--.rounded-lg {- border-radius: $border-radius-lg;-}--.rounded-lg-top {- border-top-left-radius: $border-radius-lg;- border-top-right-radius: $border-radius-lg;-}--.rounded-lg-bottom {- border-bottom-left-radius: $border-radius-lg;- border-bottom-right-radius: $border-radius-lg;-}--.rounded-lg-left {- border-top-left-radius: $border-radius-lg;- border-bottom-left-radius: $border-radius-lg;-}--.rounded-lg-right {- border-top-right-radius: $border-radius-lg;- border-bottom-right-radius: $border-radius-lg;-}--.turbo-progress-bar {- background-color: theme-color('blue');-}--.tooltip-inner {- border: 1px solid $border-color;- box-shadow: $box-shadow-xs;-}--.avatar {- border-radius: 50%;- background-color: $gray-200;- color: $gray-500;- font-size: $font-size-base;- font-weight: $font-weight-medium;- display: flex;- align-items: center;- justify-content: center;-}--.breadcrumb {- gap: 0.5rem;- align-items: center;- font-weight: $font-weight-medium;- height: 32px;- border-left: 1px solid $gray-50;- border-radius: 0;-- li {- a {- text-decoration: none;-- &:hover {- color: $primary;- text-decoration: underline;- }- }- }-}--code {- background-color: $code-bg;- border-radius: $border-radius-sm;- padding: 0.25rem 0.5rem;-}--kbd {- @extend .badge;- @extend .badge-light;- text-transform: lowercase;- box-shadow: $box-shadow-xs;-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scssdeleted file mode 100644index abec411427..0000000000--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss+++ /dev/null@@ -1,194 +0,0 @@-.custom-checkbox .custom-control-label::before {- border-radius: 0.25rem !important;- border-color: $input-border-color;- box-shadow: $input-box-shadow;-}-.custom-checkbox .custom-control-label::before, .custom-checkbox .custom-control-label::after {- top: 0rem;-}--label {- font-weight: $font-weight-medium;- font-size: 100%;-- &:hover {- cursor: pointer;- }-}--.form-actions {- @extend .d-flex;- @extend .align-items-center;-- .or {- @extend .px-3;- }-}--.form-text {- font-size: $font-size-base;- color: $text-muted;- margin-top: 0;-}--.form-control, .text-input, .trix-container, .ts-control, trix-toolbar .trix-dialog .trix-input, .custom-select, .input-group-text, .custom-file-label {- box-shadow: $input-box-shadow;- transition-property: box-shadow, border-color;- transition-duration: 0.15s;- transition-timing-function: ease;-- &:disabled, &[readonly] {- @extend .shadow-none;- @extend .text-muted;- background-color: $gray-50 !important;- border: 1px solid $border-color !important;- cursor: not-allowed;- }-}--.form-group {- .field_with_errors {- input {- @extend .is-invalid;- }- }- .formError {- @extend .invalid-feedback;- display: block;- }-}--input[type="file"] {- width: fit-content;- max-width: 100%;- white-space: nowrap;- overflow: hidden;- text-overflow: ellipsis;-}--.custom-select, .ts-control {- background-color: $input-bg;- background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%236b7280' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5' d='M6 8l4 4 4-4'/%3e%3c/svg%3e");- background-size: 1.5em 1.5em !important;- background-position: right 0.5rem center !important;- background-repeat: no-repeat !important;- border-radius: $input-border-radius;- padding-right: 2.5rem;-}--.ts-control>input {- min-width: auto !important;-}-.ts-dropdown {- @extend .p-1;- z-index: 10000000 !important;-- .option {- @extend .p-2;- @extend .rounded-sm;- }-- .ts-dropdown-content {- @extend .p-0;- }-}-.ts-wrapper.single .ts-control:after {- content: none;-}-.ts-wrapper.disabled {- @extend .disabled;- cursor: not-allowed !important;-- &:hover:not(:focus) {- border: 0 none !important;- }-}-.ts-wrapper.disabled .ts-control {- @extend .disabled;- cursor: not-allowed !important;-- &:hover:not(:focus) {- border: 1px solid transparent !important;- }-}--.ts-wrapper.plugin-remove_button .item .remove {- padding: 3px 6px;-}--// address form fixes-#szipcode, #sstate, #scity, #bzipcode, #bstate, #bcity {- @extend .col-lg-4;- @extend .mb-0;-}-.has-float-label.mb-4 {- @extend .mb-3;-}-#scity, #bcity, #sstate, #bstate {- padding-right: 0;-}---.form-control-plaintext {- padding: $input-btn-padding-y $input-btn-padding-x;-- &:focus {- @extend .shadow-none;- @extend .border-0;- box-shadow: none !important;- outline: none !important;- }-}--.custom-control {- a {- color: $body-color;- }-}--.custom-control-label {- font-weight: $font-weight-base;-}--.form-control .ti-search {- opacity: 0.5;-}---.form-control-bare {- @extend .border-left-0;- @extend .border-right-0;- @extend .border-top-0;- @extend .rounded-0;- @extend .shadow-none;- @extend .border-bottom;- @extend .px-0;-- &:hover, &:active, &:focus {- @extend .border-black;- }-}--.form-check-input {- margin-top: 0.2rem;-}--.custom-radio:hover {- color: unset;- text-decoration: unset;-}---turbo-frame.blur-busy[busy] {- opacity: 0.5;- transition: opacity 0.3s;- pointer-events: none;-- * {- pointer-events: none;- }-}--.input-group-text {- background-color: transparent;-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/views/_dashboard.scss b/admin/app/assets/stylesheets/spree/admin/views/_dashboard.scssdeleted file mode 100644index f08a34a8c6..0000000000--- a/admin/app/assets/stylesheets/spree/admin/views/_dashboard.scss+++ /dev/null@@ -1,48 +0,0 @@-.analytics-card-tab {- @extend .rounded;- @extend .cursor-pointer;- @extend .p-2;- @extend .h-100;-- transition: background-color 0.2s ease-in-out;-- &.active, &:hover {- background-color: $gray-25;- }-}--.store-preview-link {- transition: background-color 0.2s ease-in-out;-- .store-preview-actions {- display: none;-- .btn-outline-primary {- background-color: $white;-- &:hover {- background-color: $primary;- }- }- }-- &:hover {- .store-preview-actions {- display: flex;- }- }-}--#updater-notice {- background-color: $white;- width: 100%;- display: flex;- flex-direction: row;- gap: 1rem;- justify-content: flex-start;- align-items: center;- padding: 0.5rem 0.5rem;- border: 1px solid $border-color;- border-radius: $border-radius-lg;- box-shadow: $box-shadow-xs;-}\ No newline at end of filediff --git a/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss b/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scssdeleted file mode 100644index ac19679edf..0000000000--- a/admin/app/assets/stylesheets/spree/admin/views/_page_builder.scss+++ /dev/null@@ -1,246 +0,0 @@-$sidebar-width: 345px;-$header-height: 50px;--#page-builder {- background-color: $gray-50;- height: 100vh;- overflow: hidden;-- #content {- margin-left: 0;- padding-top: 0;- }-- #main-part {- padding-bottom: 0;- padding-left: 2rem;- padding-right: 2rem;- .embed-responsive {- min-height: 100vh;- }- }-- .nav-pills {- background-color: $gray-50;- padding: 0.25rem;- border-radius: $nav-pills-border-radius;-- .nav-link {- background-color: transparent;- padding: 0.25rem 0.5rem;- border-radius: $border-radius;-- &.active {- background-color: $white;- }- }- }-}-#page-builder-sidebar, #page-builder-header {- background-color: $body-bg;-}--#page-builder-header {- z-index: 1031;- border-bottom: 1px solid $border-color;- height: $header-height;- nav {- width: 100%;- height: $header-height;- display: flex;- align-items: center;- gap: 0.5rem;- padding: 0.25rem 0.5rem;- }-}-#page-builder-sidebar {- position: fixed;- width: $sidebar-width;- top: $header-height;- left: 0px;- background-color: $body-bg;- border-right: 1px solid $border-color;- overflow-x: hidden;- height: calc(100vh - $header-height);- .sidebar-header {- height: 48px;- padding: 0.5rem 0.7rem;- background-color: $body-bg;- border-bottom: 1px solid $border-color;- display: flex;- align-items: center;- margin-bottom: 0.5rem;- gap: 0.5rem;- position: sticky;- top: 0;- z-index: 1031;- }-- .sidebar-footer {- position: fixed;- bottom: 0;- left: 0;- width: calc($sidebar-width - 1px);- padding: 0.5rem;- background-color: $body-bg;- box-shadow: 0 0 0 1px $border-color;- z-index: 1031;- display: flex;- align-items: center;- justify-content: space-between;- }-- .list-group-item {- padding: 0.5rem 0.5rem;- }-}-#page-builder-preview {- border-radius: $border-radius;- border: 1px solid $gray-200;- margin-top: calc($header-height + 1rem);-}---.sidebar-section-title,-.sidebar-block-title {- &:hover,- &:focus {- color: theme-color('black') !important;- background-color: $gray-50 !important;- a {- text-decoration: none !important;- }- .btn-light {- visibility: visible;- }- }- .btn-light {- visibility: hidden;- background: transparent !important;- &:hover,- &:focus,- &:active {- background-color: $gray-100 !important;- }- }-}--.sidebar-page-block {- margin-left: 25px;-}--.edit-block {- .trix-button--icon-heading-1,- .trix-button--icon-quote,- .trix-button--icon-decrease-nesting-level,- .trix-button--icon-increase-nesting-level,- .trix-button--icon-strike,- .trix-button-group--history-tools {- display: none !important;- }-}--.mobileLiveView {- #page-builder-preview {- width: 100%;- height: 100vh;- inset: 0 50%;- transform: translate(-50%, 0);- max-width: 375px;- min-width: 375px;- overflow: auto;- }-}--.editor-add-section {- position: fixed;- right: 20px;- bottom: 20px;- z-index: 999999;- opacity: 0;- padding: 0.6rem 1.3rem;- pointer-events: none;- display: flex;- justify-content: center;- align-items: center;-}--@media (max-width: 768px) {- #page-builder-preview {- border: 0px none !important;- }-- .page-builder {- .sidebar {- opacity: 0;- pointer-events: none;- .right-sidebar,- .bottom-bar {- width: calc(100vw) !important;- }- }- }-- .mobile_sidebar_open.page-builder .sidebar,- .editor-add-section {- opacity: 1;- pointer-events: auto;- }-- .mobile_sidebar_open .editor-add-section {- opacity: 0;- pointer-events: none;- }-}--@media (min-width: 768px) {- #main-part {- margin-left: 339px;- }-- .mobileLiveView {- #page-builder-preview {- width: 392px; // 375px + 17px scrollbar- max-width: 429px; // 412px + 17px scrollbar- height: calc(100vh - 100px);- max-height: 800px;- }- }-}--.page-builder .radio-buttons-header input ~ p {- font-size: 0.75rem;- border-radius: 0.22rem;- padding: 0.22rem 0.5rem;-}--.page-builder .radio-buttons-header {- justify-content: space-around;-}--.page-builder .radio-buttons-header input:checked ~ p {- color: theme-color('black') !important;- background-color: theme-color('active') !important;- border: 1px solid theme-color('primary') !important;-}--.checkered-background {- background-image: linear-gradient(- 45deg,- rgba(0, 0, 0, 0.1) 25%,- transparent 25%,- transparent 75%,- rgba(0, 0, 0, 0.1) 75%,- rgba(0, 0, 0, 0.1)- ),- linear-gradient(- 45deg,- rgba(0, 0, 0, 0.1) 25%,- transparent 25%,- transparent 75%,- rgba(0, 0, 0, 0.1) 75%,- rgba(0, 0, 0, 0.1)- );- background-size: 20px 20px;- background-position: 0 0, 10px 10px;-}diff --git a/admin/app/assets/tailwind/spree/admin/base/_animations.css b/admin/app/assets/tailwind/spree/admin/base/_animations.cssnew file mode 100644index 0000000000..95b28e3145--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/base/_animations.css@@ -0,0 +1,151 @@+/* ==========================================================================+ ANIMATIONS+ Native Tailwind animations replacing animate.css+ ========================================================================== */++@layer base {+ @keyframes fadeIn {+ from {+ opacity: 0;+ }+ to {+ opacity: 1;+ }+ }++ @keyframes fadeInDown {+ from {+ opacity: 0;+ transform: translateY(-10px);+ }+ to {+ opacity: 1;+ transform: translateY(0);+ }+ }++ @keyframes fadeOutDown {+ from {+ opacity: 1;+ transform: translateY(0);+ }+ to {+ opacity: 0;+ transform: translateY(10px);+ }+ }++ @keyframes popIn {+ from {+ opacity: 0;+ transform: scale(0.95) translateY(-4px);+ }+ to {+ opacity: 1;+ transform: scale(1) translateY(0);+ }+ }++ @keyframes popOut {+ from {+ opacity: 1;+ transform: scale(1) translateY(0);+ }+ to {+ opacity: 0;+ transform: scale(0.95) translateY(-4px);+ }+ }++ @keyframes slideInRight {+ from {+ opacity: 0;+ transform: translateX(100%);+ }+ to {+ opacity: 1;+ transform: translateX(0);+ }+ }++ @keyframes slideOutRight {+ from {+ opacity: 1;+ transform: translateX(0);+ }+ to {+ opacity: 0;+ transform: translateX(100%);+ }+ }++ @keyframes expandDown {+ from {+ opacity: 0;+ grid-template-rows: 0fr;+ }+ to {+ opacity: 1;+ grid-template-rows: 1fr;+ }+ }++ @keyframes collapseUp {+ from {+ opacity: 1;+ grid-template-rows: 1fr;+ }+ to {+ opacity: 0;+ grid-template-rows: 0fr;+ }+ }+}++@layer utilities {+ /* Base animation classes */+ .animate-fade-in {+ animation: fadeIn 0.3s ease-out both;+ }++ .animate-fade-in-down {+ animation: fadeInDown 0.3s ease-out both;+ }++ .animate-fade-out-down {+ animation: fadeOutDown 0.3s ease-out both;+ }++ /* Fast variants (matching animate__faster: 0.5s -> we use 0.15s for snappier feel) */+ .animate-fade-in-fast {+ animation: fadeIn 0.15s ease-out both;+ }++ .animate-fade-in-down-fast {+ animation: fadeInDown 0.15s ease-out both;+ }++ .animate-fade-out-down-fast {+ animation: fadeOutDown 0.15s ease-out both;+ }++ /* Pop animations (for dropdowns, modals, etc.) */+ .animate-pop-in {+ animation: popIn 0.15s ease-out both;+ transform-origin: top center;+ }++ .animate-pop-out {+ animation: popOut 0.1s ease-in both;+ transform-origin: top center;+ }++ /* Slide animations (for drawers, sidebars, etc.) */+ .animate-slide-in-right {+ animation: slideInRight 0.25s ease-out both;+ }++ .animate-slide-out-right {+ animation: slideOutRight 0.2s ease-in both;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/base/_base.css b/admin/app/assets/tailwind/spree/admin/base/_base.cssnew file mode 100644index 0000000000..8df102a80b--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/base/_base.css@@ -0,0 +1,70 @@+/* ==========================================================================+ BASE STYLES+ ========================================================================== */++@layer base {+ html {+ min-height: 100%;+ letter-spacing: normal;+ text-rendering: optimizeLegibility;+ text-size-adjust: 100%;+ -webkit-text-size-adjust: 100%;+ }++ *,+ *::before,+ *::after {+ border-color: var(--color-gray-200);+ }++ body {+ @apply text-base font-normal text-gray-950 bg-white;+ font-family: var(--font-sans);+ line-height: var(--line-height-base);+ }++ a {+ color: var(--color-primary);+ text-decoration: none;+ }++ a:hover {+ text-decoration: underline;+ }++ h1, h2, h3, h4, h5, h6 {+ @apply font-bold leading-none;+ font-family: var(--font-sans);+ }++ strong, b {+ @apply font-bold;+ }++ h1 { @apply text-4xl; }+ h2 { @apply text-3xl; }+ h3 { @apply text-2xl; }+ h4 { @apply text-xl; }+ h5 { @apply text-lg; }+ h6 { @apply text-base; }++ hr {+ @apply border-gray-200;+ }++ code {+ @apply text-gray-950 bg-gray-50;+ padding: 0.125rem 0.25rem;+ border-radius: var(--radius-sm);+ font-size: 0.875em;+ }++ /* Turbo frame busy state */+ turbo-frame.blur-busy[busy] {+ @apply opacity-50 pointer-events-none transition-opacity duration-300 ease-in-out;+ }++ turbo-frame.blur-busy[busy] * {+ @apply pointer-events-none transition-opacity duration-300 ease-in-out;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/base/_theme.css b/admin/app/assets/tailwind/spree/admin/base/_theme.cssnew file mode 100644index 0000000000..921787243c--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/base/_theme.css@@ -0,0 +1,62 @@+/* ==========================================================================+ THEME - Design Tokens (CSS Custom Properties)+ ========================================================================== */++@theme {+ /* Gray Scale */+ --color-gray-25: #FAFAFA;++ /* Legacy Colors, kept for old HTML from extensions/developer apps work properly */+ --color-primary: var(--color-zinc-950);+ --color-success: var(--color-green-900);+ --color-danger: var(--color-red-900);+ --color-warning: var(--color-yellow-900);+ --color-info: var(--color-blue-900);++ /* Typography */+ --font-sans: Inter, sans-serif;++ /* Override Tailwind's text-* scale to match Spree design system */+ --text-2xs: 0.625rem;+ --text-xs: 0.75rem;+ --text-sm: 0.813rem;+ --text-base: 0.875rem;+ --text-lg: 1rem;+ --text-xl: 1.25rem;+ --text-2xl: 1.5rem;+ --text-3xl: 1.75rem;+ --text-4xl: 2rem;++ --line-height-base: 21px;++ /* Font Weights - matches Bootstrap/Spree Admin variables */+ --font-weight-light: 300;+ --font-weight-normal: 400;+ --font-weight-medium: 500;+ --font-weight-bold: 600; /* Note: Spree uses 600, not 700 */++ /* Shadows */+ --shadow-xs: rgba(43, 34, 51, 0.05) 0px 1px 1px;+ --shadow-sm: 0 1px 2px 0 rgb(0 0 0 / 0.05);+ --shadow-default: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);+ --shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;+ --shadow-dropdown: 0px 0px 0px 1px rgba(179, 179, 179, 0.5), 0px 6px 12px -3px rgba(179, 179, 179, 0.35), 0px 6px 18px 0px rgba(179, 179, 179, 0.35);++ /* Layout Spacing */+ --spacing-sidebar-width: 220px;+ --spacing-sidebar-collapsed: 59px;+ --spacing-header-height: 58px;++ /* Transitions */+ --transition-fast: 0.1s ease-in-out;+ --transition-default: 0.15s ease-in-out;+ --transition-slow: 0.3s ease-in-out;++ /* Animations */+ --animate-fade-in: fade-in 0.15s ease-in-out;+}++@keyframes fade-in {+ from { opacity: 0; }+ to { opacity: 1; }+}diff --git a/admin/app/assets/tailwind/spree/admin/base/_utilities.css b/admin/app/assets/tailwind/spree/admin/base/_utilities.cssnew file mode 100644index 0000000000..95b1787f0d--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/base/_utilities.css@@ -0,0 +1,26 @@+@layer utilities {+ .scrollbar-thin ::-webkit-scrollbar {+ width: 0.35rem !important;+ }+ ::-webkit-scrollbar-track {+ border-radius: 0.25rem !important;+ background-color: transparent;+ }+ ::-webkit-scrollbar-thumb {+ border-radius: 0.25rem !important;+ background-color: var(--color-gray-200);+ }++ .scrollbar-none {+ scrollbar-width: none;+ -ms-overflow-style: none;+ }++ .scrollbar-none::-webkit-scrollbar {+ display: none;+ }++ ::-webkit-scrollbar-track {+ background-color: transparent;+ }+}\ No newline at end of filediff --git a/admin/app/assets/tailwind/spree/admin/components/_alerts.css b/admin/app/assets/tailwind/spree/admin/components/_alerts.cssnew file mode 100644index 0000000000..a6e305d07f--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_alerts.css@@ -0,0 +1,53 @@+/* ==========================================================================+ ALERTS+ ========================================================================== */++@layer components {+ .alert {+ @apply inline-flex flex-col justify-center relative bg-no-repeat py-3 px-4 pl-11 mb-4 min-h-10 border border-transparent rounded-lg;+ background-position: 1rem center;+ background-size: 1rem 1rem;+ }++ .alert > p:last-child {+ @apply mb-0;+ }++ .alert a {+ @apply font-medium text-zinc-950;+ }++ .alert-success {+ @apply bg-green-50 text-green-900 border-green-200;+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-check-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M9 12l2 2l4 -4' /%3E%3C/svg%3E");+ }++ .alert-danger {+ @apply bg-red-50 text-red-900 border-red-200;+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-exclamation-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M12 12m-9 0a9 9 0 1 0 18 0a9 9 0 1 0 -18 0' /%3E%3Cpath d='M12 9v4' /%3E%3Cpath d='M12 16v.01' /%3E%3C/svg%3E");+ }++ .alert-warning {+ @apply text-inherit bg-yellow-100 border-yellow-200/10!;+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-alert-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0' /%3E%3Cpath d='M12 8v4' /%3E%3Cpath d='M12 16h.01' /%3E%3C/svg%3E");+ }++ .alert-info {+ @apply bg-sky-50 text-sky-900 border-sky-200/10!;+ background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-info-circle'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0' /%3E%3Cpath d='M12 9h.01' /%3E%3Cpath d='M11 12h1v4h1' /%3E%3C/svg%3E");+ }++ /* Page alerts */+ .page-alerts .alert {+ @apply rounded-xl;+ }++ /* Fixed alerts container */+ .alerts-container {+ @apply fixed w-full z-1070 top-1 left-0 right-0 flex flex-col items-center pointer-events-none;+ }++ .alerts-container .alert {+ @apply border pointer-events-auto ease-in-out transition-all duration-200 shadow-sm;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_badges.css b/admin/app/assets/tailwind/spree/admin/components/_badges.cssnew file mode 100644index 0000000000..cc7bd8a080--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_badges.css@@ -0,0 +1,124 @@+/* ==========================================================================+ BADGES+ ========================================================================== */++@layer components {+ .badge {+ @apply inline-flex items-center text-center whitespace-nowrap align-baseline cursor-default text-xs font-normal leading-none rounded-md py-1 px-2;+ }++ .badge i {+ @apply mr-1 text-[100%];+ }++ .badge .ti {+ @apply text-xs leading-3;+ }++ /* Status badges - Green */+ .badge-completed,+ .badge-complete,+ .badge-resumed,+ .badge-considered_safe,+ .badge-paid,+ .badge-shipped,+ .badge-active,+ .badge-success,+ .badge-sold,+ .badge-open,+ .badge-authorized,+ .badge-published,+ .badge-live,+ .badge-processed,+ .badge-create,+ .badge-approved,+ .badge-resolved,+ .badge-reimbursed,+ .badge-allocation {+ @apply border border-transparent bg-green-200 text-green-900;+ }++ /* Status badges - Red */+ .badge-failed,+ .badge-considered_risky,+ .badge-error,+ .badge-errored,+ .badge-invalid,+ .badge-rejected,+ .badge-destroy,+ .badge-closed,+ .badge-canceled,+ .badge-partially_canceled,+ .badge-void,+ .badge-danger {+ @apply border border-transparent bg-red-100! text-red-900;+ }++ /* Status badges - Orange/Warning */+ .badge-returned,+ .badge-credit_owed,+ .badge-balance_due,+ .badge-backorder,+ .badge-checkout,+ .badge-suspended,+ .badge-archived,+ .badge-warning,+ .badge-ready {+ @apply border border-transparent bg-yellow-200 text-yellow-900;+ }++ /* Status badges - Light/Neutral */+ .badge-processing,+ .badge-pending,+ .badge-paused,+ .badge-awaiting_return,+ .badge-cart,+ .badge-inactive,+ .badge-address,+ .badge-delivery,+ .badge-payment,+ .badge-confirm,+ .badge-disabled,+ .badge-draft,+ .badge-onboarding,+ .badge-light,+ .badge-authorize,+ .badge-eligible,+ .badge-invited {+ @apply bg-white text-gray-600 border border-gray-200 font-normal;+ }++ .badge-processing:hover,+ .badge-pending:hover,+ .badge-paused:hover,+ .badge-awaiting_return:hover,+ .badge-cart:hover,+ .badge-inactive:hover,+ .badge-address:hover,+ .badge-delivery:hover,+ .badge-payment:hover,+ .badge-confirm:hover,+ .badge-disabled:hover,+ .badge-draft:hover,+ .badge-onboarding:hover,+ .badge-light:hover,+ .badge-authorize:hover,+ .badge-eligible:hover,+ .badge-invited:hover {+ @apply bg-white text-gray-600;+ }++ /* Status badges - Info/Notice */+ .badge-notice,+ .badge-update,+ .badge-partial,+ .badge-capture,+ .badge-info {+ @apply border border-transparent bg-blue-50 text-blue-900;+ }++ /* Pill badges */+ .badge-pill {+ @apply px-2.5 rounded-full;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_breadcrumbs.css b/admin/app/assets/tailwind/spree/admin/components/_breadcrumbs.cssnew file mode 100644index 0000000000..0e0f62d046--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_breadcrumbs.css@@ -0,0 +1,39 @@+/* ==========================================================================+ BREADCRUMBS+ ========================================================================== */++@layer components {+ .breadcrumb {+ @apply flex flex-wrap items-center mb-0 list-none font-medium bg-transparent rounded-none;+ @apply gap-2 p-0 pl-4 h-8 border-l border-gray-100;+ }++ .breadcrumb-item + .breadcrumb-item {+ @apply pl-0;+ }++ .breadcrumb-item + .breadcrumb-item::before {+ @apply float-left text-gray-500 pr-2;+ content: "/";+ }++ .breadcrumb-item.active {+ @apply text-gray-600;+ }++ .breadcrumb-item a {+ @apply text-inherit no-underline;+ }++ .breadcrumb-item a:hover {+ @apply text-zinc-950 underline;+ }++ .breadcrumb li a {+ @apply no-underline;+ }++ .breadcrumb li a:hover {+ @apply text-zinc-950 underline;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_bulk-panel.css b/admin/app/assets/tailwind/spree/admin/components/_bulk-panel.cssnew file mode 100644index 0000000000..93737336ae--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_bulk-panel.css@@ -0,0 +1,97 @@+/* ==========================================================================+ BULK PANEL+ ========================================================================== */++@layer components {+ .bulk-panel-container {+ @apply inline-flex items-center rounded-2xl bg-white shadow-dropdown h-12 gap-2;+ animation: bounceInUp;+ animation-duration: 0.5s;+ }++ @keyframes bounceInUp {+ from,+ 60%,+ 75%,+ 90%,+ to {+ animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);+ }++ from {+ opacity: 0;+ transform: translate3d(0, 3000px, 0) scaleY(5);+ }++ 60% {+ opacity: 1;+ transform: translate3d(0, -20px, 0) scaleY(0.9);+ }++ 75% {+ transform: translate3d(0, 10px, 0) scaleY(0.95);+ }++ 90% {+ transform: translate3d(0, -5px, 0) scaleY(0.985);+ }++ to {+ transform: translate3d(0, 0, 0);+ }+ }++ .bulk-panel-container .btn {+ @apply h-10;+ }++ .bulk-panel-container .btn:hover {+ @apply bg-gray-100;+ }++ .bulk-panel-container > * {+ @apply h-10 flex items-center justify-center;+ }++ .bulk-panel-container > *:first-child {+ @apply rounded-l-lg;+ }++ .bulk-panel-container > *:last-child {+ @apply rounded-r-lg;+ }++ .bulk-panel-container > *:last-child .btn {+ @apply rounded-r-lg;+ }++ .bulk-panel-container .btn-close {+ @apply w-10;+ }++ #bulk-panel {+ @apply fixed w-full text-center bottom-4 left-0;+ z-index: 1020;+ }++ @media (min-width: 992px) {+ #bulk-panel {+ @apply left-1/4 w-3/4;+ }+ }++ @media (min-width: 1200px) {+ #bulk-panel {+ left: 16.66666667%;+ width: 83.33333333%;+ }+ }++ .bulk-operations-counter {+ @apply pl-4 pr-0;+ }++ .bulk-operations-counter .bulk-operations-counter-label {+ @apply pr-4 flex items-center justify-center gap-2 border-r border-gray-200;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_buttons.css b/admin/app/assets/tailwind/spree/admin/components/_buttons.cssnew file mode 100644index 0000000000..23332679f9--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_buttons.css@@ -0,0 +1,114 @@+/* ==========================================================================+ BUTTONS+ ========================================================================== */++@layer components {+ /* Tabler Icons base styles */+ .ti {+ @apply align-middle text-[120%];+ }++ .btn {+ @apply inline-flex items-center justify-center text-center align-middle gap-2;+ @apply cursor-pointer select-none no-underline;+ @apply px-3 py-1.5 text-base font-medium leading-normal border border-transparent rounded-xl;+ @apply transition-colors duration-100 ease-linear;+ }++ .btn:disabled,+ .btn.disabled {+ @apply opacity-70 pointer-events-none cursor-not-allowed;+ }++ .btn-sm {+ @apply px-2 py-1 text-sm rounded-lg;+ }++ .btn-lg {+ @apply px-3 py-2 text-lg rounded-xl;+ }++ /* Button Variants */+ .btn-primary {+ @apply text-white bg-zinc-950 border-zinc-950 shadow-xs;+ }++ .btn-primary:hover {+ @apply bg-zinc-800 border-zinc-800;+ }++ .btn-secondary {+ @apply text-blue-900 shadow-xs bg-blue-50 border-blue-100/75;+ }++ .btn-secondary:hover,+ .btn-secondary:focus {+ @apply border-blue-200;+ }++ .btn-secondary .arrow {+ @apply text-zinc-950;+ }++ .btn-light,+ .btn-danger {+ @apply text-gray-700 bg-gray-25 border-gray-200 shadow-xs;+ }++ .btn-light:hover,+ .btn-light:focus,+ .btn-light:active {+ @apply bg-gray-100 border-gray-200 text-gray-900;+ }++ .btn-light:active {+ @apply bg-gray-50;+ box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.025);+ }++ .btn-light.bg-transparent {+ @apply bg-transparent;+ }++ .btn-danger {+ @apply text-red-600 bg-gray-25 hover:bg-red-100;+ }++ .btn-close {+ @apply border-none opacity-50 p-3 rounded-md w-3.5 h-3.5;+ background: transparent url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23000'%3e%3cpath d='M.293.293a1 1 0 0 1 1.414 0L8 6.586 14.293.293a1 1 0 1 1 1.414 1.414L9.414 8l6.293 6.293a1 1 0 0 1-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 0 1-1.414-1.414L6.586 8 .293 1.707a1 1 0 0 1 0-1.414z'/%3e%3c/svg%3e") center/0.85em auto no-repeat;+ }++ .btn-close:hover {+ @apply opacity-80 bg-gray-100;+ }++ .btn-clipboard {+ @apply w-6 h-6 px-1;+ }++ .payment-action-save {+ @apply text-white bg-green-300 border-green-300;+ }++ /* Button states for Turbo */+ button .show-when-disabled {+ @apply hidden;+ }++ button[disabled] .show-when-disabled {+ @apply inline;+ }++ button .show-when-enabled {+ @apply inline;+ }++ button[disabled] .show-when-enabled {+ @apply hidden;+ }++ .actions .btn {+ @apply ml-1;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_cards.css b/admin/app/assets/tailwind/spree/admin/components/_cards.cssnew file mode 100644index 0000000000..4e00c75d89--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_cards.css@@ -0,0 +1,232 @@+/* ==========================================================================+ CARDS+ ========================================================================== */++@layer components {+ .card,+ .card-lg {+ @apply relative flex flex-col min-w-0 break-words bg-white border border-gray-200 rounded-2xl;+ background-clip: border-box;+ }++ .card-lg {+ @apply p-0 mb-3;+ }++ .card .card {+ @apply rounded-2xl;+ }++ /* Card with table */+ .card > .table,+ .card .table-responsive > .table {+ @apply border-x-0 mb-0;+ }++ .card > .table:last-child,+ .card > .table:last-of-type,+ .card .table-responsive > .table:last-child,+ .card .table-responsive > .table:last-of-type {+ @apply border-b-0;+ }++ .card > .table td:first-child,+ .card > .table th:first-child,+ .card .table-responsive > .table td:first-child,+ .card .table-responsive > .table th:first-child {+ @apply border-l-0;+ }++ .card > .table td:last-child,+ .card > .table th:last-child,+ .card .table-responsive > .table td:last-child,+ .card .table-responsive > .table th:last-child {+ @apply border-r-0;+ }++ .card > .table tr:first-child td,+ .card > .table tr:first-child th,+ .card .table-responsive > .table tr:first-child td,+ .card .table-responsive > .table tr:first-child th {+ @apply border-t-0;+ }++ .card > .table tr:last-child td,+ .card .table-responsive > .table tr:last-child td {+ @apply border-b-0;+ }++ .card .card-header + .table,+ .card .card-header + .table-responsive > .table {+ @apply border-t-0;+ }++ .card-body {+ @apply flex-auto p-5;+ }++ .card-body .form-group:last-child {+ @apply mb-0;+ }++ .card-header,+ .card-footer {+ @apply bg-transparent;+ }++ .card-header {+ @apply flex items-center mb-0 p-5 h-14 border-b border-gray-100 rounded-t-[calc(var(--radius-2xl)-1px)];+ }++ .card-header .card-title {+ @apply mb-0 font-sans;+ }++ .card-header .arrow {+ @apply w-auto;+ }++ .card-header .arrow:before {+ @apply transition-transform duration-300 ease-in-out;+ }++ .card-header .collapsed .arrow:before {+ @apply -rotate-90;+ }++ .card-footer {+ @apply p-5;+ }++ .card-footer:last-child {+ @apply rounded-b-[calc(var(--radius-2xl)-1px)];+ }++ .card-footer.border-top,+ .card-body.border-top,+ .card .border-top,+ .card .border-bottom,+ .card .list-group-item {+ @apply border-gray-100!;+ }++ .card-title {+ @apply mb-2 font-bold;+ }++ .card-text {+ @apply break-words;+ }++ .card-text:last-child {+ @apply mb-0;+ }++ .card-link + .card-link {+ @apply ml-3;+ }++ .card-img-top {+ @apply w-full rounded-t-[calc(var(--radius-2xl)-1px)];+ }++ /* Collapsable Card */+ .collapsable-card {+ @apply relative flex flex-col min-w-0 break-words overflow-hidden;+ @apply bg-white border border-gray-200 rounded-2xl;+ background-clip: border-box;+ }++ .collapsable-card .card-header:hover {+ @apply bg-gray-25!;+ }++ .collapsable-card .card-body {+ @apply border-t border-gray-100;+ }++ .collapsable-card[open] .arrow {+ @apply rotate-90 transition-transform duration-200 ease-in-out;+ }++ .collapsable-card:not([open]) .arrow {+ @apply rotate-0 transition-transform duration-200 ease-in-out;+ }++ /* Animate details content */+ .collapsable-card > *:not(summary) {+ @apply grid overflow-hidden opacity-0;+ grid-template-rows: 0fr;+ transition: grid-template-rows 0.25s ease-out, opacity 0.2s ease-out;+ }++ .collapsable-card[open] > *:not(summary) {+ @apply opacity-100;+ grid-template-rows: 1fr;+ }++ .collapsable-card > *:not(summary) > * {+ @apply min-h-0;+ }++ /* Collapsible Card (Stimulus reveal controller version) */+ .card .card-header--collapsible:hover {+ @apply bg-gray-25;+ }++ .card .card-header--collapsible:focus {+ @apply outline-2 outline-primary outline-offset-[-2px];+ }++ .card .card-header--collapsible .arrow {+ @apply rotate-90 transition-transform duration-200 ease-in-out;+ }++ .card:has(.collapsible-content.is-collapsed) .card-header--collapsible .arrow {+ @apply rotate-0;+ }++ .card .collapsible-content {+ @apply grid overflow-hidden;+ grid-template-rows: 1fr;+ transition: grid-template-rows 0.25s ease-out, opacity 0.2s ease-out;+ }++ .card .collapsible-content.is-collapsed {+ grid-template-rows: 0fr;+ }++ .card .collapsible-content > * {+ @apply overflow-hidden min-h-0;+ }++ .card .collapsible-content .card-body {+ @apply border-t border-gray-100;+ }++ /* Details/Summary styling for cards */+ .collapsable-card details summary,+ .card details summary {+ @apply cursor-pointer list-none select-none;+ }++ .collapsable-card details summary::-webkit-details-marker,+ .card details summary::-webkit-details-marker {+ @apply hidden;+ }++ .collapsable-card details summary::marker,+ .card details summary::marker {+ @apply hidden;+ }++ .collapsable-card details summary[role="button"],+ .card details summary[role="button"] {+ @apply outline-none;+ }++ .collapsable-card details summary[role="button"]:focus,+ .card details summary[role="button"]:focus {+ @apply outline-2 outline-primary outline-offset-[-2px];+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_dialogs.css b/admin/app/assets/tailwind/spree/admin/components/_dialogs.cssnew file mode 100644index 0000000000..6fd6c8e0aa--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_dialogs.css@@ -0,0 +1,272 @@+/* ==========================================================================+ DIALOGS & MODALS+ ========================================================================== */++@layer components {+ /* Body modal-open state */+ body.modal-open,+ .modal.fade.show {+ @apply pr-0!;+ }++ body.modal-open {+ @apply w-full overflow-y-scroll! overflow-x-clip;+ }++ /* ==========================================================================+ Native Dialog Element+ ========================================================================== */++ /* Customize the dialog backdrop */+ dialog {+ box-shadow: 0 0 0 100vw rgba(255, 255, 255, 0.8);+ }++ dialog:-internal-dialog-in-top-layer::backdrop {+ background-color: rgba(255, 255, 255, 0.8);+ }++ dialog::backdrop {+ background-color: rgba(255, 255, 255, 0.8);+ }++ @keyframes fade-in {+ 0% { opacity: 0; }+ 100% { opacity: 1; }+ }++ @keyframes fade-out {+ 0% { opacity: 1; }+ 100% { opacity: 0; }+ }++ /* Add animations for centered dialogs (not drawers) */+ dialog.dialog[data-dialog-target="dialog"][open] {+ animation: fade-in 200ms forwards;+ }++ dialog.dialog[data-dialog-target="dialog"][closing] {+ animation: fade-out 200ms forwards;+ }++ dialog {+ @apply hidden z-1050 rounded-2xl border-none bg-white overflow-y-auto overflow-x-hidden p-0;+ box-shadow: 0px 0px 0px 1px rgba(179, 179, 179, 0.5), 0px 6px 12px -3px rgba(179, 179, 179, 0.35), 0px 6px 18px 0px rgba(179, 179, 179, 0.35);+ }++ /* Allow tom-select dropdowns to overflow the dialog */+ dialog:has(.ts-dropdown) {+ @apply overflow-visible;+ }++ dialog:open,+ dialog[open] {+ @apply flex;+ }++ /* ==========================================================================+ Drawer (Native Dialog)+ ========================================================================== */++ .drawer {+ @apply fixed top-0 right-0 left-auto flex-col justify-between p-0 overflow-hidden;+ height: calc(100dvh - 2rem);+ max-height: calc(100dvh - 2rem);+ width: calc(100vw - 2rem);+ max-width: 600px;+ min-width: 320px;+ margin: 1rem;+ }++ .drawer[open] {+ @apply flex;+ animation: slideInRight 0.25s ease-out forwards;+ }++ dialog.drawer[closing] {+ animation: slideOutRight 0.2s ease-in forwards;+ }++ .drawer .alerts-container {+ @apply absolute;+ }++ @media (max-width: 991.98px) {+ .drawer {+ max-width: 100vw;+ min-width: 100vw;+ }+ }++ .drawer > turbo-frame:not(#drawer_alerts),+ .drawer turbo-frame > form {+ @apply flex w-full h-full flex-col justify-between overflow-hidden;+ }++ .drawer-header {+ @apply flex justify-between items-center p-4 border-b border-gray-100;+ }++ .drawer-title {+ @apply mb-0 font-bold;+ }++ .drawer-body {+ @apply flex-auto overflow-y-auto p-4;+ }++ .drawer-footer {+ @apply flex justify-between items-center p-4 bg-gray-25 border-t border-gray-100 rounded-b-2xl;+ }++ /* ==========================================================================+ Dialog (Centered Modal - Native Dialog)+ ========================================================================== */++ .dialog {+ @apply fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 w-[90%] max-w-[500px] m-0 p-0 flex-col overflow-hidden;+ max-height: 90vh;+ }++ .dialog[open] {+ @apply flex;+ }++ .dialog .alerts-container {+ @apply absolute;+ }++ .dialog > turbo-frame:not(#dialog_alerts),+ .dialog turbo-frame > form {+ @apply flex w-full flex-col;+ flex: 1 1 auto;+ min-height: 0;+ }++ .dialog-header {+ @apply flex justify-between items-center p-4 border-b border-gray-100;+ }++ .dialog-header .btn-close {+ @apply -mr-1;+ }++ .dialog-title {+ @apply mb-0 font-medium;+ }++ .dialog-body {+ @apply flex-auto overflow-y-auto p-4;+ max-height: calc(90vh - 200px);+ }++ .dialog-footer {+ @apply sticky bottom-0 p-4 flex gap-2 items-center justify-between border-t border-gray-100 bg-gray-25;+ border-radius: 0 0 calc(var(--radius-2xl) - 1px) calc(var(--radius-2xl) - 1px);+ }++ .dialog-footer .btn {+ @apply inline-flex;+ }++ /* ==========================================================================+ Bootstrap Modal (Legacy Support)+ ========================================================================== */++ .modal {+ @apply fixed top-0 left-0 z-1050 hidden w-full h-full overflow-x-hidden overflow-y-auto outline-none;+ }++ .modal.show {+ @apply block;+ }++ .modal-dialog {+ @apply relative w-auto m-2 pointer-events-none;+ }++ .modal.show .modal-dialog {+ @apply transform-none;+ }++ .modal-dialog-centered {+ @apply flex items-center;+ min-height: calc(100% - 1rem);+ }++ .modal-content {+ @apply relative flex flex-col w-full pointer-events-auto bg-white border-none rounded-2xl outline-none;+ background-clip: padding-box;+ box-shadow: 0px 0px 0px 1px rgba(179, 179, 179, 0.5), 0px 6px 12px -3px rgba(179, 179, 179, 0.35), 0px 6px 18px 0px rgba(179, 179, 179, 0.35);+ }++ .modal-backdrop {+ @apply fixed top-0 left-0 z-1050 w-screen h-screen;+ background-color: rgba(255, 255, 255, 0.8);+ }++ .modal-header {+ @apply flex shrink-0 items-center justify-between p-4 border-b border-gray-100;+ border-top-left-radius: calc(var(--radius-2xl) - 1px);+ border-top-right-radius: calc(var(--radius-2xl) - 1px);+ }++ .modal-header .btn-close {+ @apply -mr-1;+ }++ .modal-title {+ @apply mb-0 leading-normal font-medium;+ }++ .modal-body {+ @apply relative flex-auto p-4;+ }++ .modal-footer {+ @apply flex shrink-0 items-center justify-end p-4 bg-gray-25 border-t border-gray-100;+ border-bottom-right-radius: calc(var(--radius-2xl) - 1px);+ border-bottom-left-radius: calc(var(--radius-2xl) - 1px);+ }++ .modal-footer .btn {+ @apply inline-flex w-auto! h-10;+ }++ .modal-footer > * {+ @apply m-1;+ }++ .modal-dialog turbo-frame {+ @apply block w-full;+ }++ @media (min-width: 576px) {+ .modal-dialog {+ @apply max-w-[500px] mx-auto;+ margin-top: 1.75rem;+ margin-bottom: 1.75rem;+ }++ .modal-dialog-centered {+ min-height: calc(100% - 3.5rem);+ }++ .modal-sm {+ @apply max-w-[300px];+ }+ }++ @media (min-width: 992px) {+ .modal-lg,+ .modal-xl {+ @apply max-w-[800px];+ }+ }++ @media (min-width: 1200px) {+ .modal-xl {+ @apply max-w-[1140px];+ }+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_dropdowns.css b/admin/app/assets/tailwind/spree/admin/components/_dropdowns.cssnew file mode 100644index 0000000000..6ef6075e6a--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_dropdowns.css@@ -0,0 +1,135 @@+/* ==========================================================================+ DROPDOWNS+ ========================================================================== */++@layer components {+ .dropdown {+ @apply relative;+ }++ .dropdown .btn .text-gray-600 {+ @apply text-gray-500!;+ }++ .dropdown .arrow {+ @apply text-gray-300;+ }++ .dropdown:hover .arrow {+ @apply text-gray-500;+ }++ .dropdown.show .arrow {+ @apply rotate-180;+ }++ /* Dropdown Toggle */+ .dropdown-toggle {+ @apply whitespace-nowrap;+ }++ .dropdown-toggle::after {+ @apply border-none inline-block align-middle opacity-50 rotate-0 transition-transform duration-200 ease-in-out;+ content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='18' height='18' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round' class='icon icon-tabler icons-tabler-outline icon-tabler-chevron-down'%3E%3Cpath stroke='none' d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M6 12l6 6l6 -6'/%3E%3C/svg%3E");+ }++ .dropdown-toggle:focus::after,+ .dropdown-toggle:active::after,+ .dropdown-toggle[aria-expanded="true"]::after {+ @apply rotate-180 opacity-100;+ }++ .dropdown-toggle:empty::after {+ @apply ml-0;+ }++ /* Dropdown Container using Floating UI */+ .dropdown-container {+ @apply absolute z-1050 text-left list-none border-0 overflow-hidden text-base font-normal text-gray-950 bg-white;+ @apply origin-top mt-1! p-1 rounded-2xl min-w-40 max-w-80;+ animation: popIn 0.15s ease-out both;+ background-clip: padding-box;+ box-shadow: var(--shadow-dropdown);+ }++ /* When hidden, disable animation so it doesn't play on page load */+ .dropdown-container.hidden {+ @apply animate-none;+ }++ .dropdown-divider {+ @apply h-0 my-1 overflow-hidden border-t border-gray-100;+ }++ /* Dropdown Item */+ .dropdown-container .dropdown-item,+ .dropdown-container .dropdown-header {+ @apply py-2 px-2.5;+ }++ .dropdown-container .dropdown-header {+ @apply text-base font-normal my-1;+ }++ .dropdown-item {+ @apply flex items-center justify-start w-full clear-both text-inherit no-underline whitespace-nowrap bg-transparent border-0 font-normal;+ @apply h-8 mb-1 pr-8 rounded-xl transition-colors duration-75 ease-linear gap-3;+ }++ .dropdown-item .badge {+ @apply ml-auto self-center;+ }++ .dropdown-item:hover,+ .dropdown-item:focus {+ @apply no-underline text-gray-900 bg-gray-200/50;+ }++ .dropdown-item.active {+ @apply relative text-gray-900! font-bold! bg-gray-200/50!;+ }++ .dropdown-item.active i {+ @apply text-gray-900!;+ }++ .dropdown-item.active::after {+ @apply inline-block absolute right-3 w-4 h-4;+ content: "";+ background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-check text-zinc-950"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l5 5l10 -10"/></svg>')+ no-repeat center center;+ }++ .dropdown-item:active {+ @apply no-underline text-gray-900 bg-gray-100;+ }++ .dropdown-item.disabled,+ .dropdown-item:disabled {+ @apply pointer-events-none bg-transparent text-gray-500;+ }++ .dropdown-item.btn {+ @apply font-normal!;+ }++ .dropdown-item.btn-danger {+ @apply shadow-none;+ }++ .dropdown-item:last-child {+ @apply mb-0;+ }++ .dropdown-container .button_to {+ @apply w-full;+ }++ .dropdown-header {+ @apply block mb-0 whitespace-nowrap text-sm text-gray-600 py-2 px-4;+ }++ .dropdown-item-text {+ @apply block py-1 px-4 text-gray-950;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_filters.css b/admin/app/assets/tailwind/spree/admin/components/_filters.cssnew file mode 100644index 0000000000..6529db79dc--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_filters.css@@ -0,0 +1,83 @@+/* ==========================================================================+ FILTERS+ ========================================================================== */++@layer components {+ .filter-wrap {+ @apply sticky bg-white border-b border-gray-200 rounded-t-2xl;+ padding: 0.55rem;+ gap: 0.55rem;+ top: var(--spacing-header-height);+ z-index: 1000;+ }++ .filter-wrap .btn {+ height: 2.125rem;+ }+++ #table-filter {+ @apply absolute p-4 rounded-2xl shadow-dropdown bg-white mt-2 right-2 w-full overflow-y-auto;+ animation: fadeIn 0.2s ease-in-out;+ z-index: 1050;+ max-height: calc(100vh - var(--spacing-header-height) - 4rem);+ }++ @keyframes fadeIn {+ from { opacity: 0; }+ to { opacity: 1; }+ }++ @media (min-width: 768px) {+ #table-filter {+ @apply w-1/2 flex-col;+ }+ }++ #table-filter.hidden,+ #table-filter.d-none {+ @apply !hidden;+ }++ .collapsed .arrow {+ @apply -rotate-90 transition-transform duration-300 ease-in-out;+ }++ i.js-delete-filter {+ @apply mb-0;+ }++ .sort_link {+ @apply text-gray-600 px-1 rounded-sm inline-flex items-center justify-center;+ }++ .sort_link:hover {+ @apply text-zinc-950! no-underline! bg-gray-50;+ }++ .sort_link.asc,+ .sort_link.desc {+ @apply font-medium;+ }++ .sort_link.asc svg,+ .sort_link.desc svg {+ @apply text-gray-600!;+ }++ .sort_link .icon,+ .sort_link svg {+ margin-left: 5px;+ margin-bottom: 2px;+ width: 0.8rem;+ height: 0.8rem;+ }++ .sort_link svg.default-filter-arrow {+ @apply opacity-30;+ }++ .filter-badges-container:has(*) {+ @apply mt-4 flex gap-2 flex-wrap;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_forms.css b/admin/app/assets/tailwind/spree/admin/components/_forms.cssnew file mode 100644index 0000000000..13b1f00666--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_forms.css@@ -0,0 +1,248 @@+/* ==========================================================================+ FORMS+ ========================================================================== */+@layer components {+ label {+ @apply flex items-center cursor-pointer gap-2 font-medium mb-2 text-base;+ }++ .form-group {+ @apply mb-4;+ }++ .form-label {+ @apply inline-block mb-2 font-medium;+ }++ .form-control,+ .text-input,+ .form-input,+ .form-select,+ .custom-select,+ .ts-control,+ .select-input,+ .form-control-sm,+ .custom-select-sm {+ @apply block w-full py-2 px-3 text-base font-normal leading-normal;+ @apply text-gray-950 bg-white border border-gray-200 rounded-lg shadow-xs;+ @apply focus:outline-offset-2 focus:outline-blue-500 focus:border-gray-200 focus:ring-0;+ @apply transition-all duration-100 ease-in-out;+ }++ .form-input-sm,+ .form-select-sm,+ .form-control-sm,+ .custom-select-sm {+ @apply py-1 px-2 text-sm;+ }++ .form-control::placeholder,+ .form-input::placeholder,+ .text-input::placeholder,+ .form-select::placeholder {+ @apply text-gray-500 opacity-100;+ }++ .form-control:disabled,+ .form-control[readonly],+ .form-input:disabled,+ .form-input[readonly],+ .text-input:disabled,+ .text-input[readonly] {+ @apply shadow-none cursor-not-allowed text-gray-600;+ background-color: var(--color-gray-50) !important;+ border: 1px solid var(--color-gray-100) !important;+ }++ .form-text {+ @apply block mt-0 text-base text-gray-600;+ }++ .form-actions {+ @apply flex items-center gap-2;+ }++ .field_with_errors {+ @apply contents;+ }++ .field_with_errors input,+ .field_with_errors select,+ .field_with_errors textarea {+ @apply border-danger;+ }++ .formError {+ @apply block mt-1 text-sm text-danger;+ }++ /* Select */+ .custom-select:disabled,+ .custom-select[readonly],+ .form-select:disabled,+ .form-select[readonly] {+ @apply shadow-none cursor-not-allowed text-gray-600;+ background-color: var(--color-gray-50);+ border: 1px solid var(--color-gray-200);+ }++ /* Custom Select Small */+ .custom-select-sm,+ .form-select-sm {+ height: calc(1.5em + 0.5rem + 2px);+ }++ /* Input Group */+ .input-group {+ @apply flex items-center gap-3 bg-white border border-gray-200 rounded-lg shadow-xs focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 focus-within:ring-0 transition-all duration-100 ease-in-out;+ }+ .input-group > input {+ @apply text-base border-0 focus:ring-0 focus:outline-none rounded-lg;+ }++ /* File input */+ input[type="file"] {+ @apply max-w-full whitespace-nowrap overflow-hidden text-ellipsis;+ width: fit-content;+ }++ /* Custom Controls (Checkboxes & Radios) */+ .custom-control {+ @apply relative block min-h-6;+ }++ .custom-control-input {+ @apply absolute opacity-0 z-[-1];+ }++ .custom-control-label {+ @apply relative mb-0 align-top cursor-pointer select-none pl-7 font-normal;+ }++ .custom-control-label::before {+ @apply absolute left-0 top-0.5 block pointer-events-none bg-white border border-gray-300 rounded;+ content: "";+ width: 1.125rem;+ height: 1.125rem;+ transition:+ background-color 0.15s ease-in-out,+ border-color 0.15s ease-in-out,+ box-shadow 0.15s ease-in-out;+ }++ .custom-control-label::after {+ @apply absolute left-0 top-0.5 block bg-no-repeat bg-center;+ content: "";+ width: 1.125rem;+ height: 1.125rem;+ background-size: 60% 60%;+ }++ /* Checkbox checked state */+ .form-checkbox .custom-control-input:checked ~ .custom-control-label::before {+ @apply border-blue-500 bg-blue-500;+ }++ .form-checkbox .custom-control-input:checked ~ .custom-control-label::after {+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='white'%3e%3cpath fill-rule='evenodd' d='M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z' clip-rule='evenodd'/%3e%3c/svg%3e");+ }++ /* Checkbox indeterminate state */+ .form-checkbox+ .custom-control-input:indeterminate+ ~ .custom-control-label::before {+ @apply border-blue-500 bg-blue-500;+ }++ .form-checkbox+ .custom-control-input:indeterminate+ ~ .custom-control-label::after {+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20' fill='white'%3e%3cpath fill-rule='evenodd' d='M3 10a1 1 0 011-1h12a1 1 0 110 2H4a1 1 0 01-1-1z' clip-rule='evenodd'/%3e%3c/svg%3e");+ }++ /* Focus state */+ .custom-control-input:focus ~ .custom-control-label::before {+ @apply ring-2 ring-blue-500/25 ring-offset-1;+ }++ /* Disabled state */+ .custom-control-input:disabled ~ .custom-control-label {+ @apply text-gray-400 cursor-not-allowed;+ }++ .custom-control-input:disabled ~ .custom-control-label::before {+ @apply bg-gray-100 border-gray-200;+ }++ .custom-control-input:disabled:checked ~ .custom-control-label::before {+ @apply bg-blue-500/50 border-blue-500/50;+ }++ /* Radio button specific styles */+ .custom-radio .custom-control-label::before {+ @apply rounded-full;+ }++ .custom-radio .custom-control-input:checked ~ .custom-control-label::before {+ @apply border-blue-500 bg-blue-500;+ }++ .custom-radio .custom-control-input:checked ~ .custom-control-label::after {+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='2' fill='white'/%3e%3c/svg%3e");+ }++ /* Hover state for unchecked */+ .custom-control-input:not(:checked):not(:disabled)+ ~ .custom-control-label:hover::before {+ @apply border-gray-400;+ }++ /* Custom switch styles */+ .custom-switch {+ @apply pl-12;+ }++ .custom-switch .custom-control-label::before {+ @apply left-0 rounded-full bg-gray-200 border-gray-200;+ width: 2.5rem;+ height: 1.25rem;+ pointer-events: all;+ }++ .custom-switch .custom-control-label::after {+ @apply left-0.5 top-1 rounded-full bg-white shadow;+ width: 1rem;+ height: 1rem;+ transition:+ transform 0.15s ease-in-out,+ background-color 0.15s ease-in-out;+ }++ .custom-switch .custom-control-input:checked ~ .custom-control-label::before {+ @apply bg-blue-500 border-blue-500;+ }++ .custom-switch .custom-control-input:checked ~ .custom-control-label::after {+ @apply bg-white;+ transform: translateX(1.25rem);+ }++ .custom-switch .custom-control-input:focus ~ .custom-control-label::before {+ @apply ring-2 ring-blue-500/25 ring-offset-1;+ }++ .custom-switch+ .custom-control-input:disabled+ ~ .custom-control-label::before {+ @apply bg-gray-100 border-gray-100;+ }++ /* Inline controls */+ .custom-range, .form-range {+ @apply w-full h-2 p-0 bg-transparent border rounded-full appearance-none cursor-pointer bg-gray-200;+ }++ .custom-range::-webkit-slider-thumb, .form-range::-webkit-slider-thumb {+ @apply w-4 h-4 appearance-none bg-blue-500 rounded-full cursor-pointer ring-2 ring-blue-500/25 ring-offset-1 focus:outline-none;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_layout.css b/admin/app/assets/tailwind/spree/admin/components/_layout.cssnew file mode 100644index 0000000000..f74c2d5360--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_layout.css@@ -0,0 +1,580 @@+/* ==========================================================================+ LAYOUT - Header, Sidebar, Main Content+ ========================================================================== */++@layer components {+ /* Header */+ #header {+ height: var(--spacing-header-height);+ background-color: var(--color-white);+ box-shadow: inset 0 -1px 0 var(--color-gray-200);+ transition: margin-left 0.1s ease;+ }++ @media (min-width: 992px) {+ #header {+ margin-left: var(--spacing-sidebar-width);+ }+ }++ body.sidebar-collapsed #header {+ margin-left: var(--spacing-sidebar-collapsed);+ }++ #page-header {+ @apply flex items-center bg-white;+ height: 80px;+ }++ #page-header.sticky {+ @apply px-4 w-full max-w-full border-b border-gray-200;+ animation: slideDown 0.3s ease-out;+ height: var(--spacing-header-height);+ }+ #page-header.container.sticky {+ width: 100% !important;+ max-width: 100% !important;+ }++ @keyframes slideDown {+ from {+ transform: translateY(-100%);+ }+ to {+ transform: translateY(0);+ }+ }++ #settings-header {+ @apply sticky top-0 flex items-center p-0 bg-white z-1000;+ height: var(--spacing-header-height);+ transition: margin-left 0.1s ease;+ }++ @media (min-width: 992px) {+ #settings-header {+ margin-left: var(--spacing-sidebar-width);+ }+ }++ body.sidebar-collapsed #settings-header {+ margin-left: var(--spacing-sidebar-collapsed);+ }++ #settings-header #page-header {+ @apply mb-0 px-4 max-w-full! border-b border-gray-200;+ height: var(--spacing-header-height);+ }++ #settings-header #page-tabs {+ @apply border-b border-gray-200;+ }++ .page-header-title {+ @apply text-xl mb-2 font-medium;+ }++ /* Page Tabs */+ #page-tabs {+ @apply -mt-4;+ }++ #page-tabs .nav {+ @apply flex flex-nowrap overflow-x-auto gap-4 pl-0 -mb-px;+ }++ #page-tabs .nav .nav-link {+ @apply rounded-none py-4 px-0;+ }++ #page-tabs .nav .nav-link.active {+ @apply bg-transparent text-zinc-950 font-bold;+ }++ /* Main Content */+ #content {+ transition: margin-left 0.1s ease;+ }++ @media (min-width: 992px) {+ #content {+ margin-left: calc(var(--spacing-sidebar-width) + 1px);+ }+ }++ /* Store Dropdown */+ .store-dropdown {+ @apply flex items-center justify-between pr-3 pl-2 mr-px;+ transition: padding 0.1s ease;+ height: var(--spacing-header-height);+ }++ .store-dropdown-button {+ @apply flex items-center justify-between text-left gap-2 p-1 shadow-none! hover:bg-gray-200;+ }++ .store-chooser {+ @apply flex flex-col gap-1 p-1 m-1 border border-gray-200 rounded-lg;+ }++ .store-chooser .store-chooser-item {+ @apply flex items-center gap-2 rounded-lg p-1 whitespace-nowrap;+ }++ .store-chooser .store-chooser-item:hover {+ @apply no-underline bg-gray-200/50;+ }++ .store-chooser .store-chooser-item.active {+ @apply cursor-not-allowed bg-blue-50;+ }++ /* User Dropdown */+ .user-dropdown {+ @apply hidden items-center justify-between p-2 bg-gray-25 border-t border-gray-200 mt-auto mr-px;+ }++ @media (min-width: 992px) {+ .user-dropdown {+ @apply flex;+ }+ }++ .user-dropdown > .dropdown {+ @apply w-full overflow-hidden;+ }++ .user-dropdown-button {+ @apply flex items-center justify-start text-left gap-2 p-1 shadow-none! w-full overflow-hidden;+ }++ .user-dropdown-button:hover {+ @apply bg-gray-200/50;+ }++ .user-dropdown-button .user-name {+ @apply flex-1 w-0 min-w-0 overflow-hidden text-ellipsis whitespace-nowrap text-base;+ }++ /* Sidebar Toggle Button */+ .sidebar-toggle-btn {+ @apply flex items-center justify-center p-0 bg-transparent border-none rounded-lg z-10;+ width: 32px;+ height: 32px;+ }++ .sidebar-toggle-btn:hover {+ @apply bg-gray-200/50;+ }++ body.sidebar-collapsed .sidebar-toggle-btn {+ transform: rotate(180deg);+ }++ /* Main Sidebar */+ #main-sidebar {+ @apply flex flex-col gap-0 bg-gray-25 h-screen overflow-x-hidden fixed top-0;+ width: var(--spacing-sidebar-width);+ box-shadow: inset -1px 0 0 var(--color-gray-200);+ }++ @media (max-width: 992px) {+ #main-sidebar {+ @apply hidden;+ }+ }++ #main-sidebar .sidebar-content {+ @apply opacity-100 pt-2 flex-1 overflow-y-auto;+ }++ #main-sidebar .nav {+ @apply flex flex-col gap-1 px-3;+ }++ #main-sidebar .nav-link {+ @apply flex items-center whitespace-nowrap font-normal p-1 rounded-xl text-gray-800 transition-colors duration-200 ease-in-out;+ transition: background-color 0.1s ease-in-out;+ }++ #main-sidebar .nav-link .ti {+ @apply mr-2 rounded-lg shrink-0 text-gray-400;+ padding: 0.2rem;+ }++ #main-sidebar .nav-link:hover {+ @apply bg-gray-200/50 text-zinc-950;+ }++ #main-sidebar .nav-link:hover .ti {+ @apply text-zinc-950;+ }++ #main-sidebar .nav-link.active {+ @apply text-zinc-950 bg-white font-normal;+ 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.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;+ }++ #main-sidebar .nav-link.active .ti {+ @apply bg-zinc-950 text-white;+ }++ #main-sidebar .nav-link .badge:not(.badge-info) {+ @apply rounded-lg;+ }++ #main-sidebar .nav-submenu {+ @apply flex flex-col list-none pt-1 pl-8 relative;+ }++ #main-sidebar .nav-submenu:before {+ @apply absolute bg-gray-200 left-4 top-0 bottom-1;+ content: '';+ width: 1px;+ }++ #main-sidebar .nav-submenu .nav-link {+ @apply font-normal py-1;+ }++ #main-sidebar .nav-submenu .nav-link:hover {+ @apply bg-gray-50;+ }++ #main-sidebar .nav-submenu .nav-link.active,+ #main-sidebar .nav-submenu .nav-link:active,+ #main-sidebar .nav-submenu .nav-link:focus {+ @apply font-bold bg-transparent! shadow-none;+ }++ #main-sidebar .nav-submenu .nav-link.active:before,+ #main-sidebar .nav-submenu .nav-link:active:before,+ #main-sidebar .nav-submenu .nav-link:focus:before {+ @apply absolute bg-zinc-950 rounded-sm;+ content: '';+ left: calc(-1rem - 1px);+ top: 10%;+ width: 3px;+ height: 80%;+ }++ #main-sidebar .dropdown .btn {+ @apply flex items-center p-1 rounded-lg;+ }++ #main-sidebar .dropdown .btn:hover,+ #main-sidebar .dropdown .btn:focus,+ #main-sidebar .dropdown .btn:active {+ @apply bg-gray-200/50;+ }++ #main-sidebar .dropdown .dropdown-menu {+ @apply w-[calc(100%-1rem)]!;+ }++ /* Sidebar collapsed state */+ body.sidebar-no-transition #main-sidebar,+ body.sidebar-no-transition .store-dropdown,+ body.sidebar-no-transition .user-dropdown,+ body.sidebar-no-transition #content,+ body.sidebar-no-transition #header,+ body.sidebar-no-transition #settings-header {+ @apply transition-none!;+ }++ body.sidebar-collapsed #main-sidebar {+ @apply px-0;+ width: var(--spacing-sidebar-collapsed);+ }++ body.sidebar-collapsed #main-sidebar .sidebar-content {+ @apply opacity-100 pointer-events-auto;+ }++ body.sidebar-collapsed #main-sidebar .sidebar-content .nav > .nav-item > .nav-link {+ @apply justify-center px-0 mx-auto overflow-visible text-[0px] relative;+ width: 40px;+ height: 40px;+ }++ body.sidebar-collapsed #main-sidebar .sidebar-content .nav > .nav-item > .nav-link .ti {+ @apply text-xl mr-0 text-gray-800;+ }+ body.sidebar-collapsed #main-sidebar .sidebar-content .nav > .nav-item > .nav-link.active .ti {+ @apply text-white;+ }++ body.sidebar-collapsed #main-sidebar .sidebar-content .nav > .nav-item > .nav-link span:not(.badge) {+ @apply hidden;+ }++ body.sidebar-collapsed #main-sidebar .sidebar-content .nav > .nav-item > .nav-link .badge {+ @apply flex absolute top-0 right-0 justify-center items-center text-2xs px-1 py-0 rounded-full;+ transform: translate(25%, -25%);+ min-width: 18px;+ height: 18px;+ line-height: 18px;+ }++ body.sidebar-collapsed #main-sidebar .nav {+ @apply px-0 items-center;+ }++ body.sidebar-collapsed #main-sidebar .nav-submenu,+ body.sidebar-collapsed #main-sidebar .sidebar-content .dropdown {+ @apply hidden;+ }++ body.sidebar-collapsed .store-dropdown {+ @apply overflow-visible justify-center p-2;+ }++ body.sidebar-collapsed .store-dropdown #new-item-dropdown,+ body.sidebar-collapsed .store-dropdown .store-name {+ @apply hidden!;+ }++ body.sidebar-collapsed .store-dropdown .store-dropdown-button {+ @apply justify-center overflow-hidden p-1;+ width: 40px;+ height: 40px;+ }++ body.sidebar-collapsed .store-dropdown .store-dropdown-button::after {+ @apply hidden;+ }++ body.sidebar-collapsed .store-dropdown .store-dropdown-button .store-logo,+ body.sidebar-collapsed .store-dropdown .store-dropdown-button img,+ body.sidebar-collapsed .store-dropdown .store-dropdown-button .ti {+ @apply m-0;+ }++ /* Keep the icon/logo element visible */+ body.sidebar-collapsed .store-dropdown .store-dropdown-button .store-icon {+ @apply flex! text-lg;+ width: 32px;+ height: 32px;+ }++ /* Hide all text spans and chevron when collapsed */+ body.sidebar-collapsed .store-dropdown .store-dropdown-button :not(.store-icon) {+ @apply hidden;+ }++ body.sidebar-collapsed .user-dropdown {+ @apply overflow-visible justify-center p-2;+ }++ body.sidebar-collapsed .user-dropdown .dropdown {+ @apply block!;+ }++ body.sidebar-collapsed .user-dropdown .user-name {+ @apply hidden!;+ }++ body.sidebar-collapsed .user-dropdown .user-dropdown-button {+ @apply justify-center overflow-visible p-1;+ width: 44px;+ height: 44px;+ }++ body.sidebar-collapsed .user-dropdown .user-dropdown-button::after {+ @apply hidden;+ }++ /* Keep avatar visible and centered */+ body.sidebar-collapsed .user-dropdown .user-dropdown-button .avatar {+ @apply flex! m-0;+ }++ /* Hide enterprise edition notice when collapsed */+ body.sidebar-collapsed #main-sidebar #enterprise-edition-notice {+ @apply hidden;+ }++ /* Hide mt-auto sections when collapsed */+ body.sidebar-collapsed #main-sidebar .mt-auto {+ @apply hidden;+ }++ /* Hide vendors badge in collapsed state */+ body.sidebar-collapsed #main-sidebar .sidebar-content #nav-link-vendors .badge {+ @apply hidden!;+ }++ /* Nav section header in collapsed state */+ body.sidebar-collapsed #main-sidebar .sidebar-content .nav-section-header {+ width: calc(var(--spacing-sidebar-collapsed) - 20px);+ }++ body.sidebar-collapsed #main-sidebar .sidebar-content .nav-section-header span {+ @apply hidden;+ }++ body.sidebar-collapsed #content {+ margin-left: calc(var(--spacing-sidebar-collapsed) + 1px);+ }++ /* Mobile Sidebar */+ .sidebar-mobile {+ @apply fixed inset-0 z-1050 invisible pointer-events-none;+ }++ .sidebar-mobile .sidebar-backdrop {+ @apply absolute inset-0 bg-black/50 opacity-0 transition-opacity duration-500;+ }++ .sidebar-mobile .sidebar-panel {+ @apply absolute left-0 top-0 bottom-0 bg-gray-25 overflow-y-auto flex flex-col shadow-lg transition-transform duration-500;+ width: var(--spacing-sidebar-width);+ transform: translateX(-100%);+ }++ .sidebar-mobile .sidebar-mobile-header {+ @apply flex items-center p-2 border-b border-gray-200 bg-gray-25 sticky top-0 z-1;+ }++ .sidebar-mobile .sidebar-mobile-header .store-dropdown {+ @apply flex-1 border-b-0 p-0;+ }++ .sidebar-mobile .sidebar-mobile-header .btn {+ @apply flex items-center justify-center shrink-0 p-1;+ width: 32px;+ height: 32px;+ }++ .sidebar-mobile .sidebar-mobile-content {+ @apply pt-2 flex-1 overflow-y-auto;+ }++ /* Mobile sidebar navigation styles (match desktop expanded sidebar) */+ .sidebar-mobile .sidebar-mobile-content .nav {+ @apply flex flex-col gap-1 px-3;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-link {+ @apply flex items-center whitespace-nowrap font-normal p-1 rounded-lg text-inherit transition-colors duration-500;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-link .ti {+ @apply mr-2 rounded-lg shrink-0;+ padding: 0.2rem;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-link:hover {+ @apply bg-gray-200/50;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-link:hover .ti {+ @apply text-zinc-950;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-link.active {+ @apply text-zinc-950 bg-white font-normal;+ 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.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-link.active .ti {+ @apply bg-zinc-950 text-white;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-link .badge:not(.badge-info) {+ @apply bg-gray-200/50 text-gray-700 rounded-lg;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-submenu {+ @apply flex flex-col list-none pt-1 pl-8 relative;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-submenu:before {+ @apply absolute bg-gray-200 left-4 top-0 bottom-1;+ content: '';+ width: 1px;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link {+ @apply font-normal py-1;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link:hover {+ @apply bg-gray-200/50;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link.active,+ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link:active,+ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link:focus {+ @apply font-bold bg-transparent! shadow-none;+ }++ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link.active:before,+ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link:active:before,+ .sidebar-mobile .sidebar-mobile-content .nav-submenu .nav-link:focus:before {+ @apply absolute bg-zinc-950 rounded-sm;+ content: '';+ left: calc(-1rem - 1px);+ top: 10%;+ width: 3px;+ height: 80%;+ }++ .sidebar-mobile .sidebar-mobile-content .dropdown {+ @apply px-2;+ }++ .sidebar-mobile .sidebar-mobile-content .dropdown .btn {+ @apply flex items-center p-1 rounded-lg;+ }++ .sidebar-mobile .sidebar-mobile-content .dropdown .btn:hover,+ .sidebar-mobile .sidebar-mobile-content .dropdown .btn:focus,+ .sidebar-mobile .sidebar-mobile-content .dropdown .btn:active {+ @apply bg-gray-200/50;+ }++ .sidebar-mobile .sidebar-mobile-content .dropdown .dropdown-menu {+ @apply w-[calc(100%-1rem)]!;+ }++ /* User dropdown in mobile sidebar */+ .sidebar-mobile .sidebar-panel .user-dropdown {+ @apply relative flex w-full border-r-0 border-t border-gray-200 mt-auto;+ }++ .sidebar-mobile.sidebar-mobile-open {+ @apply visible pointer-events-auto;+ }++ .sidebar-mobile.sidebar-mobile-open .sidebar-backdrop {+ @apply opacity-100;+ }++ .sidebar-mobile.sidebar-mobile-open .sidebar-panel {+ @apply translate-x-0;+ }++ /* Enterprise Edition Notice */+ #enterprise-edition-notice {+ @apply relative text-xs py-2 px-3 m-3 border shadow-xs rounded-lg;+ background-image: none;+ }++ #enterprise-edition-notice p {+ @apply mb-2;+ }++ #enterprise-edition-notice .btn-close {+ @apply absolute right-1 top-1 text-inherit!;+ }++ #enterprise-edition-notice .btn-close:hover {+ @apply bg-transparent!;+ }++ /* Documentation Link */+ .documentation-link-container {+ @apply text-sm text-center text-gray-400 mt-8;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_line-items.css b/admin/app/assets/tailwind/spree/admin/components/_line-items.cssnew file mode 100644index 0000000000..a353c9b35c--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_line-items.css@@ -0,0 +1,28 @@+/* ==========================================================================+ LINE ITEMS+ ========================================================================== */++@layer components {+ .order-line-items__form {+ @apply p-3 border-b border-gray-200;+ }++ .order-line-items__form:last-child {+ @apply border-b-0;+ }++ .order-line-items__form:hover {+ @apply bg-gray-25;+ }++ .shipment-line-items__row,+ .shipment-line-items__form {+ @apply grid grid-flow-row py-3;+ grid-template-columns: [product_description] 1fr [price] 10% [quantity] 15% [total] 10% [actions] 5%;+ }++ .shipment-line-items__form {+ @apply gap-y-2;+ grid-column: 1/-1;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_list-groups.css b/admin/app/assets/tailwind/spree/admin/components/_list-groups.cssnew file mode 100644index 0000000000..743dc321e7--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_list-groups.css@@ -0,0 +1,57 @@+/* ==========================================================================+ LIST GROUPS+ ========================================================================== */++@layer components {+ .list-group {+ @apply flex flex-col pl-0 mb-0 rounded-lg;+ }++ .list-group-item {+ @apply relative block py-3 px-5 text-gray-950 no-underline border border-gray-200 hover:bg-gray-25;+ }++ .list-group-item:first-child {+ @apply rounded-t-2xl;+ }++ .list-group-item:last-child {+ @apply rounded-b-2xl;+ }++ .list-group-item.disabled,+ .list-group-item:disabled {+ @apply text-gray-500 pointer-events-none;+ }++ .list-group-item + .list-group-item {+ @apply border-t-0;+ }++ /* Flush list group */+ .list-group-flush {+ @apply rounded-none;+ }++ .list-group-flush > .list-group-item {+ @apply border-x-0 border-t-0 border-b;+ }++ .list-group-flush > .list-group-item:last-child {+ @apply border-b-0;+ }++ /* Actionable list group items */+ .list-group-item-action {+ @apply w-full text-gray-700 text-left;+ }++ .list-group-item-action:hover,+ .list-group-item-action:focus {+ @apply z-1 text-gray-700 no-underline bg-gray-50;+ }++ .list-group-item-action:active {+ @apply text-gray-950 bg-gray-100;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_media-form.css b/admin/app/assets/tailwind/spree/admin/components/_media-form.cssnew file mode 100644index 0000000000..6179b3a7f9--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_media-form.css@@ -0,0 +1,69 @@+/* ==========================================================================+ MEDIA FORM+ ========================================================================== */++@layer components {+ .upload-area {+ @apply flex flex-col gap-2 justify-center items-center overflow-hidden rounded-lg border border-dashed border-gray-200 bg-gray-25 p-2 cursor-pointer text-gray-500 transition-all duration-500 ease-out;+ }++ .upload-area:hover {+ @apply bg-blue-50/50 border-blue-500/25 text-blue-800;+ }++ .upload-area:active {+ @apply bg-blue-50 border-blue-100 !ring-2 !ring-blue-500 !ring-offset-2 !ring-offset-white;+ }++ .media-form {+ @apply grid grid-cols-6 gap-2 w-full h-full select-none;+ }++ .media-form__add-button {+ @apply aspect-square;+ }++ .media-form__add-button:only-child {+ @apply col-span-6 row-span-1 aspect-[12/1] max-w-[200px] h-[200px];+ }++ .media-form__add-button:not(:only-child) {+ @apply !h-full;+ }++ .media-form__image {+ @apply p-2 border-none overflow-hidden flex w-full h-full aspect-square rounded-lg relative justify-between items-start transition-shadow duration-200 ease-in-out shadow-[rgba(209,217,224,0.5)_0px_0px_0px_1px];+ }++ .media-form__image img {+ @apply top-0 left-0;+ }++ .media-form__image .move-handle {+ @apply z-[2] text-white;+ }++ .media-form__image .form-checkbox:has(input:checked) {+ @apply !inline;+ }++ .media-form__image:hover .form-checkbox {+ @apply !inline;+ }++ .media-form__image:hover .move-handle {+ @apply !inline;+ }++ .media-form__image:hover {+ @apply !shadow-[rgba(209,217,224,0.8)_0px_0px_0px_1px,rgba(37,41,46,0.04)_0px_3px_6px_-3px,rgba(37,41,46,0.12)_0px_2px_6px_0px];+ }++ .media-form__image:has(input:checked) {+ @apply !ring-2 !ring-blue-500;+ }++ .media-form__image:first-of-type {+ @apply col-span-2 row-span-2;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_misc.css b/admin/app/assets/tailwind/spree/admin/components/_misc.cssnew file mode 100644index 0000000000..9ae1e5eb94--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_misc.css@@ -0,0 +1,35 @@+/* ==========================================================================+ MISCELLANEOUS COMPONENTS+ ========================================================================== */++@layer components {+ /* Embed responsive */+ .embed-responsive {+ @apply relative block w-full p-0 overflow-hidden;+ }++ .embed-responsive::before {+ @apply block;+ content: "";+ }++ .embed-responsive .embed-responsive-item,+ .embed-responsive iframe,+ .embed-responsive embed,+ .embed-responsive object,+ .embed-responsive video {+ @apply absolute top-0 bottom-0 left-0 w-full h-full border-0;+ }++ .embed-responsive-16by9::before {+ padding-top: 56.25%;+ }++ .embed-responsive-4by3::before {+ padding-top: 75%;+ }++ .embed-responsive-1by1::before {+ padding-top: 100%;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_navigation.css b/admin/app/assets/tailwind/spree/admin/components/_navigation.cssnew file mode 100644index 0000000000..ef84cd8f43--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_navigation.css@@ -0,0 +1,41 @@+/* ==========================================================================+ NAVIGATION+ ========================================================================== */++@layer components {+ /* Nav base */+ .nav {+ @apply flex flex-wrap pl-0 mb-0 list-none;+ }++ .nav-link {+ @apply block no-underline py-2 px-4 transition-colors duration-150 ease-in-out;+ }++ .nav-link:hover,+ .nav-link:focus {+ @apply text-zinc-950;+ }++ .nav-link.disabled {+ @apply pointer-events-none cursor-default text-gray-500;+ }++ /* Nav pills */+ .nav-pills {+ @apply gap-1;+ }+ .nav-pills .nav-link {+ @apply bg-none rounded-xl py-1.5 px-3 cursor-pointer transition-colors duration-300 ease-in-out text-gray-900 hover:bg-gray-25;+ }++ .nav-pills .nav-link.active {+ @apply bg-gray-100;+ }++ /* Nav fill and justified */+ .nav-fill > .nav-link,+ .nav-fill .nav-item {+ @apply flex-auto text-center;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_progress.css b/admin/app/assets/tailwind/spree/admin/components/_progress.cssnew file mode 100644index 0000000000..fb89ca43b8--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_progress.css@@ -0,0 +1,14 @@+/* ==========================================================================+ PROGRESS & SPINNERS+ ========================================================================== */++@layer components {+ /* Progress bar */+ .progress {+ @apply flex h-2 overflow-hidden text-xs bg-gray-100 rounded-full;+ }++ .progress-bar {+ @apply bg-blue-500 transition-[width] duration-600 ease-out;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_search-picker.css b/admin/app/assets/tailwind/spree/admin/components/_search-picker.cssnew file mode 100644index 0000000000..c8e1d1889c--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_search-picker.css@@ -0,0 +1,36 @@+/* ==========================================================================+ SEARCH PICKER+ ========================================================================== */++@layer components {+ .search-results {+ height: 250px;+ }++ .search-picker__option {+ @apply relative mb-2 flex cursor-pointer items-center border border-transparent rounded-md pr-8;+ }++ .search-picker__option label {+ @apply mb-0 w-full h-full p-2 flex items-center justify-start;+ }++ .search-picker__option input[type="checkbox"],+ .search-picker__option input[type="radio"] {+ @apply hidden;+ }++ .search-picker__option:hover {+ @apply bg-gray-25;+ }++ .search-picker__option:has(input:checked) {+ @apply bg-blue-50 border-blue-100;+ }++ .search-picker__option:has(input:checked)::after {+ @apply inline-block absolute right-2 w-6 h-6;+ content: '';+ background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="icon icon-tabler icons-tabler-outline icon-tabler-check text-zinc-950"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M5 12l5 5l10 -10"/></svg>') no-repeat center center;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_seo-form.css b/admin/app/assets/tailwind/spree/admin/components/_seo-form.cssnew file mode 100644index 0000000000..dc1226688d--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_seo-form.css@@ -0,0 +1,21 @@+/* ==========================================================================+ SEO FORM+ ========================================================================== */++@layer components {+ .seo-form .card-body {+ @apply gap-4;+ }++ .seo-form .seo__preview {+ @apply gap-0.5;+ }++ .seo-form .seo__preview__title {+ color: #1a0dab;+ }++ .seo-form .seo__preview__link {+ color: #006625;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_sortable-tree.css b/admin/app/assets/tailwind/spree/admin/components/_sortable-tree.cssnew file mode 100644index 0000000000..61711b6edf--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_sortable-tree.css@@ -0,0 +1,61 @@+/* ==========================================================================+ SORTABLE TREE+ ========================================================================== */++@layer components {+ #itemImgContainer {+ width: 200px;+ }++ #itemImgContainer img {+ @apply max-w-full;+ }++ #sortableTreeArea .space-buttons {+ box-shadow: -11px 0 16px 6px white;+ z-index: 9;+ }++ #sortableTreeArea .space-buttons a {+ margin: 2px;+ }++ #sortableTreeArea .sortable-tree-item-row {+ @apply bg-white;+ margin: 2px;+ }++ #sortableTreeArea .sortable-tree-item {+ @apply border border-transparent p-0;+ }++ #sortableTreeArea .sortable-tree-item [data-sortable-tree-parent-id-value] {+ margin-left: 25px;+ }++ @media (min-width: 576px) {+ #sortableTreeArea .sortable-tree-item [data-sortable-tree-parent-id-value] {+ margin-left: 50px;+ }+ }++ #sortableTreeArea .sortable-chosen {+ @apply bg-transparent border-transparent;+ }++ #sortableTreeArea .sortable-chosen .sortable-tree-item-row {+ @apply bg-blue-50 border-2 border-blue-500;+ margin: -1px;+ }++ #sortableTreeArea .item_image_holder {+ @apply relative border border-gray-200 overflow-hidden;+ border-radius: 7px;+ width: 45px;+ height: 45px;+ }++ #sortableTreeArea .item_image_holder img {+ @apply absolute left-1/2 top-1/2 h-full w-auto -translate-x-1/2 -translate-y-1/2;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_tables.css b/admin/app/assets/tailwind/spree/admin/components/_tables.cssnew file mode 100644index 0000000000..038d650c54--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_tables.css@@ -0,0 +1,195 @@+/* ==========================================================================+ TABLES+ ========================================================================== */++@layer components {+ .table {+ @apply w-full align-top text-gray-950 border-gray-200;+ }++ .table > :not(caption) > * > * {+ @apply bg-transparent border-b py-4 px-3;+ box-shadow: inset 0 0 0 9999px transparent;+ }++ .table > tbody {+ @apply align-middle;+ }++ .table > thead {+ @apply align-bottom;+ }++ .table th {+ @apply border-t-0 border-b-0 whitespace-nowrap;+ }++ .table thead th {+ @apply align-middle text-left text-sm font-medium text-gray-600 bg-gray-25 py-2 border-b border-gray-200;+ }++ .table thead th:first-child {+ @apply rounded-tl-2xl;+ }++ .table thead th:last-child {+ @apply rounded-tr-2xl;+ }++ .table tbody tr td {+ @apply align-middle;+ }++ .table tbody tr td .filterable {+ @apply cursor-pointer opacity-25 ml-1 w-4 h-4;+ }++ .table tbody tr td .filterable:hover {+ @apply opacity-100;+ }++ .table tbody tr td a:hover {+ @apply no-underline;+ }++ .table tbody tr td > a:not(.btn):not(.text-zinc-950) {+ @apply text-gray-900;+ }++ .table tbody tr.active td {+ @apply bg-blue-50 border-blue-100;+ }++ .table tbody tr:hover:not(.active):not(.sortable-chosen) td {+ @apply bg-gray-50/75;+ }++ .table tbody tr:last-child td {+ @apply border-b-0;+ }++ .table tbody tr:last-child td:first-child {+ @apply rounded-bl-xl;+ }++ .table tbody tr:last-child td:last-child {+ @apply rounded-br-xl;+ }++ .table tr > td:first-child,+ .table tr > th:first-child {+ @apply pl-4;+ }++ .table tr > td:last-child,+ .table tr > th:last-child {+ @apply pr-4;+ }++ .table th.handel-head {+ @apply w-12;+ }++ .table td.move-handle {+ @apply w-11;+ }++ .table th a.sort_link {+ @apply whitespace-nowrap;+ }++ .table-responsive {+ @apply overflow-x-auto;+ -webkit-overflow-scrolling: touch;+ }++ /* Card-lg table styles */+ .card-lg .with-filters table thead th:first-child,+ .card-lg turbo-frame table thead th:first-child {+ @apply rounded-tl-none;+ }++ .card-lg .with-filters table thead th:last-child,+ .card-lg turbo-frame table thead th:last-child {+ @apply rounded-tr-none;+ }++ /* Pagination container */+ .pagination-container {+ @apply sticky bottom-0 z-100 border-t bg-white rounded-b-2xl;+ }++ /* Filters search bar */+ #filters-search-bar {+ @apply max-w-xs mr-auto;+ }++ /* Table active filters */+ .table-active-filters {+ @apply p-3;+ }++ .table-active-filters:not(:has(:first-child)) {+ @apply hidden;+ }++ .table-active-filters .js-filter .icon {+ @apply cursor-pointer;+ }++ .table-active-filters .badge-secondary .icon {+ @apply invert;+ }++ .table-active-filters .badge {+ @apply inline-block mr-2 mb-2;+ }++ .table-active-filters .badge:hover {+ @apply opacity-80;+ }++ /* Table responsive overflow handling */+ .table-responsive tr td,+ .table-responsive tr th {+ @apply whitespace-nowrap;+ }++ .table-responsive.border {+ @apply border-gray-200!;+ }++ .table-responsive:has(.dropdown.show) {+ @apply overflow-visible;+ }++ /* Sortable drag */+ .sortable-drag-v {+ @apply w-full text-right opacity-0 border border-info rounded-md;+ }++ .sortable-drag-v td {+ @apply border-t-0 opacity-0;+ }++ .sortable-drag-v td:first-child {+ @apply opacity-100;+ }++ /* Actions column */+ td.actions {+ @apply text-right;+ }++ td.actions .btn {+ @apply whitespace-nowrap;+ }++ td.actions .btn:not(.btn-sm) {+ @apply py-2;+ }++ td.actions .btn-sm {+ @apply py-1;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_tooltips.css b/admin/app/assets/tailwind/spree/admin/components/_tooltips.cssnew file mode 100644index 0000000000..76aea90f4f--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_tooltips.css@@ -0,0 +1,15 @@+/* ==========================================================================+ TOOLTIPS & POPOVERS+ ========================================================================== */++@layer components {+ /* Custom Tooltip Container (Floating UI) */+ .tooltip-container {+ @apply absolute hidden pointer-events-none z-1080 bg-white text-gray-950 border-0 rounded-lg;+ @apply text-base! font-normal! opacity-100! py-1 px-2 max-w-[200px];+ @apply whitespace-normal break-words;+ box-shadow: 0px 0px 0px 1px var(--color-gray-200), 0px 3px 6px -1px rgba(209, 213, 219, 0.35), 0px 3px 6px 0px rgba(209, 213, 219, 0.35);+ overflow-wrap: anywhere;+ text-wrap: wrap;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/components/_variants-form.css b/admin/app/assets/tailwind/spree/admin/components/_variants-form.cssnew file mode 100644index 0000000000..fd52102575--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/components/_variants-form.css@@ -0,0 +1,150 @@+/* ==========================================================================+ VARIANTS FORM+ ========================================================================== */++@layer components {+ .variants-form {+ @apply flex flex-col gap-8;+ }++ .variants-form .options-creator {+ @apply m-4 p-2 border border-gray-200 rounded-md;+ }++ .variants-form .options-creator:not(:has(.options-creator__options_container .options-creator__option)) {+ @apply m-0 border-none;+ }++ .variants-form .options-creator:not(:has(.options-creator__options_container .options-creator__option)) .options-creator__option--new {+ @apply pl-4;+ }++ .variants-form .options-creator:has(.options-creator__option--new:not(.d-none)) {+ @apply border border-gray-200 rounded-md m-4 mb-4;+ }++ .variants-form .options-creator__option {+ @apply flex border-b border-gray-200 mb-2;+ padding: 0.5rem 0.5rem 1rem 0;+ }++ .variants-form .options-creator__option .label {+ @apply inline-block font-medium mb-2;+ }++ .variants-form .options-creator__option .draggable {+ @apply inline-flex items-center justify-center px-2 mr-3 !cursor-grab pr-4;+ min-width: calc(16px + 1rem);+ }++ .variants-form .options-creator__option .draggable i {+ @apply mr-0;+ }++ .variants-form .options-creator__option .draggable:hover {+ @apply bg-gray-25;+ }++ .variants-form .options-creator__option--new {+ @apply border-b-0 mb-0 pb-2;+ padding-left: calc(1.13px + 3.25rem);+ }++ .variants-form .options-creator__option--new .values-inputs {+ @apply flex flex-col gap-1;+ }++ .variants-form .options-creator__option--form {+ @apply border-b-0 mb-0 pb-2;+ padding-left: calc(1.13px + 3.25rem);+ }++ .variants-form .options-creator__option:first-child {+ @apply border-t-0;+ }++ .variants-form .options-creator .new_option_button {+ @apply w-full justify-start py-2;+ }++ .variants-form .variants-table {+ @apply flex flex-col;+ }++ .variants-form .variants-table .column-checkbox,+ .variants-form .variants-table .column-variant,+ .variants-form .variants-table .column-price,+ .variants-form .variants-table .column-quantity,+ .variants-form .variants-table .column-actions {+ @apply inline-flex items-center;+ }++ .variants-form .variants-table .column-checkbox {+ @apply justify-center grow-0 basis-8;+ }++ .variants-form .variants-table .column-variant {+ @apply select-none grow-[3] basis-0;+ }++ .variants-form .variants-table .column-price {+ @apply grow basis-0;+ }++ .variants-form .variants-table .column-actions {+ @apply grow-0 basis-20;+ }++ .variants-form .variants-table .column-quantity {+ @apply justify-between w-full grow basis-0;+ line-height: 28px;+ }++ .variants-form .variants-table__actions {+ @apply hidden w-full justify-end p-4 pt-0;+ }++ .variants-form .variants-table__actions:has(*) {+ @apply flex;+ }++ .variants-form .variants-table__actions__select {+ @apply w-min pr-7;+ }++ .variants-form .variants-table__header,+ .variants-form .variants-table__footer {+ @apply flex text-gray-600 w-full px-4 gap-1;+ background-color: rgba(250, 250, 250, 0.5);+ }++ .variants-form .variants-table__header__cell,+ .variants-form .variants-table__footer__cell {+ @apply inline-block;+ }++ .variants-form .variants-table__footer {+ @apply justify-center items-center py-2 rounded-t-none rounded-b-lg;+ }++ .variants-form .variants-table__body {+ @apply flex flex-col;+ }++ .variants-form .variants-table__body__row {+ @apply px-4 w-full flex gap-1 border-b border-gray-200;+ }++ .variants-form .variants-table__body__row.nested .column-checkbox,+ .variants-form .variants-table__body__row.nested .column-variant {+ @apply left-5 relative;+ }++ .variants-form .variants-table__body__row.nested .column-variant {+ width: calc(100% - 1.25rem);+ }++ .variants-form .variants-table__body__cell {+ @apply py-2 block;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/index.css b/admin/app/assets/tailwind/spree/admin/index.cssnew file mode 100644index 0000000000..a1eea2c5ef--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/index.css@@ -0,0 +1,67 @@+@import url("https://unpkg.com/[email protected]/dist/trix.css");+@import url("https://esm.sh/@uppy/[email protected]/dist/style.min.css");+@import url("https://esm.sh/@uppy/[email protected]/dist/style.min.css");+@import url("https://esm.sh/@uppy/[email protected]/dist/style.min.css");+@import url("https://esm.sh/@simonwep/[email protected]/dist/themes/classic.min.css");+@import url("https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/styles/github-dark.min.css");+@import url("https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/tabler-icons.min.css");++@import "tailwindcss";+@plugin "@tailwindcss/typography";+@plugin "@tailwindcss/forms" {+ strategy: "base";+}+@plugin "@tailwindcss/aspect-ratio";++/* Content sources for class detection */+@source "../../../../views/**/*.erb";+@source "../../../../helpers/**/*.rb";+@source "../../../../javascript/**/*.js";+@source "./**/*.css";++/* Base */+@import "./base/_theme.css";+@import "./base/_base.css";+@import "./base/_utilities.css";+@import "./base/_animations.css";++/* Utilities */+@import "./utilities/_bootstrap.css";++/* Components - Core */+@import "./components/_forms.css";+@import "./components/_buttons.css";+@import "./components/_cards.css";+@import "./components/_badges.css";+@import "./components/_alerts.css";+@import "./components/_tables.css";+@import "./components/_dialogs.css";+@import "./components/_navigation.css";+@import "./components/_dropdowns.css";+@import "./components/_list-groups.css";+@import "./components/_tooltips.css";+@import "./components/_breadcrumbs.css";+@import "./components/_progress.css";+@import "./components/_misc.css";++/* Components - Layout */+@import "./components/_layout.css";+@import "./components/_filters.css";+@import "./components/_search-picker.css";+@import "./components/_sortable-tree.css";+@import "./components/_bulk-panel.css";+@import "./components/_variants-form.css";+@import "./components/_media-form.css";+@import "./components/_seo-form.css";+@import "./components/_line-items.css";++/* Views */+@import "./views/_dashboard.css";+@import "./views/_page-builder.css";++/* Plugins */+@import "./plugins/_actiontext.css";+@import "./plugins/_tinymce.css";+@import "./plugins/_trix.css";+@import "./plugins/_uppy.css";+@import "./plugins/_tom-select.css";diff --git a/admin/app/assets/tailwind/spree/admin/plugins/_actiontext.css b/admin/app/assets/tailwind/spree/admin/plugins/_actiontext.cssnew file mode 100644index 0000000000..f7e1808722--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/plugins/_actiontext.css@@ -0,0 +1,35 @@+/*+ * Provides a drop-in pointer for the default Trix stylesheet that will format the toolbar and+ * the trix-editor content (whether displayed or under editing). Feel free to incorporate this+ * inclusion directly in any other asset bundle and remove this file.+ *+ *= require trix+*/++/*+ * We need to override trix.css's image gallery styles to accommodate the+ * <action-text-attachment> element we wrap around attachments. Otherwise,+ * images in galleries will be squished by the max-width: 33%; rule.+*/++@layer components {+ .trix-content .attachment-gallery > action-text-attachment,+ .trix-content .attachment-gallery > .attachment {+ @apply flex-[1_0_33%] px-2 max-w-[33%];+ }++ .trix-content .attachment-gallery.attachment-gallery--2 > action-text-attachment,+ .trix-content .attachment-gallery.attachment-gallery--2 > .attachment,+ .trix-content .attachment-gallery.attachment-gallery--4 > action-text-attachment,+ .trix-content .attachment-gallery.attachment-gallery--4 > .attachment {+ @apply flex-[0_0_50%] max-w-[50%];+ }++ .trix-content action-text-attachment .attachment {+ @apply p-0! max-w-full!;+ }++ .trix-button--dialog {+ @apply w-auto! h-auto!;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/plugins/_tinymce.css b/admin/app/assets/tailwind/spree/admin/plugins/_tinymce.cssnew file mode 100644index 0000000000..7857dcb045--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/plugins/_tinymce.css@@ -0,0 +1,79 @@+/* ==========================================================================+ TINYMCE CUSTOM STYLES+ ========================================================================== */++@layer components {+ /* Hide TinyMCE branding */+ .tox-statusbar__branding {+ @apply hidden;+ }++ .tox.tox-tinymce {+ @apply rounded-md! border-0!;+ }++ .tox-edit-area__iframe {+ @apply bg-white!;+ }++ .tox-tinymce--disabled .tox-edit-area__iframe {+ @apply bg-gray-50!;+ }++ .tox .tox-edit-area::before {+ @apply border-primary!;+ }++ /* Grey out the readonly textarea */+ .rich-text-area-container:has(textarea.spree-rte[contenteditable='false']) {+ textarea.spree-rte + .tox-tinymce .tox-edit-area__iframe {+ @apply bg-gray-50!;+ }+ }++ .tox .tox-tbtn {+ @apply rounded-md!;+ color: rgba(0, 0, 0, 0.6) !important;+ }++ .tox .tox-tbtn svg {+ fill: rgba(0, 0, 0, 0.6) !important;+ }++ .tox .tox-editor-header {+ @apply p-0!;+ }++ .tox .tox-edit-focus {+ @apply hidden!;+ }++ .tox-statusbar {+ @apply hidden!;+ }++ /* Override TinyMCE UI font size */+ .tox-toolbar__group {+ @apply text-sm!;+ }++ .tox-mbtn__select-label {+ @apply text-sm!;+ }++ /* Override TinyMCE Content font size */+ .tox-tinymce {+ @apply text-sm!;+ }++ .tox .tox-collection__item-label,+ .tox-tbtn__select-label {+ @apply text-sm!;+ font-family: var(--font-sans);+ }++ .tox.tox-tinymce-aux .tox-toolbar__overflow,+ .tox .tox-menu {+ @apply rounded-md!;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/plugins/_tom-select.css b/admin/app/assets/tailwind/spree/admin/plugins/_tom-select.cssnew file mode 100644index 0000000000..d38b508a45--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/plugins/_tom-select.css@@ -0,0 +1,299 @@+/* ==========================================================================+ TOM SELECT CUSTOM STYLES+ ========================================================================== */++@layer components {+ /* Base wrapper */+ .ts-wrapper {+ @apply relative;+ }++ .ts-wrapper.form-input,+ .ts-wrapper.form-select {+ @apply p-0!;+ }++ /* Dropdown */+ .ts-dropdown,+ .ts-dropdown.form-input {+ @apply absolute mt-2! top-full left-0 w-full h-auto p-1 z-[10000000]! bg-white rounded-lg;+ box-shadow: var(--shadow-dropdown);+ }++ .ts-dropdown .optgroup-header {+ @apply text-xs leading-normal;+ }++ .ts-dropdown .optgroup:first-child:before {+ @apply hidden;+ }++ .ts-dropdown .optgroup:before {+ @apply block h-0 my-2 overflow-hidden border-t border-gray-200 -mx-3;+ content: ' ';+ }++ .ts-dropdown .create {+ @apply pl-3;+ }++ .ts-dropdown-content {+ @apply p-0 overflow-y-auto overflow-x-hidden max-h-[200px] scroll-smooth;+ overflow-scrolling: touch;+ }++ .ts-dropdown [data-selectable] {+ @apply cursor-pointer overflow-hidden;+ }++ .ts-dropdown [data-selectable] .highlight {+ @apply rounded-sm;+ background: rgba(255, 237, 40, 0.4);+ }++ .ts-dropdown .option,+ .ts-dropdown .optgroup-header,+ .ts-dropdown .no-results,+ .ts-dropdown .create {+ @apply p-2 rounded-sm;+ }++ .ts-dropdown .option,+ .ts-dropdown [data-disabled],+ .ts-dropdown [data-disabled] [data-selectable].option {+ @apply cursor-default opacity-50;+ }++ .ts-dropdown [data-selectable].option {+ @apply opacity-100 cursor-pointer;+ }++ .ts-dropdown .optgroup:first-child .optgroup-header {+ @apply border-t-0;+ }++ .ts-dropdown .optgroup-header {+ @apply text-gray-600 bg-white cursor-default;+ }++ .ts-dropdown .active {+ @apply bg-gray-100 text-gray-900;+ }++ .ts-dropdown .active.create {+ @apply text-gray-900;+ }++ .ts-dropdown .create {+ @apply text-gray-500;+ }++ .ts-dropdown .spinner {+ @apply inline-block w-[30px] h-[30px] my-[3px] mx-3;+ }++ .ts-dropdown .spinner:after {+ @apply block w-6 h-6 m-[3px] rounded-full border-[5px] border-gray-200 animate-spin;+ content: " ";+ border-color: var(--color-gray-200) transparent var(--color-gray-200) transparent;+ }++ /* Control */+ .ts-control,+ .ts-wrapper.single.input-active .ts-control {+ @apply bg-white cursor-text;+ }++ .focus .ts-control {+ @apply outline-2 outline-offset-2 outline-blue-500 border-gray-200 ring-0;+ }++ /* Validation states */+ .is-invalid .ts-control,+ .was-validated .invalid .ts-control {+ border-color: var(--color-red);+ }++ .is-invalid .focus .ts-control,+ .was-validated .invalid .focus .ts-control {+ border-color: var(--color-red);+ box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25);+ }++ .is-valid .ts-control {+ border-color: var(--color-green);+ }++ .is-valid .focus .ts-control {+ border-color: var(--color-green);+ box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25);+ }++ /* Multi-select items */+ .ts-wrapper.multi .ts-control > div {+ @apply cursor-pointer mr-[3px] mb-[3px] py-[1px] px-[5px] text-gray-800 border-0 border-gray-200 rounded-[calc(var(--radius-md)-1px)];+ background: #efefef;+ }++ .ts-wrapper.multi .ts-control > div.active {+ @apply bg-zinc-950 text-white border-0 border-transparent;+ }++ .ts-wrapper.multi.has-items .ts-control {+ @apply pl-[calc(0.75rem-5px)];+ }++ /* Disabled state */+ .ts-wrapper.disabled {+ @apply pointer-events-none cursor-not-allowed!;+ }++ .ts-wrapper.disabled:hover:not(:focus) {+ @apply border-0!;+ }++ .ts-wrapper.disabled .ts-control {+ @apply pointer-events-none cursor-not-allowed! opacity-50 bg-gray-100;+ }++ .ts-wrapper.disabled .ts-control:hover:not(:focus) {+ @apply border border-transparent!;+ }++ .disabled .ts-control,+ .disabled .ts-control * {+ @apply cursor-default!;+ }++ .disabled .ts-control {+ @apply opacity-50 bg-gray-100;+ }++ .ts-wrapper.multi.disabled .ts-control > div,+ .ts-wrapper.multi.disabled .ts-control > div.active {+ @apply text-gray-500 bg-gray-100 border-0 border-gray-200;+ }++ /* Input styling */+ .ts-control > * {+ @apply align-baseline inline-block;+ }++ .ts-control > input {+ @apply flex-auto inline-block! p-0! m-0! max-w-full! text-base min-w-28 min-h-0! max-h-none! indent-0! border-0! bg-none! leading-[inherit]! select-auto! shadow-none!;+ }++ .ts-control > input:focus {+ @apply outline-none! ring-0!;+ }++ .has-items .ts-control > input {+ @apply mx-1!;+ }++ /* Hidden input */+ .input-hidden .ts-control > input {+ @apply opacity-0 absolute -left-[10000px];+ }++ /* Single select caret */+ .ts-wrapper.single .ts-control {+ @apply pr-8 cursor-default;+ }++ .ts-wrapper.single .ts-control,+ .ts-wrapper.single .ts-control input {+ @apply cursor-default;+ }++ .ts-wrapper.single .ts-control:after {+ @apply content-none;+ }++ .ts-wrapper.single.input-active .ts-control,+ .ts-wrapper.single.input-active .ts-control input {+ @apply cursor-text focus:outline-none focus:ring-0;+ }++ /* Form control integration */+ .form-input.ts-wrapper {+ @apply p-0 h-auto border-none bg-none rounded-none;+ }++ /* Small size */+ .input-group-sm > .ts-wrapper .ts-control,+ .ts-wrapper.form-input-sm .ts-control {+ @apply text-xs px-3 rounded-sm;+ min-height: calc(1.5em + 0.5rem + 2px);+ }++ .input-group-sm > .ts-wrapper.has-items .ts-control,+ .ts-wrapper.form-input-sm.has-items .ts-control {+ @apply text-xs pb-0;+ min-height: calc(1.5em + 0.5rem + 2px) !important;+ }++ /* Large size */+ .input-group-lg > .ts-wrapper > .ts-control,+ .ts-wrapper.form-input-lg .ts-control {+ @apply text-xl rounded-lg;+ min-height: calc(1.5em + 1rem + 2px);+ }++ /* Input group integration */+ .input-group > .ts-wrapper {+ @apply grow;+ }++ .input-group > .ts-wrapper:not(:nth-child(2)) > .ts-control {+ @apply rounded-tl-none rounded-bl-none;+ }++ .input-group > .ts-wrapper:not(:last-child) > .ts-control {+ @apply rounded-tr-none rounded-br-none;+ }++ /* Hidden accessible */+ .ts-hidden-accessible {+ @apply border-0! overflow-hidden! p-0! absolute! w-px! whitespace-nowrap!;+ clip: rect(0 0 0 0) !important;+ clip-path: inset(50%) !important;+ }++ /* Remove button plugin */+ .ts-wrapper.plugin-remove_button .item .remove {+ @apply py-[3px] px-[6px];+ }++ .ts-wrapper .ts-control > .item .remove {+ @apply inline-block align-middle text-base font-bold ml-[3px] py-0 px-[3px] text-inherit no-underline rounded-sm opacity-50;+ }++ .ts-wrapper .ts-control > .item .remove:hover {+ @apply opacity-100;+ background: rgba(0, 0, 0, 0.05);+ }++ /* Clear button plugin */+ .ts-wrapper .clear-button {+ @apply absolute right-[calc(0.75rem+20px)] top-1/2 -translate-y-1/2 opacity-0 cursor-pointer transition-opacity duration-200;+ }++ .ts-wrapper.focus .clear-button,+ .ts-wrapper:hover .clear-button {+ @apply opacity-50;+ }++ .ts-wrapper .clear-button:hover {+ @apply opacity-100;+ }++ /* Dropdown input plugin */+ .ts-dropdown.plugin-dropdown_input .dropdown-input-wrap {+ @apply py-[5px] px-3 border-b border-gray-200;+ }++ .ts-dropdown.plugin-dropdown_input .dropdown-input {+ @apply w-full text-sm bg-white py-1.5 px-3 border border-gray-200 rounded-md;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/plugins/_trix.css b/admin/app/assets/tailwind/spree/admin/plugins/_trix.cssnew file mode 100644index 0000000000..2ecbaecf63--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/plugins/_trix.css@@ -0,0 +1,100 @@+/* ==========================================================================+ TRIX CUSTOM STYLES+ ========================================================================== */++@layer components {+ .trix-container {+ @apply border border-gray-200 rounded-lg shadow-xs overflow-hidden;+ @apply focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500;+ @apply transition-all duration-100 ease-in-out;+ }++ trix-toolbar {+ @apply p-1 w-full border-b border-gray-200 bg-gray-25!;+ }++ trix-toolbar .trix-button.trix-active {+ @apply bg-gray-100!;+ }++ trix-toolbar .trix-button-group {+ @apply gap-1 ml-0!;+ }++ trix-toolbar .trix-button {+ @apply rounded-md! w-9! h-[30px]! p-1.5!;+ }++ trix-toolbar .trix-dialogs > .trix-dialog > .trix-dialog__link-fields > .trix-button-group > .trix-button--dialog {+ @apply w-full! h-full! py-2 px-3!;+ }++ trix-toolbar .trix-dialog--x-video-embed {+ @apply max-w-[600px];+ }++ trix-editor {+ @apply m-2 rounded-lg border-0!;+ }++ .trix-container,+ trix-editor {+ @apply bg-white;+ }++ .trix-container:has(trix-editor[contenteditable='false']) {+ @apply bg-gray-50;+ }++ .trix-container:has(trix-editor[contenteditable='false']):active {+ @apply bg-gray-50!;+ }++ .trix-container:has(trix-editor[contenteditable='false']) trix-editor {+ @apply bg-gray-50;+ }++ trix-toolbar .trix-button--icon::before {+ @apply m-1;+ }++ trix-toolbar .trix-button,+ trix-toolbar .trix-button-group {+ @apply border-0! mb-0!;+ }++ trix-toolbar .trix-button {+ @apply w-8! h-7! p-1;+ }++ trix-toolbar .trix-button:hover {+ @apply bg-gray-200! text-gray-900!;+ }++ trix-toolbar .trix-button-row {+ @apply flex flex-wrap! w-full;+ }++ trix-toolbar .trix-dialog {+ @apply bg-white! border-t-0! rounded-lg! top-1!;+ }++ trix-toolbar .trix-dialog .trix-input {+ @apply block w-full text-sm leading-normal text-gray-900 bg-white py-1.5 px-3 border border-gray-200 rounded-lg transition-all duration-150 ease-in-out;+ background-clip: padding-box;+ }++ trix-toolbar .trix-dialog .trix-button {+ @apply inline-block text-center align-middle select-none text-sm leading-normal bg-gray-50 font-normal py-2 px-4 mr-1 mb-0 rounded-lg border border-gray-200!;+ }++ trix-toolbar .trix-dialog__link-fields {+ @apply items-center;+ }++ /* Video embed icon */+ .trix-button--icon-embed::before {+ @apply top-[8%]!;+ background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-youtube" viewBox="0 0 16 16"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.01 2.01 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.01 2.01 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31 31 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.01 2.01 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A100 100 0 0 1 7.858 2zM6.4 5.209v4.818l4.157-2.408z"/></svg>');+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/plugins/_uppy.css b/admin/app/assets/tailwind/spree/admin/plugins/_uppy.cssnew file mode 100644index 0000000000..d245758cd8--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/plugins/_uppy.css@@ -0,0 +1,117 @@+.uppy-Root {+ @apply text-base! text-gray-950! leading-normal!;+ font-family: var(--font-sans) !important;+}++.uppy-Dashboard-inner {+ @apply bg-gray-25 border-gray-200;+}++.uppy-Dashboard-innerWrap,+.uppy-Dashboard-inner,+.uppy-Dashboard-AddFiles {+ @apply rounded-lg!;+}++.uppy-Dashboard-Item-previewInnerWrap {+ @apply bg-transparent! rounded-lg! shadow-none!;+}++/* Modal mode - overlay and positioning */+.uppy-Dashboard--modal {+ @apply z-[1055];+}++.uppy-Dashboard--modal .uppy-Dashboard-overlay {+ @apply opacity-100! z-[1050];+ background-color: rgba(255, 255, 255, 0.8) !important;+}++.uppy-Dashboard--modal .uppy-Dashboard-inner {+ @apply border-gray-200! z-[1055];+ box-shadow: 0px 0px 0px 1px rgba(179, 179, 179, 0.5), 0px 6px 12px -3px rgba(179, 179, 179, 0.35), 0px 6px 18px 0px rgba(179, 179, 179, 0.35) !important;+}++/* Hide modal when not open */+.uppy-Dashboard--modal[aria-hidden="true"] {+ @apply hidden!;+}++.uppy-Dashboard--modal[aria-hidden="true"] .uppy-Dashboard-overlay {+ @apply hidden!;+}++.uppy-Dashboard--modal[aria-hidden="true"] .uppy-Dashboard-inner {+ @apply hidden!;+}++/* Uppy buttons - btn btn-light btn-sm styles */+.uppy-Dashboard-browse,+.uppy-DashboardContent-back,+.uppy-StatusBar-actionBtn {+ /* btn base */+ @apply inline-flex items-center justify-center text-center align-middle gap-2;+ @apply cursor-pointer select-none no-underline;+ @apply font-medium leading-normal border transition-colors duration-100 ease-linear;+ /* btn-sm */+ @apply px-2 py-1 text-base rounded-lg;+ /* btn-light */+ @apply text-gray-700 bg-gray-25! border-gray-200! shadow-xs!;+}++.uppy-Dashboard-browse:hover,+.uppy-DashboardContent-back:hover,+.uppy-StatusBar-actionBtn:hover {+ @apply bg-gray-50 border-gray-200 text-gray-900;+}++.uppy-Dashboard-browse {+ @apply ml-2;+}++/* Save button - btn btn-primary btn-sm styles */+.uppy-DashboardContent-save {+ /* btn base */+ @apply inline-flex items-center justify-center text-center align-middle gap-2;+ @apply cursor-pointer select-none no-underline;+ @apply font-medium leading-normal border transition-colors duration-100 ease-linear;+ /* btn-sm */+ @apply px-2 py-1 text-sm rounded-lg;+ /* btn-primary */+ @apply text-white! bg-zinc-950 border-primary shadow-xs;+}++.uppy-DashboardContent-save:hover {+ @apply bg-blue-900 border-blue-900;+}++/* Close button */+.uppy-Dashboard-close {+ @apply w-4 h-4 p-1 bg-white! rounded-md opacity-50 bg-no-repeat bg-center;+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23000'%3e%3cpath d='M.293.293a1 1 0 011.414 0L8 6.586 14.293.293a1 1 0 111.414 1.414L9.414 8l6.293 6.293a1 1 0 01-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 01-1.414-1.414L6.586 8 .293 1.707a1 1 0 010-1.414z'/%3e%3c/svg%3e");+ background-size: 1rem;+}++.uppy-Dashboard-close:hover {+ @apply opacity-100;+}++.uppy-Dashboard-close span {+ @apply hidden;+}++.uppy-StatusBar.is-complete .uppy-StatusBar-progress {+ @apply bg-blue-500!;+}++.uppy-Dashboard-AddFiles-title {+ @apply text-base! font-normal!;+}++.uppy-size--md .uppy-DashboardContent-bar {+ @apply h-14!;+}++.uppy-size--md .uppy-DashboardContent-title {+ @apply leading-[56px]!;+}\ No newline at end of filediff --git a/admin/app/assets/tailwind/spree/admin/utilities/_bootstrap.css b/admin/app/assets/tailwind/spree/admin/utilities/_bootstrap.cssnew file mode 100644index 0000000000..d3f80e5d4e--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/utilities/_bootstrap.css@@ -0,0 +1,158 @@+/* ==========================================================================+ BOOTSTRAP COMPATIBILITY UTILITIES+ Aliases for Bootstrap utility classes mapped to Tailwind equivalents.+ These ensure backwards compatibility for existing templates.+ ========================================================================== */++@layer utilities {+ /* ==========================================================================+ DISPLAY+ ========================================================================== */+ .d-none { @apply hidden; }+ .d-inline { @apply inline; }+ .d-inline-block { @apply inline-block; }+ .d-block { @apply block; }+ .d-flex { @apply flex; }+ .d-inline-flex { @apply inline-flex; }+ .d-grid { @apply grid; }++ /* Responsive display */+ @media (width >= 768px) {+ .d-md-none { @apply hidden; }+ .d-md-inline { @apply inline; }+ .d-md-inline-block { @apply inline-block; }+ .d-md-block { @apply block; }+ .d-md-flex { @apply flex; }+ .d-md-inline-flex { @apply inline-flex; }+ .d-md-grid { @apply grid; }+ }++ @media (width >= 992px) {+ .d-lg-none { @apply hidden; }+ .d-lg-inline { @apply inline; }+ .d-lg-inline-block { @apply inline-block; }+ .d-lg-block { @apply block; }+ .d-lg-flex { @apply flex; }+ .d-lg-inline-flex { @apply inline-flex; }+ .d-lg-grid { @apply grid; }+ }++ @media (width >= 1200px) {+ .d-xl-none { @apply hidden; }+ .d-xl-inline { @apply inline; }+ .d-xl-inline-block { @apply inline-block; }+ .d-xl-block { @apply block; }+ .d-xl-flex { @apply flex; }+ .d-xl-inline-flex { @apply inline-flex; }+ .d-xl-grid { @apply grid; }+ }++ /* ==========================================================================+ FLEXBOX+ ========================================================================== */+ .flex-row { @apply flex-row; }+ .flex-column { @apply flex-col; }+ .flex-row-reverse { @apply flex-row-reverse; }+ .flex-column-reverse { @apply flex-col-reverse; }+ .flex-wrap { @apply flex-wrap; }+ .flex-nowrap { @apply flex-nowrap; }+ .flex-wrap-reverse { @apply flex-wrap-reverse; }+ .flex-fill { @apply flex-1; }+ .flex-grow-0 { @apply grow-0; }+ .flex-grow-1 { @apply grow; }+ .flex-shrink-0 { @apply shrink-0; }+ .flex-shrink-1 { @apply shrink; }++ /* Justify content */+ .justify-content-start { @apply justify-start; }+ .justify-content-end { @apply justify-end; }+ .justify-content-center { @apply justify-center; }+ .justify-content-between { @apply justify-between; }+ .justify-content-around { @apply justify-around; }+ .justify-content-evenly { @apply justify-evenly; }++ /* Align items */+ .align-items-start { @apply items-start; }+ .align-items-end { @apply items-end; }+ .align-items-center { @apply items-center; }+ .align-items-baseline { @apply items-baseline; }+ .align-items-stretch { @apply items-stretch; }++ /* Align self */+ .align-self-auto { @apply self-auto; }+ .align-self-start { @apply self-start; }+ .align-self-end { @apply self-end; }+ .align-self-center { @apply self-center; }+ .align-self-baseline { @apply self-baseline; }+ .align-self-stretch { @apply self-stretch; }++ /* Align content */+ .align-content-start { @apply content-start; }+ .align-content-end { @apply content-end; }+ .align-content-center { @apply content-center; }+ .align-content-between { @apply content-between; }+ .align-content-around { @apply content-around; }+ .align-content-stretch { @apply content-stretch; }++ /* Responsive flexbox */+ @media (width >= 768px) {+ .flex-md-row { @apply flex-row; }+ .flex-md-column { @apply flex-col; }+ .flex-md-wrap { @apply flex-wrap; }+ .flex-md-nowrap { @apply flex-nowrap; }+ .justify-content-md-start { @apply justify-start; }+ .justify-content-md-end { @apply justify-end; }+ .justify-content-md-center { @apply justify-center; }+ .justify-content-md-between { @apply justify-between; }+ .align-items-md-start { @apply items-start; }+ .align-items-md-end { @apply items-end; }+ .align-items-md-center { @apply items-center; }+ }++ @media (width >= 992px) {+ .flex-lg-row { @apply flex-row; }+ .flex-lg-column { @apply flex-col; }+ .flex-lg-wrap { @apply flex-wrap; }+ .flex-lg-nowrap { @apply flex-nowrap; }+ .justify-content-lg-start { @apply justify-start; }+ .justify-content-lg-end { @apply justify-end; }+ .justify-content-lg-center { @apply justify-center; }+ .justify-content-lg-between { @apply justify-between; }+ .align-items-lg-start { @apply items-start; }+ .align-items-lg-end { @apply items-end; }+ .align-items-lg-center { @apply items-center; }+ }++ /* ==========================================================================+ WIDTH & HEIGHT+ ========================================================================== */+ .w-25 { @apply w-1/4; }+ .w-50 { @apply w-1/2; }+ .w-75 { @apply w-3/4; }+ .w-100 { @apply w-full; }+ .w-auto { @apply w-auto; }++ /* Custom percentage widths (not in Tailwind's default scale) */+ .w-5 { width: 5%; }+ .w-10 { width: 10%; }+ .w-15 { width: 15%; }+ .w-20 { width: 20%; }+ .w-30 { width: 30%; }+ .w-35 { width: 35%; }+ .w-40 { width: 40%; }+ .w-60 { width: 60%; }+ .w-70 { width: 70%; }+ .w-80 { width: 80%; }+ .w-90 { width: 90%; }++ /* ==========================================================================+ MISC+ ========================================================================== */+ .list-unstyled { @apply list-none p-0; }+ .list-inline { @apply list-none p-0 flex flex-wrap; }+ .list-inline-item { @apply inline-block; }++ .move-handle {+ @apply cursor-grab;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/views/_dashboard.css b/admin/app/assets/tailwind/spree/admin/views/_dashboard.cssnew file mode 100644index 0000000000..c3f9f29580--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/views/_dashboard.css@@ -0,0 +1,30 @@+/* ==========================================================================+ DASHBOARD+ ========================================================================== */++@layer components {+ .analytics-card-tab {+ @apply rounded-md cursor-pointer p-2 h-full transition-colors duration-200 ease-in-out;+ }++ .analytics-card-tab.active,+ .analytics-card-tab:hover {+ @apply bg-gray-25;+ }++ .store-preview-link {+ @apply transition-colors duration-200 ease-in-out;+ }++ .store-preview-link .store-preview-actions {+ @apply hidden;+ }++ .store-preview-link:hover .store-preview-actions {+ @apply flex;+ }++ #updater-notice {+ @apply bg-white w-full flex flex-row gap-4 justify-start items-center p-2 border border-gray-200 rounded-lg shadow-xs;+ }+}diff --git a/admin/app/assets/tailwind/spree/admin/views/_page-builder.css b/admin/app/assets/tailwind/spree/admin/views/_page-builder.cssnew file mode 100644index 0000000000..3e0e82a3ec--- /dev/null+++ b/admin/app/assets/tailwind/spree/admin/views/_page-builder.css@@ -0,0 +1,214 @@+/* ==========================================================================+ PAGE BUILDER+ ========================================================================== */++@layer components {+ #page-builder {+ --pb-sidebar-width: 345px;+ --pb-header-height: 50px;++ @apply bg-gray-100 h-screen overflow-hidden;+ }++ #page-builder #content {+ @apply ml-0 pt-0;+ }++ #page-builder #main-part {+ @apply pb-0 px-8;+ }++ #page-builder #main-part .embed-responsive {+ @apply min-h-screen;+ }++ #page-builder .nav-pills {+ @apply bg-gray-100 rounded-xl p-1;+ }++ #page-builder .nav-pills .nav-link {+ @apply bg-transparent py-1 px-2 rounded-lg;+ }++ #page-builder .nav-pills .nav-link.active {+ @apply bg-white;+ }++ #page-builder-sidebar,+ #page-builder-header {+ @apply bg-white;+ }++ #page-builder-header {+ @apply border-b border-gray-200;+ z-index: 1031;+ height: var(--pb-header-height);+ }++ #page-builder-header nav {+ @apply w-full flex items-center gap-2 py-1 px-2;+ height: var(--pb-header-height);+ }++ #page-builder-sidebar {+ @apply fixed left-0 bg-white border-r border-gray-200 overflow-x-hidden;+ width: var(--pb-sidebar-width);+ top: var(--pb-header-height);+ height: calc(100vh - var(--pb-header-height));+ }++ #page-builder-sidebar .sidebar-header {+ @apply h-12 bg-white border-b border-gray-200 flex items-center mb-2 gap-2 sticky top-0;+ padding: 0.5rem 0.7rem;+ z-index: 1031;+ }++ #page-builder-sidebar .sidebar-footer {+ @apply fixed bottom-0 left-0 p-2 bg-white flex items-center justify-between;+ width: calc(var(--pb-sidebar-width) - 1px);+ box-shadow: 0 0 0 1px var(--color-gray-200);+ z-index: 1031;+ }++ #page-builder-sidebar .list-group-item {+ @apply p-2;+ }++ #page-builder-preview {+ @apply rounded-md border border-gray-200;+ margin-top: calc(var(--pb-header-height) + 1rem);+ }++ .sidebar-section-title:hover,+ .sidebar-section-title:focus,+ .sidebar-block-title:hover,+ .sidebar-block-title:focus {+ @apply !text-gray-900 !bg-gray-100;+ }++ .sidebar-section-title:hover a,+ .sidebar-section-title:focus a,+ .sidebar-block-title:hover a,+ .sidebar-block-title:focus a {+ @apply !no-underline;+ }++ .sidebar-section-title:hover .btn-light,+ .sidebar-section-title:focus .btn-light,+ .sidebar-block-title:hover .btn-light,+ .sidebar-block-title:focus .btn-light {+ @apply visible;+ }++ .sidebar-section-title .btn-light,+ .sidebar-block-title .btn-light {+ @apply invisible !bg-transparent;+ }++ .sidebar-section-title .btn-light:hover,+ .sidebar-section-title .btn-light:focus,+ .sidebar-section-title .btn-light:active,+ .sidebar-block-title .btn-light:hover,+ .sidebar-block-title .btn-light:focus,+ .sidebar-block-title .btn-light:active {+ @apply !bg-gray-100;+ }++ .sidebar-page-block {+ margin-left: 25px;+ }++ .edit-block .trix-button--icon-heading-1,+ .edit-block .trix-button--icon-quote,+ .edit-block .trix-button--icon-decrease-nesting-level,+ .edit-block .trix-button--icon-increase-nesting-level,+ .edit-block .trix-button--icon-strike,+ .edit-block .trix-button-group--history-tools {+ @apply !hidden;+ }++ .mobileLiveView #page-builder-preview {+ @apply w-full h-screen -translate-x-1/2 overflow-auto;+ inset: 0 50%;+ max-width: 375px;+ min-width: 375px;+ }++ .editor-add-section {+ @apply fixed right-5 bottom-5 opacity-0 pointer-events-none flex justify-center items-center;+ z-index: 999999;+ padding: 0.6rem 1.3rem;+ }++ @media (max-width: 768px) {+ #page-builder-preview {+ @apply !border-0;+ }++ .page-builder .sidebar {+ @apply opacity-0 pointer-events-none;+ }++ .page-builder .sidebar .right-sidebar,+ .page-builder .sidebar .bottom-bar {+ @apply !w-screen;+ }++ .mobile_sidebar_open.page-builder .sidebar,+ .editor-add-section {+ @apply opacity-100 pointer-events-auto;+ }++ .mobile_sidebar_open .editor-add-section {+ @apply opacity-0 pointer-events-none;+ }+ }++ @media (min-width: 768px) {+ #main-part {+ margin-left: 339px;+ }++ .mobileLiveView #page-builder-preview {+ width: 392px;+ max-width: 429px;+ height: calc(100vh - 100px);+ max-height: 800px;+ }+ }++ .page-builder .radio-buttons-header input ~ p {+ @apply text-sm;+ border-radius: 0.22rem;+ padding: 0.22rem 0.5rem;+ }++ .page-builder .radio-buttons-header {+ @apply justify-around;+ }++ .page-builder .radio-buttons-header input:checked ~ p {+ @apply !text-gray-900 !bg-gray-25 !border !border-primary;+ }++ .checkered-background {+ background-image: linear-gradient(+ 45deg,+ rgba(0, 0, 0, 0.1) 25%,+ transparent 25%,+ transparent 75%,+ rgba(0, 0, 0, 0.1) 75%,+ rgba(0, 0, 0, 0.1)+ ),+ linear-gradient(+ 45deg,+ rgba(0, 0, 0, 0.1) 25%,+ transparent 25%,+ transparent 75%,+ rgba(0, 0, 0, 0.1) 75%,+ rgba(0, 0, 0, 0.1)+ );+ background-size: 20px 20px;+ background-position: 0 0, 10px 10px;+ }+}diff --git a/admin/app/helpers/spree/admin/avatars_helper.rb b/admin/app/helpers/spree/admin/avatars_helper.rbnew file mode 100644index 0000000000..cf3700aa1f--- /dev/null+++ b/admin/app/helpers/spree/admin/avatars_helper.rb@@ -0,0 +1,56 @@+module Spree+ module Admin+ module AvatarsHelper+ include Spree::ImagesHelper++ AVATAR_GRADIENTS = [+ 'bg-gradient-to-br from-indigo-500 to-purple-600',+ 'bg-gradient-to-br from-pink-400 to-rose-500',+ 'bg-gradient-to-br from-blue-400 to-cyan-400',+ 'bg-gradient-to-br from-emerald-400 to-teal-400',+ 'bg-gradient-to-br from-rose-400 to-yellow-300',+ 'bg-gradient-to-br from-teal-200 to-pink-200',+ 'bg-gradient-to-br from-rose-300 to-pink-200',+ 'bg-gradient-to-br from-orange-200 to-orange-400',+ 'bg-gradient-to-br from-violet-500 to-fuchsia-500',+ 'bg-gradient-to-br from-amber-400 to-orange-500',+ ].freeze++ def avatar_gradient_class(identifier)+ index = Digest::MD5.hexdigest(identifier.to_s)[0..7].to_i(16) % AVATAR_GRADIENTS.length+ AVATAR_GRADIENTS[index]+ end++ # render an avatar for a user+ # if user doesn't have an avatar, the user's initials will be displayed on a rounded-lg background+ # @param user [Spree::User] the user to render the avatar for+ # @param options [Hash] the options for the avatar+ # @option options [Integer] :width the width of the avatar, default: 128+ # @option options [Integer] :height the height of the avatar, default: 128+ # @option options [String] :class the CSS class(es) of the avatar, default: 'avatar'+ # @return [String] the avatar+ def render_avatar(user, options = {})+ return unless user.present?++ options[:width] ||= 128+ options[:height] ||= 128+ options[:class] ||= 'avatar rounded-lg flex items-center justify-center text-white text-lg'++ if user.respond_to?(:avatar) && user.avatar.attached? && user.avatar.variable?+ spree_image_tag(+ user.avatar,+ width: options[:width],+ height: options[:height],+ class: options[:class],+ style: "width: #{options[:width]}px; height: #{options[:height]}px;"+ )+ else+ gradient = avatar_gradient_class(user.email)+ content_tag :div, user.name&.initials,+ class: "#{gradient} #{options[:class]}",+ style: "width: #{options[:width]}px; height: #{options[:height]}px;"+ end+ end+ end+ end+enddiff --git a/admin/app/helpers/spree/admin/base_helper.rb b/admin/app/helpers/spree/admin/base_helper.rbindex 8817fa46f9..fc27a5bf52 100644--- a/admin/app/helpers/spree/admin/base_helper.rb+++ b/admin/app/helpers/spree/admin/base_helper.rb@@ -1,8 +1,6 @@module Spreemodule Adminmodule BaseHelper- include Spree::ImagesHelper-def render_admin_partials(section, options = {})Spree.admin.partials.send(section.to_s.gsub('_partials', '').to_sym).map do |partial|render partial, options@@ -51,34 +49,6 @@ module Spree@available_countries_iso ||= current_store.countries_available_for_checkout.pluck(:iso)end- # render an avatar for a user- # if user doesn't have an avatar, the user's initials will be displayed on a rounded background- # @param user [Spree::User] the user to render the avatar for- # @param options [Hash] the options for the avatar- # @option options [Integer] :width the width of the avatar, default: 128- # @option options [Integer] :height the height of the avatar, default: 128- # @option options [String] :class the CSS class(es) of the avatar, default: 'avatar'- # @return [String] the avatar- def render_avatar(user, options = {})- return unless user.present?-- options[:width] ||= 128- options[:height] ||= 128- options[:class] ||= 'avatar'-- if user.respond_to?(:avatar) && user.avatar.attached? && user.avatar.variable?- spree_image_tag(- user.avatar,- width: options[:width],- height: options[:height],- class: options[:class],- style: "width: #{options[:width]}px; height: #{options[:height]}px;"- )- else- content_tag(:div, user.name&.initials, class: options[:class], style: "width: #{options[:width]}px; height: #{options[:height]}px;")- end- end-# returns the available display on options, eg backend, frontend, both# @return [Array<Array<String, String>>] the available display on optionsdef display_on_options(model = nil)@@ -96,7 +66,15 @@ module Spree# @return [String] the error messagedef error_message_on(object, method, _options = {})object = convert_to_model(object)- obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")++ obj = if object.respond_to?(:errors)+ object+ else+ # Handle nested attributes like "variant[prices_attributes][0]"+ # by extracting the base object name+ object_name = object.to_s.split('[').first+ instance_variable_get("@#{object_name}") if object_name.present?+ endif obj && obj.errors[method].present?errors = safe_join(obj.errors[method], '<br />'.html_safe)@@ -172,12 +150,12 @@ module Spreewhen :integer{size: 10,- class: 'input_integer form-control'+ class: 'input_integer form-input'}when :decimal{size: 10,- class: 'input_decimal form-control',+ class: 'input_decimal form-input',step: options[:step] || 0.01}when :boolean@@ -187,23 +165,23 @@ module Spreewhen :string{size: 10,- class: 'input_string form-control'+ class: 'input_string form-input'}when :password{size: 10,- class: 'password_string form-control'+ class: 'password_string form-input'}when :text{rows: 15,cols: 85,- class: 'form-control'+ class: 'form-input'}else{size: 10,- class: 'input_string form-control'+ class: 'input_string form-input'}end@@ -234,7 +212,7 @@ module Spreeclass: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))elseif object.preference_type(key).to_sym == :boolean- content_tag(:div, class: 'form-group custom-control custom-checkbox') do+ content_tag(:div, class: 'form-group custom-control form-checkbox') dopreference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +form.label("preferred_#{key}",@@ -264,7 +242,7 @@ module Spree# @option options [String] :title the title of the button# @return [String] the buttondef clipboard_button(options = {})- options[:class] ||= 'btn btn-clipboard'+ options[:class] ||= 'btn btn-light btn-sm btn-clipboard'options[:type] ||= 'button'options[:data] ||= {}options[:data][:action] = 'clipboard#copy'@@ -273,7 +251,7 @@ module Spreeoptions[:aria_label] ||= Spree.t('admin.copy_to_clipboard') # screen-reader labelcontent_tag(:button, options) do- icon('copy', class: 'mr-0 font-size-sm') + tooltip(Spree.t('admin.copy_to_clipboard'))+ icon('copy', class: 'mr-0 text-sm') + tooltip(Spree.t('admin.copy_to_clipboard'))endend@@ -287,7 +265,7 @@ module Spreedef clipboard_component(text, options = {})options[:data] ||= {}options[:data][:controller] = 'clipboard'- options[:data][:clipboard_success_content_value] ||= raw(icon('check', class: 'mr-0 font-size-sm'))+ options[:data][:clipboard_success_content_value] ||= raw(icon('check', class: 'mr-0 text-sm'))content_tag(:span, data: options[:data]) dohidden_field_tag(:clipboard_source, text, data: { clipboard_target: 'source' }) +@@ -307,7 +285,9 @@ module Spreepercentage = (value.to_f / max * 100).roundcontent_tag(:div, class: 'progress') do- content_tag(:div, { class: 'progress-bar', role: 'progressbar', style: "width: #{percentage}%", aria: { valuenow: value, valuemin: min, valuemax: max } }) do+ content_tag(:div,+ { class: 'progress-bar', role: 'progressbar', style: "width: #{percentage}%",+ aria: { valuenow: value, valuemin: min, valuemax: max } }) doendendend@@ -337,6 +317,7 @@ module Spree# @return [String] the local time agodef spree_time_ago(time, options = {})return '' if time.blank?+options[:data] ||= {}options[:data][:controller] = 'tooltip'diff --git a/admin/app/helpers/spree/admin/bulk_operations_helper.rb b/admin/app/helpers/spree/admin/bulk_operations_helper.rbindex a823eaf8f9..ad203a95a6 100644--- a/admin/app/helpers/spree/admin/bulk_operations_helper.rb+++ b/admin/app/helpers/spree/admin/bulk_operations_helper.rb@@ -4,7 +4,7 @@ module Spree# render a checkbox to select all items for bulk operations# @return [String]def bulk_operations_select_all_checkbox- content_tag :div, class: "custom-control custom-checkbox ml-1" do+ content_tag :div, class: "custom-control form-checkbox ml-1" docheck_box_tag(nil,nil,@@ -21,7 +21,7 @@ module Spree# @param object [Spree::Product, Spree::User, Spree::Order]# @return [String]def bulk_operations_checkbox(object)- content_tag :div, class: "custom-control custom-checkbox ml-1" do+ content_tag :div, class: "custom-control form-checkbox ml-1" docheck_box_tag("ids[]",object.id,diff --git a/admin/app/helpers/spree/admin/navigation_helper.rb b/admin/app/helpers/spree/admin/navigation_helper.rbindex b406d7b27c..15128d57b8 100644--- a/admin/app/helpers/spree/admin/navigation_helper.rb+++ b/admin/app/helpers/spree/admin/navigation_helper.rb@@ -136,7 +136,7 @@ module Spreebutton_tag(type: 'button', class: 'btn btn-light', data: { action: 'click->export-dialog#open' }) doicon('table-export', class: 'mr-0 mr-lg-2') +- content_tag(:span, Spree.t(:export), class: 'd-none d-lg-inline')+ content_tag(:span, Spree.t(:export), class: 'hidden lg:inline')endend@@ -189,7 +189,7 @@ module Spreeoptions.merge(type: button_type,class: "btn #{css_classes}",- 'data-turbo-submits-with' => content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')+ 'data-turbo-submits-with' => content_tag(:span, '', class: 'inline-block w-4 h-4 border-2 border-current border-r-transparent rounded-full animate-spin', role: 'status')))end@@ -247,8 +247,8 @@ module Spreeurl = session[session_key] if session[session_key].present?end- link_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 shadow-none px-2 d-flex align-items-center shadow-none') ++ link_to url, class: 'flex items-center no-underline' do+ content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover:bg-gray-100 shadow-none px-2 flex items-center shadow-none') +content_tag(:span, label, class: 'font-size-base text-black')endend@@ -261,7 +261,7 @@ module Spreedef external_link_to(label, url, opts = {}, &block)opts[:target] ||= :blankopts[:rel] ||= :nofollow- opts[:class] ||= "d-inline-flex align-items-center text-blue text-decoration-none"+ opts[:class] ||= "inline-flex items-center text-blue-500 no-underline hover:text-blue-600 hover:bg-blue-50 p-1 rounded"if block_given?link_to url, opts, &block@@ -299,7 +299,7 @@ module Spree# @param css [String] the css class of the help bubble# @return [String] the help bubble with the icondef help_bubble(text = '', placement = 'top', css: nil)- css ||= 'text-xs text-muted cursor-default opacity-75'+ css ||= 'text-gray-500 cursor-default opacity-75'content_tag :span, data: { controller: 'tooltip', tooltip_placement_value: placement } doicon('info-square-rounded', class: css) + tooltip(text)enddiff --git a/admin/app/helpers/spree/admin/onboarding_helper.rb b/admin/app/helpers/spree/admin/onboarding_helper.rbindex c7c2963112..ae4d613df6 100644--- a/admin/app/helpers/spree/admin/onboarding_helper.rb+++ b/admin/app/helpers/spree/admin/onboarding_helper.rb@@ -4,13 +4,13 @@ module Spreedef onboarding_check_circle(condition, pending: false)if pendingreturn icon('exclamation-circle', height: height,- class: 'rounded-circle d-inline-flex align-items-center bg-warning text-primary p-1').html_safe+ class: 'rounded-full inline-flex items-center bg-warning text-zinc-950 p-1').html_safeendif condition == true- icon('check', class: 'rounded-circle d-inline-flex align-items-center bg-success text-success p-1', style: 'border: 3px solid #C6F6D5')+ icon('check', class: 'rounded-full inline-flex items-center bg-green-200 text-green-600 border-green-200 p-1')else- icon('check', class: 'rounded-circle d-inline-flex align-items-center border-dashed text-light p-1')+ icon('check', class: 'rounded-full inline-flex items-center border-dashed text-gray-300 p-1')end.html_safeendenddiff --git a/admin/app/helpers/spree/admin/products_helper.rb b/admin/app/helpers/spree/admin/products_helper.rbindex 3e5536b6d2..b5c75c597a 100644--- a/admin/app/helpers/spree/admin/products_helper.rb+++ b/admin/app/helpers/spree/admin/products_helper.rb@@ -11,7 +11,7 @@ module Spreedef display_inventory(product_or_variant)if product_or_variant.total_on_hand == BigDecimal::INFINITY- content_tag :span, class: 'text-muted' do+ content_tag :span, class: 'text-gray-600' doSpree.t('admin.not_tracking_inventory')endelsediff --git a/admin/app/helpers/spree/admin/stores_helper.rb b/admin/app/helpers/spree/admin/stores_helper.rbindex 756f29488a..e6c3ea773a 100644--- a/admin/app/helpers/spree/admin/stores_helper.rb+++ b/admin/app/helpers/spree/admin/stores_helper.rb@@ -10,7 +10,7 @@ module SpreeDEFAULT_ICON_SIZE = 40def store_admin_icon(store, opts = {})- opts[:class] ||= 'rounded-sm bg-white border'+ opts[:class] ||= 'rounded-md bg-white border store-icon'opts[:height] ||= DEFAULT_ICON_SIZEopts[:width] ||= DEFAULT_ICON_SIZE@@ -33,7 +33,7 @@ module Spreeopts[:height] ||= DEFAULT_ICON_SIZEopts[:width] ||= DEFAULT_ICON_SIZEopts[:class] ||= ''- opts[:class] += ' rounded text-dark d-flex align-items-center justify-content-center bg-gray-200'+ opts[:class] += ' store-icon rounded-lg text-gray-900 flex items-center justify-center'content_tag(:span, name[0].upcase, class: opts[:class], style: "height: #{opts[:height]}px; width: #{opts[:width]}px;")endenddiff --git a/admin/app/helpers/spree/admin/turbo_helper.rb b/admin/app/helpers/spree/admin/turbo_helper.rbindex 8556285b42..a54a862c4a 100644--- a/admin/app/helpers/spree/admin/turbo_helper.rb+++ b/admin/app/helpers/spree/admin/turbo_helper.rb@@ -33,9 +33,9 @@ module Spreedef turbo_save_button_tag(label = Spree.t('actions.save'), opts = {}, &block)opts[:class] ||= 'btn btn-primary text-center'- opts[:class] << ' d-flex align-items-center justify-content-center' if opts[:class].exclude?('d-block') && opts[:class].exclude?('d-flex')+ opts[:class] << ' flex items-center justify-center' if opts[:class].exclude?('block') && opts[:class].exclude?('flex')- opts['data-turbo-submits-with'] ||= "#{content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')}"+ opts['data-turbo-submits-with'] ||= "#{content_tag(:span, '', class: 'inline-block w-4 h-4 border-2 border-current border-r-transparent rounded-full animate-spin', role: 'status')}"opts['data-enable-button-target'] = 'button'if opts['data-controller'].present?opts['data-controller'] += ' turbo-submit-button'diff --git a/admin/app/helpers/spree/admin/webhooks_subscribers_helper.rb b/admin/app/helpers/spree/admin/webhooks_subscribers_helper.rbindex b58b122382..7c58c9c273 100644--- a/admin/app/helpers/spree/admin/webhooks_subscribers_helper.rb+++ b/admin/app/helpers/spree/admin/webhooks_subscribers_helper.rb@@ -2,7 +2,7 @@ module Spreemodule Adminmodule WebhooksSubscribersHelperdef event_checkbox_for(resource_name, form)- content_tag :div, class: 'col-xs-12 col-sm-6 col-md-4 col-lg-4 form-group' do+ content_tag :div, class: 'col-span-12 sm:col-span-6 md:col-span-4 form-group' docontent_tag :div, class: 'custom-control custom-switch' do(form.check_box resource_name, event_checkbox_opts(resource_name), true, nil) + ' ' +form.label(resource_name, Spree.t("#{resource_name.to_s.pluralize}"), class: 'custom-control-label')diff --git a/admin/app/helpers/tom_select_helper.rb b/admin/app/helpers/tom_select_helper.rbindex 1ec13b67b1..310e9ed097 100644--- a/admin/app/helpers/tom_select_helper.rb+++ b/admin/app/helpers/tom_select_helper.rb@@ -4,7 +4,7 @@ module TomSelectHelper## @param [String] name# @param [Hash] options- def tom_select_tag(name, options = { template: false, multiple: false, url: nil, active_option: nil, class: 'w-100', create: false, select_data: {} })+ def tom_select_tag(name, options = { template: false, multiple: false, url: nil, active_option: nil, class: 'w-full', create: false, select_data: {} })stimulus_options = options[:data] || {}stimulus_options[:controller] = 'select' unless options[:template].present?stimulus_options['select-active-option-value'] = options[:active_option].as_json if options[:active_option]@@ -32,7 +32,7 @@ module TomSelectHelperselect_tag name, html_select_options,multiple: options[:multiple],data: { 'select-target': 'input', **(options[:select_data] || {}) },- class: options[:select_class] || 'd-none',+ class: options[:select_class] || 'hidden',required: options[:required],disabled: options[:disabled],include_blank: options[:include_blank],diff --git a/admin/app/javascript/spree/admin/application.js b/admin/app/javascript/spree/admin/application.jsindex e3c174a941..c3d4e6ede3 100644--- a/admin/app/javascript/spree/admin/application.js+++ b/admin/app/javascript/spree/admin/application.js@@ -16,7 +16,6 @@ import "mapkick/bundle"// Helpersimport 'spree/admin/helpers/tinymce'import 'spree/admin/helpers/trix/video_embed'-import 'spree/admin/helpers/bootstrap'// Stimulus controllersimport { Application } from "@hotwired/stimulus"diff --git a/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.js b/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.jsindex 5cf0adfcce..1c261a6a21 100644--- a/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.js+++ b/admin/app/javascript/spree/admin/controllers/bulk_operation_controller.js@@ -34,14 +34,14 @@ export default class extends CheckboxSelectAll {}hidePanel() {- this.panelTarget.classList.add('animate__fadeOutDown')- this.panelTarget.classList.add('d-none')+ this.panelTarget.classList.add('animate-fade-out-down')+ this.panelTarget.classList.add('hidden')}togglePanel() {if (this.checked.length > 0) {- this.panelTarget.classList.remove('animate__fadeOutDown')- this.panelTarget.classList.remove('d-none')+ this.panelTarget.classList.remove('animate-fade-out-down')+ this.panelTarget.classList.remove('hidden', 'd-none')if (this.counterTarget) {this.counterTarget.textContent = this.checked.length}diff --git a/admin/app/javascript/spree/admin/controllers/dropdown_controller.js b/admin/app/javascript/spree/admin/controllers/dropdown_controller.jsindex d2b7c6bdd5..0fe475277a 100644--- a/admin/app/javascript/spree/admin/controllers/dropdown_controller.js+++ b/admin/app/javascript/spree/admin/controllers/dropdown_controller.js@@ -73,7 +73,7 @@ export default class extends Controller {}this.menu.classList.remove("hidden")- this.menu.style.display = "block"+ this.menu.style.height = "auto"this._isOpen = true// Start automatic positioning@@ -92,7 +92,7 @@ export default class extends Controller {if (!this.menu || !this._isOpen) returnthis.menu.classList.add("hidden")- this.menu.style.display = ""+ this.menu.style.height = 0this._isOpen = false// Stop automatic positioningdiff --git a/admin/app/javascript/spree/admin/controllers/font_picker_controller.js b/admin/app/javascript/spree/admin/controllers/font_picker_controller.jsindex f034d465eb..ab98aac7c7 100644--- a/admin/app/javascript/spree/admin/controllers/font_picker_controller.js+++ b/admin/app/javascript/spree/admin/controllers/font_picker_controller.js@@ -8,7 +8,7 @@ export default class extends Controller {connect() {this.prepareLinkTag()- this.element.classList.remove('d-none')+ this.element.classList.remove('hidden', 'd-none')this.tomSelect = new TomSelect(this.element, {create: false,maxOptions: 110,diff --git a/admin/app/javascript/spree/admin/controllers/media_form_controller.js b/admin/app/javascript/spree/admin/controllers/media_form_controller.jsindex 50e7f107f8..b45442eade 100644--- a/admin/app/javascript/spree/admin/controllers/media_form_controller.js+++ b/admin/app/javascript/spree/admin/controllers/media_form_controller.js@@ -23,16 +23,16 @@ export default class extends Controller {if (response.ok) {this.deleteButtonTarget.disabled = false- this.deleteButtonTarget.classList.add('d-none')+ this.deleteButtonTarget.classList.add('hidden')}}}showDeleteButton = () => {if (this.checkboxTargets.some((el) => el.checked)) {- this.deleteButtonTarget.classList.remove('d-none')+ this.deleteButtonTarget.classList.remove('hidden', 'd-none')} else {- this.deleteButtonTarget.classList.add('d-none')+ this.deleteButtonTarget.classList.add('hidden')}}}diff --git a/admin/app/javascript/spree/admin/controllers/order_billing_address_controller.js b/admin/app/javascript/spree/admin/controllers/order_billing_address_controller.jsindex 43d9bdea48..ad42f5a842 100644--- a/admin/app/javascript/spree/admin/controllers/order_billing_address_controller.js+++ b/admin/app/javascript/spree/admin/controllers/order_billing_address_controller.js@@ -26,14 +26,14 @@ export default class extends Controller {this.observer.disconnect()const form = this.element.querySelector(`[data-form="${formName}"]`)- form.classList.remove('d-none')+ form.classList.remove('hidden', 'd-none')form.querySelectorAll('input:required, select:required').forEach((input) => (input.disabled = false))}hideForms() {this.observer.observe(this.element, { subtree: true, attributes: true, attributeFilter: ['required'] })- this.element.querySelectorAll('[data-form]').forEach((form) => form.classList.add('d-none'))+ this.element.querySelectorAll('[data-form]').forEach((form) => form.classList.add('hidden'))this.element.querySelectorAll('input:required, select:required').forEach((input) => (input.disabled = true))}}diff --git a/admin/app/javascript/spree/admin/controllers/product_form_controller.js b/admin/app/javascript/spree/admin/controllers/product_form_controller.jsindex 8cbc9db31e..14209c4dec 100644--- a/admin/app/javascript/spree/admin/controllers/product_form_controller.js+++ b/admin/app/javascript/spree/admin/controllers/product_form_controller.js@@ -41,19 +41,19 @@ export default class extends Controller {}show(element) {- element.classList.remove('d-none')+ element.classList.remove('hidden', 'd-none')}hide(element) {- element.classList.add('d-none')+ element.classList.add('hidden')}toggleQuantityFormVisibility() {if (this.hasQuantityFormTarget) {if (!this.hasVariantsValue && this.trackInventoryCheckboxTarget.checked) {- this.quantityFormTarget.classList.remove('d-none')+ this.quantityFormTarget.classList.remove('hidden', 'd-none')} else {- this.quantityFormTarget.classList.add('d-none')+ this.quantityFormTarget.classList.add('hidden')}}}@@ -61,9 +61,9 @@ export default class extends Controller {togglePricesFormVisibility() {if (this.hasPricesFormTarget) {if (this.hasVariantsValue) {- this.pricesFormTarget.classList.add('d-none')+ this.pricesFormTarget.classList.add('hidden')} else {- this.pricesFormTarget.classList.remove('d-none')+ this.pricesFormTarget.classList.remove('hidden', 'd-none')}}}diff --git a/admin/app/javascript/spree/admin/controllers/replace_controller.js b/admin/app/javascript/spree/admin/controllers/replace_controller.jsindex 64c60381dc..74d56f636d 100644--- a/admin/app/javascript/spree/admin/controllers/replace_controller.js+++ b/admin/app/javascript/spree/admin/controllers/replace_controller.js@@ -4,12 +4,12 @@ export default class extends Controller {static targets = [ 'from', 'to' ]replace() {- this.fromTarget.classList.add('d-none')- this.toTarget.classList.remove('d-none')+ this.fromTarget.classList.add('hidden')+ this.toTarget.classList.remove('hidden', 'd-none')}revert() {- this.fromTarget.classList.remove('d-none')- this.toTarget.classList.add('d-none')+ this.fromTarget.classList.remove('hidden', 'd-none')+ this.toTarget.classList.add('hidden')}}diff --git a/admin/app/javascript/spree/admin/controllers/select_controller.js b/admin/app/javascript/spree/admin/controllers/select_controller.jsindex 5e5148dd8b..2aaefeed4c 100644--- a/admin/app/javascript/spree/admin/controllers/select_controller.js+++ b/admin/app/javascript/spree/admin/controllers/select_controller.js@@ -105,7 +105,7 @@ export default class extends Controller {if (this.activeOptionValue) settings.items = [this.activeOptionValue]}- this.inputTarget.classList.remove('d-none')+ this.inputTarget.classList.remove('hidden', 'd-none')this.select = new TomSelect(this.inputTarget, settings)}}diff --git a/admin/app/javascript/spree/admin/controllers/seo_form_controller.js b/admin/app/javascript/spree/admin/controllers/seo_form_controller.jsindex 8910eec43f..820832bfae 100644--- a/admin/app/javascript/spree/admin/controllers/seo_form_controller.js+++ b/admin/app/javascript/spree/admin/controllers/seo_form_controller.js@@ -63,14 +63,14 @@ export default class extends Controller {this.slugPreviewTarget.textContent = ''this.descriptionPreviewTarget.textContent = ''- this.previewTarget.classList.add('d-none')- this.placeholderTarget.classList.remove('d-none')+ this.previewTarget.classList.add('hidden')+ this.placeholderTarget.classList.remove('hidden', 'd-none')return}- this.previewTarget.classList.remove('d-none')- this.placeholderTarget.classList.add('d-none')+ this.previewTarget.classList.remove('hidden', 'd-none')+ this.placeholderTarget.classList.add('hidden')this.titlePreviewTarget.textContent = this.metaTitlethis.slugPreviewTarget.textContent = this.slugInputTarget.value@@ -78,7 +78,7 @@ export default class extends Controller {}toggleInputs() {- this.inputsContainerTarget.classList.toggle('d-none')+ this.inputsContainerTarget.classList.toggle('hidden')}get metaTitle() {diff --git a/admin/app/javascript/spree/admin/controllers/sidebar_controller.js b/admin/app/javascript/spree/admin/controllers/sidebar_controller.jsindex a76bb5ea81..52a1c46c7e 100644--- a/admin/app/javascript/spree/admin/controllers/sidebar_controller.js+++ b/admin/app/javascript/spree/admin/controllers/sidebar_controller.js@@ -154,7 +154,7 @@ export default class extends Controller {}// Show dropdown- dropdown.classList.remove('d-none');+ dropdown.classList.remove('hidden', 'd-none');// Style dropdown itemsdropdown.querySelectorAll('.nav-link').forEach((item, index) => {@@ -209,7 +209,7 @@ export default class extends Controller {}// Hide dropdown- this.activeDropdown.classList.add('d-none');+ this.activeDropdown.classList.add('hidden');// Restore dropdown to original position in sidebarif (this.activeDropdown._originalParent) {diff --git a/admin/app/javascript/spree/admin/controllers/sticky_controller.js b/admin/app/javascript/spree/admin/controllers/sticky_controller.jsindex 688236bddd..91bdeef7a2 100644--- a/admin/app/javascript/spree/admin/controllers/sticky_controller.js+++ b/admin/app/javascript/spree/admin/controllers/sticky_controller.js@@ -16,9 +16,13 @@ export default class extends Controller {handleScroll() {if (window.scrollY > this.thresholdValue) {- this.element.classList.add('sticky-top')+ this.element.classList.add('sticky')+ this.element.classList.add('top-0')+ this.element.classList.add('z-[1020]')} else {- this.element.classList.remove('sticky-top')+ this.element.classList.remove('sticky')+ this.element.classList.remove('top-0')+ this.element.classList.remove('z-[1020]')}}}\ No newline at end of filediff --git a/admin/app/javascript/spree/admin/controllers/variants_form_controller.js b/admin/app/javascript/spree/admin/controllers/variants_form_controller.jsindex 83beb4328c..f424fdd14d 100644--- a/admin/app/javascript/spree/admin/controllers/variants_form_controller.js+++ b/admin/app/javascript/spree/admin/controllers/variants_form_controller.js@@ -73,11 +73,11 @@ export default class extends CheckboxSelectAll {}toggleQuantityTracked() {- this.element.querySelectorAll('.column-quantity').forEach((el) => el.classList.toggle('d-none'))+ this.element.querySelectorAll('.column-quantity').forEach((el) => this.toggleHidden(el))this.variantTemplateTarget.content.querySelectorAll('.column-quantity')- .forEach((el) => el.classList.toggle('d-none'))+ .forEach((el) => this.toggleHidden(el))}toggle(e) {@@ -111,9 +111,9 @@ export default class extends CheckboxSelectAll {toggleDeleteButton() {if (this.checked.length > 0) {- this.deleteButtonTarget.classList.remove('d-none')+ this.deleteButtonTarget.classList.remove('hidden', 'd-none')} else {- this.deleteButtonTarget.classList.add('d-none')+ this.deleteButtonTarget.classList.add('hidden')}}@@ -212,11 +212,11 @@ export default class extends CheckboxSelectAll {.querySelectorAll(`input[data-slot='[stock_items_attributes][${stockLocationId}][count_on_hand]_input']`).forEach((el) => {if (stockLocationId === newStockLocationId) {- el.classList.remove('d-none')+ el.classList.remove('hidden', 'd-none')el.classList.add('d-block')} else {el.classList.remove('d-block')- el.classList.add('d-none')+ el.classList.add('hidden')}})})@@ -232,11 +232,11 @@ export default class extends CheckboxSelectAll {).forEach((el) => {if (currency === newCurrency) {- el.classList.remove('d-none')- el.classList.add('d-flex')+ el.classList.remove('hidden', 'd-none')+ el.classList.add('flex')} else {- el.classList.remove('d-flex')- el.classList.add('d-none')+ el.classList.remove('flex')+ el.classList.add('hidden')}})})@@ -464,7 +464,7 @@ export default class extends CheckboxSelectAll {const currentVariants = new Set()if (keys.length) {- this.variantsTableTarget.classList.remove('d-none')+ this.variantsTableTarget.classList.remove('hidden', 'd-none')const nestingLevel = Math.min(keys.length, 2)@@ -572,7 +572,7 @@ export default class extends CheckboxSelectAll {})}} else {- this.variantsTableTarget.classList.add('d-none')+ this.variantsTableTarget.classList.add('hidden')}this.variantsContainerTarget.querySelectorAll('[data-variants-form-target="variant"]').forEach((variant) => {@@ -681,11 +681,11 @@ export default class extends CheckboxSelectAll {stockInput.value = stockItem.count_on_handif (String(stockLocationId) === String(this.currentStockLocationIdValue)) {- stockInput.classList.remove('d-none')+ stockInput.classList.remove('hidden', 'd-none')stockInput.classList.add('d-block')} else {stockInput.classList.remove('d-block')- stockInput.classList.add('d-none')+ stockInput.classList.add('hidden')}if (stockItem.id) {stockIdInput.value = stockItem.id@@ -704,11 +704,11 @@ export default class extends CheckboxSelectAll {const idInput = variantTarget.querySelector(`input[data-slot="[prices_attributes][${currency}][id]_input"]`)priceInput.name = `product[variants_attributes][${idx}][prices_attributes][${currency}]`if (currency === this.currentCurrencyValue) {- priceInput.parentElement.classList.remove('d-none')- priceInput.parentElement.classList.add('d-flex')+ priceInput.parentElement.classList.remove('hidden', 'd-none')+ priceInput.parentElement.classList.add('flex')} else {- priceInput.parentElement.classList.remove('d-flex')- priceInput.parentElement.classList.add('d-none')+ priceInput.parentElement.classList.remove('flex')+ priceInput.parentElement.classList.add('hidden')}const existingPrice = this.priceForVariant(internalName, currency)@@ -810,9 +810,9 @@ export default class extends CheckboxSelectAll {this.newOptionNameInputTarget.tomselect.clear()this.newOptionValuesSelectContainerTarget.reset()- this.newOptionFormTarget.classList.add('d-none')+ this.newOptionFormTarget.classList.add('hidden')- this.newOptionButtonTarget.classList.remove('d-none')+ this.newOptionButtonTarget.classList.remove('hidden', 'd-none')}editOption(event) {@@ -891,8 +891,8 @@ export default class extends CheckboxSelectAll {showNewOptionForm(event) {event.preventDefault()- this.newOptionFormTarget.classList.remove('d-none')- this.newOptionButtonTarget.classList.add('d-none')+ this.newOptionFormTarget.classList.remove('hidden', 'd-none')+ this.newOptionButtonTarget.classList.add('hidden')this.refreshOptionNameSelect()}@@ -1119,9 +1119,17 @@ export default class extends CheckboxSelectAll {if (!this.inventoryFormTarget) returnif (value) {- this.inventoryFormTarget.classList.remove('d-none')+ this.inventoryFormTarget.classList.remove('hidden', 'd-none')} else {- this.inventoryFormTarget.classList.add('d-none')+ this.inventoryFormTarget.classList.add('hidden')+ }+ }++ toggleHidden(el) {+ if (el.classList.contains('hidden') || el.classList.contains('d-none')) {+ el.classList.remove('hidden', 'd-none')+ } else {+ el.classList.add('hidden')}}}diff --git a/admin/app/javascript/spree/admin/helpers/bootstrap.js b/admin/app/javascript/spree/admin/helpers/bootstrap.jsdeleted file mode 100644index 234dac60ea..0000000000--- a/admin/app/javascript/spree/admin/helpers/bootstrap.js+++ /dev/null@@ -1,51 +0,0 @@-import 'jquery'-import 'bootstrap'-import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'---const initTooltips = () => {- $('.with-tip, .trix-button, .uppy-Dashboard-close').each(function() {- $(this).tooltip()- })-- $('.with-tip, .trix-button, .uppy-Dashboard-close').on('show.bs.tooltip', function(event) {- if (('ontouchstart' in window)) {- event.preventDefault()- }- })-}--const removeTooltips = () => {- $('.with-tip, .trix-button, .uppy-Dashboard-close').each(function() {- $(this).tooltip('dispose')- })-}--const resetDialogModal = () => {- console.warn('resetDialogModal is deprecated and will be removed in Spree 6')-- const modalElement = document.getElementById('dialog_modal')- const modalTitle = modalElement ? modalElement.querySelector('.modal-title') : null- const modalBody = modalElement ? modalElement.querySelector('.modal-body') : null- if (modalBody) {- modalBody.innerHTML = '<div class="spinner-border text-light mx-auto my-5" role="status"><span class="sr-only">Loading...</span></div>'- }- if (modalTitle) {- modalTitle.innerHTML = 'Loading...'- }-}--const fixModalAutofocus = () => {- $('.modal').on('shown.bs.modal', function (e) {- $('[autofocus]', e.target).focus();- });-}--$('.modal').on('show.bs.modal', lockScroll)-$('.modal').on('hide.bs.modal', unlockScroll)-$('.modal').on('hidden.bs.modal ', resetDialogModal)--document.addEventListener("turbo:click", removeTooltips)-document.addEventListener("turbo:load", initTooltips)-document.addEventListener('turbo:frame-render', initTooltips)-document.addEventListener('turbo:frame-render', fixModalAutofocus)\ No newline at end of filediff --git a/admin/app/javascript/spree/admin/helpers/trix/video_embed.js b/admin/app/javascript/spree/admin/helpers/trix/video_embed.jsindex 7e44291b85..06d77164e6 100644--- a/admin/app/javascript/spree/admin/helpers/trix/video_embed.js+++ b/admin/app/javascript/spree/admin/helpers/trix/video_embed.js@@ -55,7 +55,7 @@ Trix.config.toolbar.getDefaultHTML = function() {</div></div>- <div class="trix-dialog--error-container mt-2 d-none">+ <div class="trix-dialog--error-container mt-2 hidden"><small class="trix-dialog--error-message text-danger"></small></div></div>@@ -123,8 +123,8 @@ function initializeTrixEditor(editor) {const errorContainer = dialog.querySelector(".trix-dialog--error-container")const errorMessage = errorContainer.querySelector(".trix-dialog--error-message")- if (!errorContainer.classList.contains('d-none')) {- errorContainer.classList.add('d-none')+ if (!errorContainer.classList.contains('hidden')) {+ errorContainer.classList.add('hidden')}errorMessage.innerHTML = ''@@ -145,8 +145,8 @@ function initializeTrixEditor(editor) {} else {const { error } = await response.json- if (errorContainer.classList.contains('d-none')) {- errorContainer.classList.remove('d-none')+ if (errorContainer.classList.contains('hidden')) {+ errorContainer.classList.remove('hidden', 'd-none')}errorMessage.innerHTML = errordiff --git a/admin/app/models/spree/admin/form_builder.rb b/admin/app/models/spree/admin/form_builder.rbindex 21e7ae0d46..8557332ea2 100644--- a/admin/app/models/spree/admin/form_builder.rb+++ b/admin/app/models/spree/admin/form_builder.rb@@ -19,7 +19,7 @@ module Spree## @param method [Symbol] the field name# @param options [Hash] field options including:- # - :class [String] CSS classes (defaults to 'form-control')+ # - :class [String] CSS classes (defaults to 'form-input')# - :label [String, Boolean] label text or false to hide label# - :required [Boolean] whether field is required# - :help [String] help text to display below the field@@ -28,12 +28,20 @@ module Spree# - :append [String] text to append after the input field# @return [String] HTML string containing the complete form groupdef spree_text_field(method, options = {})- options[:class] ||= 'form-control'+ options[:class] ||= 'form-input'prepend = options.delete(:prepend)append = options.delete(:append)+ if prepend.present? || append.present?+ options[:class] = 'border-0 focus:ring-0 focus:outline-none text-base grow'++ if prepend.present?+ options[:class] += ' pl-0'+ end+ end+@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +wrap_with_input_group(@template.text_field(@object_name, method, objectify_options(options)), prepend, append) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -45,12 +53,16 @@ module Spree# @param options [Hash] field options (see {#spree_text_field} for available options)# @return [String] HTML string containing the complete form groupdef spree_number_field(method, options = {})- options[:class] ||= 'form-control'+ options[:class] ||= 'form-input'prepend = options.delete(:prepend)append = options.delete(:append)+ if prepend.present? || append.present?+ options[:class] ||= 'border-0 focus:ring-0 focus:outline-none'+ end+@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +wrap_with_input_group(@template.number_field(@object_name, method, objectify_options(options)), prepend, append) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -62,9 +74,9 @@ module Spree# @param options [Hash] field options (see {#spree_text_field} for available options)# @return [String] HTML string containing the complete form groupdef spree_email_field(method, options = {})- options[:class] ||= 'form-control'+ options[:class] ||= 'form-input'@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +@template.email_field(@object_name, method, objectify_options(options)) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -76,9 +88,9 @@ module Spree# @param options [Hash] field options (see {#spree_text_field} for available options)# @return [String] HTML string containing the complete form groupdef spree_date_field(method, options = {})- options[:class] ||= 'form-control'+ options[:class] ||= 'form-input'@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +@template.date_field(@object_name, method, objectify_options(options)) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -90,9 +102,9 @@ module Spree# @param options [Hash] field options (see {#spree_text_field} for available options)# @return [String] HTML string containing the complete form groupdef spree_datetime_field(method, options = {})- options[:class] ||= 'form-control'+ options[:class] ||= 'form-input'@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +@template.datetime_field(@object_name, method, objectify_options(options)) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -102,18 +114,18 @@ module Spree## @param method [Symbol] the field name# @param options [Hash] field options including:- # - :class [String] CSS classes (defaults to 'form-control')+ # - :class [String] CSS classes (defaults to 'form-input')# - :rows [Integer] number of rows (defaults to 5)# - :data [Hash] data attributes (defaults to textarea-autogrow controller)# - other options from {#spree_text_field}# @return [String] HTML string containing the complete form groupdef spree_text_area(method, options = {})@template.content_tag(:div, class: 'form-group') do- options[:class] ||= 'form-control'+ options[:class] ||= 'form-input'options[:rows] ||= 5options[:data] ||= { controller: 'textarea-autogrow' }- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +@template.text_area(@object_name, method, objectify_options(options)) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -126,7 +138,7 @@ module Spree# @return [String] HTML string containing the complete form group with Trix editordef spree_rich_text_area(method, options = {})@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +@template.content_tag(:div, class: 'trix-container') do@template.rich_text_area(@object_name, method, objectify_options(options))end +@@ -149,11 +161,11 @@ module Spreehtml_options[:data] ||= {}html_options[:data][:controller] ||= 'autocomplete-select'else- html_options[:class] ||= 'custom-select'+ html_options[:class] ||= 'form-select'end@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +@template.select(@object_name, method, choices, objectify_options(options), html_options, &block) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -175,11 +187,11 @@ module Spreehtml_options[:data] ||= {}html_options[:data][:controller] ||= 'autocomplete-select'else- html_options[:class] ||= 'custom-select'+ html_options[:class] ||= 'form-select'end@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) ++ spree_label(method, options) +@template.collection_select(@object_name, method, collection, value_method, text_method, objectify_options(options), html_options) +@template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))end@@ -192,10 +204,11 @@ module Spree# @return [String] HTML string containing the complete form group with custom checkboxdef spree_check_box(method, options = {})@template.content_tag(:div, class: 'form-group') do- @template.content_tag(:div, class: 'custom-control custom-checkbox') do- @template.check_box(@object_name, method, objectify_options(options.merge(class: 'custom-control-input'))) +- @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label')- end + @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge!(class: 'form-text mt-2 ml-4'))+ @template.content_tag(:div, class: 'form-checkbox') do+ checkbox = @template.check_box(@object_name, method, objectify_options(options.merge(class: 'custom-control-input')))+ label = options[:label] == false ? ''.html_safe : @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label')+ checkbox + label+ end + @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge!(class: 'form-text mt-2 ml-6 pl-1'))endend@@ -210,8 +223,9 @@ module Spreedef spree_radio_button(method, tag_value, options = {})@template.content_tag(:div, class: 'form-group') do@template.content_tag(:div, class: 'custom-control custom-radio') do- @template.radio_button(@object_name, method, tag_value, objectify_options(options.merge(class: 'custom-control-input'))) +- @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label', for: options[:id])+ radio = @template.radio_button(@object_name, method, tag_value, objectify_options(options.merge(class: 'custom-control-input form-radio')))+ label = options[:label] == false ? ''.html_safe : @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label', value: tag_value)+ radio + labelend + @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))endend@@ -230,9 +244,9 @@ module Spree# @return [String] HTML string containing the complete form group with direct file upload fielddef spree_file_field(method, options = {})@template.content_tag(:div, class: 'form-group') do- @template.label(@object_name, method, get_label(method, options)) +- @template.render('active_storage/upload_form', form: self, field_name: method, **options) +- @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))+ spree_label(method, options) ++ @template.render('active_storage/upload_form', form: self, field_name: method, **options) ++ @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))endend@@ -249,17 +263,29 @@ module Spree@template.content_tag(:span, options[:help], class: options[:class])end- # Generate the label for a field with required indicator and help bubble+ # Generate the label element for a field with required indicator and help bubble## @param method [Symbol] the field name# @param options [Hash] field options# @option options [String, Boolean] :label label text or false to hide label# @option options [Boolean] :required whether field is required# @option options [String] :help_bubble help bubble text- # @return [String] HTML string containing the complete label- def get_label(method, options)- return '' if options[:label] == false+ # @return [String] HTML string containing the complete label element or empty string+ def spree_label(method, options)+ return ''.html_safe if options[:label] == false+ @template.label(@object_name, method, get_label(method, options))+ end++ # Generate the label content for a field with required indicator and help bubble+ #+ # @param method [Symbol] the field name+ # @param options [Hash] field options+ # @option options [String, Boolean] :label label text+ # @option options [Boolean] :required whether field is required+ # @option options [String] :help_bubble help bubble text+ # @return [String] HTML string containing the label content+ def get_label(method, options)translated_label = if options[:label]options[:label]elsif I18n.exists?("spree.#{method}")@@ -286,17 +312,13 @@ module Spree@template.content_tag(:div, class: 'input-group') doprepend_html = if prepend.present?- @template.content_tag(:div, class: 'input-group-prepend') do- @template.content_tag(:span, prepend, class: 'input-group-text')- end+ @template.content_tag(:div, prepend, class: 'pl-3 text-gray-400')else''.html_safeendappend_html = if append.present?- @template.content_tag(:div, class: 'input-group-append') do- @template.content_tag(:span, append, class: 'input-group-text')- end+ @template.content_tag(:div, append, class: 'px-3')else''.html_safeenddiff --git a/admin/app/views/active_storage/_upload_form.html.erb b/admin/app/views/active_storage/_upload_form.html.erbindex 1c3eedbcd8..59b51e1d7f 100644--- a/admin/app/views/active_storage/_upload_form.html.erb+++ b/admin/app/views/active_storage/_upload_form.html.erb@@ -13,7 +13,7 @@data-active-storage-upload-auto-submit-value="<%= auto_submit %>"data-active-storage-upload-field-name-value="<%= form.object_name %>[<%= field_name %>]"data-active-storage-upload-allowed-file-types-value="<%= Rails.application.config.active_storage.web_image_content_types %>"- class="d-flex flex-column justify-content-center w-100 position-relative">+ class="flex flex-col justify-center w-full relative"><div class="upload-area"data-action="click->active-storage-upload#open">@@ -27,22 +27,24 @@loading: :lazy) %><% else %>- <img data-active-storage-upload-target="thumb" class="img-fluid rounded-lg" style="display: none" />+ <img data-active-storage-upload-target="thumb" class="img-fluid rounded-xl" style="display: none" /><% end %>- <div class="d-flex flex-column justify-content-center align-items-center h-100 p-5 rounded-lg <%= css %>" data-active-storage-upload-target="placeholder" <% if form.object.send(field_name).attached? && form.object.send(field_name).variable? %>style="display: none !important"<% end %>>- <%= icon('upload', class: 'mr-0 mb-3', style: 'font-size: 2rem;') %>- <%= Spree.t('admin.upload_new_asset') %>+ <div class="flex flex-col justify-center items-center h-full p-12 rounded-xl <%= css %>" data-active-storage-upload-target="placeholder" <% if form.object.send(field_name).attached? && form.object.send(field_name).variable? %>style="display: none !important"<% end %>>+ <%= icon('upload', class: 'mr-0 mb-5 text-4xl') %>+ <span class="text-lg font-medium">+ <%= Spree.t('admin.upload_new_asset') %>+ </span><% if crop %>- <span class="text-muted ml-2 text-center small mt-2">+ <span class="ml-2 text-center text-sm mt-2"><%= Spree.t('admin.recommended_size') %>: <%= width %>x<%= height %>px</span><% end %></div></div>- <div class="d-flex align-items-center my-2" data-active-storage-upload-target="toolbar" <% unless form.object.send(field_name).attached? && form.object.send(field_name).variable? %>style="display: none !important"<% end %>>+ <div class="flex items-center my-2" data-active-storage-upload-target="toolbar" <% unless form.object.send(field_name).attached? && form.object.send(field_name).variable? %>style="display: none !important"<% end %>><button type="button" class="btn btn-light" data-action="active-storage-upload#open"><%= icon('upload') %><%= Spree.t('actions.select_file') %>diff --git a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erbdeleted file mode 100644index 41194fffea..0000000000--- a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb+++ /dev/null@@ -1,11 +0,0 @@-<%# Link to the "First" page- - available local variables- url: url to the first page- current_page: a page object for the currently displayed page- total_pages: total number of pages- per_page: number of items to fetch per page- remote: data-remote -%>--<li class="first page-item <%= current_page.first? ? 'disabled' : '' %>">- <%= link_to icon('double-chevron-left', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>-</li>diff --git a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erbdeleted file mode 100644index a7f00c7d12..0000000000--- a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb+++ /dev/null@@ -1,12 +0,0 @@-<%# Non-link tag that stands for skipped pages...- - available local variables- current_page: a page object for the currently displayed page- total_pages: total number of pages- per_page: number of items to fetch per page- remote: data-remote -%>--<li class="page gap disabled page-item d-none d-lg-flex">- <a href="#" onclick="return false;" class="page-link">- <%= raw(t 'views.pagination.truncate') %>- </a>-</li>diff --git a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erbdeleted file mode 100644index e37ea2cee7..0000000000--- a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb+++ /dev/null@@ -1,11 +0,0 @@-<%# Link to the "Last" page- - available local variables- url: url to the last page- current_page: a page object for the currently displayed page- total_pages: total number of pages- per_page: number of items to fetch per page- remote: data-remote -%>--<li class="last next page-item <%= current_page.last? ? 'disabled' : '' %>">- <%= link_to icon('double-chevron-right', class: 'text-dark'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>-</li>diff --git a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erbindex dc72ee6cc0..c2cea0bc69 100644--- a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb+++ b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb@@ -6,7 +6,14 @@per_page: number of items to fetch per pageremote: data-remote -%>-<li class="next page-item <%= current_page.last? ? 'disabled' : '' %>">- <%= link_to icon('chevron-right', class: 'text-dark'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>+<li class="next page-item">+ <% if current_page.last? %>+ <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>+ <%= icon('chevron-right', class: 'text-gray-900 mr-0') %>+ </button>+ <% else %>+ <%= link_to icon('chevron-right', class: 'text-gray-900 mr-0'), url, rel: 'next', remote: remote, class: "btn btn-light p-2", 'aria-label': 'Next page' %>+ <% end %>+</li>diff --git a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erbdeleted file mode 100644index a5d6ef1821..0000000000--- a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb+++ /dev/null@@ -1,18 +0,0 @@-<%# Link showing page number- - available local variables- page: a page object for "this" page- url: url to this page- current_page: a page object for the currently displayed page- total_pages: total number of pages- per_page: number of items to fetch per page- remote: data-remote -%>--<li class="page<%= ' active' if page.current? %> page-item">- <%= link_to page,- url,- opts = {- remote: remote,- rel: page.next? ? 'next' : page.prev? ? 'prev' : nil,- class: 'page-link'- } %>-</li>diff --git a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erbindex 8e6566fffd..ec31a67244 100644--- a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb+++ b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb@@ -9,8 +9,7 @@<% pagination_class ||= '' %><%= paginator.render do %>- <ul class="pagination d-inline-flex <%= pagination_class %> mb-0">-+ <ul class="pagination inline-flex <%= pagination_class %> mb-0 gap-1.5"><%= prev_page_tag %><%= next_page_tag %></ul>diff --git a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erbindex 9dd69d776e..529dcafe3a 100644--- a/admin/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb+++ b/admin/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb@@ -6,7 +6,13 @@per_page: number of items to fetch per pageremote: data-remote -%>-<li class="prev page-item <%= current_page.first? ? 'disabled' : '' %>">- <%= link_to icon('chevron-left', class: 'text-dark'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>+<li class="prev page-item">+ <% if current_page.first? %>+ <button class="btn btn-light p-2 cursor-not-allowed opacity-50" disabled>+ <%= icon('chevron-left', class: 'text-gray-900 mr-0') %>+ </button>+ <% else %>+ <%= link_to icon('chevron-left', class: 'text-gray-900 mr-0'), url, rel: 'prev', remote: remote, class: "btn btn-light p-2", 'aria-label': 'Previous page' %>+ <% end %></li>diff --git a/admin/app/views/layouts/spree/admin.html.erb b/admin/app/views/layouts/spree/admin.html.erbindex 3e1308abb1..b8d928ba80 100644--- a/admin/app/views/layouts/spree/admin.html.erb+++ b/admin/app/views/layouts/spree/admin.html.erb@@ -5,7 +5,7 @@<%= render "spree/admin/shared/custom_head" %></head>- <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>"+ <body class="admin min-h-screen <%= controller_name %> <%= action_name %>"data-controller="admin sidebar"data-action="keydown.ctrl+s->admin#save keydown.meta+s->admin#save">@@ -17,14 +17,13 @@<%= render "spree/admin/shared/content_header" %><%= render "spree/admin/shared/page_tabs" %><%= render "spree/admin/shared/page_alerts" %>- <div class="container">+ <div class="container mx-auto px-4 max-w-screen-xl"><%= yield %></div><%= render "spree/admin/shared/footer" %><%= render 'spree/admin/shared/drawer' %><%= render "spree/admin/shared/dialog" %></main>- <%= render "spree/admin/shared/modal" %><%= render "spree/admin/shared/alerts" %><%= render_admin_partials(:body_end_partials) %>diff --git a/admin/app/views/layouts/spree/admin_settings.html.erb b/admin/app/views/layouts/spree/admin_settings.html.erbindex 988a22bbe0..1b25907d45 100644--- a/admin/app/views/layouts/spree/admin_settings.html.erb+++ b/admin/app/views/layouts/spree/admin_settings.html.erb@@ -4,31 +4,29 @@<%= render "spree/admin/shared/head" %></head>- <body class="admin admin-settings min-vh-100 <%= controller_name %> <%= action_name %>"+ <body class="admin admin-settings min-h-screen <%= controller_name %> <%= action_name %>"data-controller="admin drawer dialog"data-action="keydown.ctrl+s->admin#save keydown.meta+s->admin#save"><%= render_admin_partials(:body_start_partials) %><header id="settings-header">- <%= render 'spree/admin/shared/back_to_dashboard' %>- <div class="flex-grow-1">+ <div class="grow"><%= render 'spree/admin/shared/content_header' %></div></header><%= render "spree/admin/shared/sidebar" %>- <main id="content" class="pt-4">+ <main id="content" class="pt-6"><%= render "spree/admin/shared/page_tabs" %><%= render "spree/admin/shared/page_alerts" %>- <div class="container">+ <div class="container mx-auto px-4 max-w-screen-xl"><%= yield %></div><%= render "spree/admin/shared/footer" %><%= render 'spree/admin/shared/drawer' %></main><%= render "spree/admin/shared/dialog" %>- <%= render "spree/admin/shared/modal" %><%= render "spree/admin/shared/alerts" %><%= render_admin_partials(:body_end_partials) %>diff --git a/admin/app/views/layouts/spree/admin_wizard.html.erb b/admin/app/views/layouts/spree/admin_wizard.html.erbindex 45ecfe9121..12133c68f4 100644--- a/admin/app/views/layouts/spree/admin_wizard.html.erb+++ b/admin/app/views/layouts/spree/admin_wizard.html.erb@@ -4,29 +4,28 @@<%= render "spree/admin/shared/head" %></head>- <body class="admin admin-wizard min-vh-100 <%= controller_name %> <%= action_name %>"+ <body class="admin min-h-screen <%= controller_name %> <%= action_name %>"data-controller="admin drawer dialog"data-action="keydown.ctrl+s->admin#save keydown.meta+s->admin#save"><%= render_admin_partials(:body_start_partials) %>- <header id="header" class="d-flex align-items-center p-0">- <%= render 'spree/admin/shared/back_to_dashboard' %>+ <header class="flex items-center border-b border-gray-200">+ <%= link_to_with_icon 'arrow-back', Spree.t('admin.back_to_dashboard'), spree.admin_path, class: 'hover:bg-gray-100 flex justify-start gap-2 px-8 no-underline h-16 items-center' %><% if content_for?(:steps) %>- <ol class="d-flex align-items-center list-unstyled flex-grow-1 justify-content-between align-items-center m-0" style="height: 60px;" id="steps">+ <ol class="flex items-center list-none p-0 grow justify-between h-16 border-l border-gray-200" id="steps"><%= yield :steps %></ol><% end %></header>- <main class="pb-5">+ <main class="pb-12"><%= yield %></main><%= render 'spree/admin/shared/drawer' %><%= render "spree/admin/shared/dialog" %>- <%= render "spree/admin/shared/modal" %><%= render "spree/admin/shared/alerts" %><%= render_admin_partials(:body_end_partials) %>diff --git a/admin/app/views/layouts/spree/minimal.html.erb b/admin/app/views/layouts/spree/minimal.html.erbindex 2e0731a16e..3a6af11635 100644--- a/admin/app/views/layouts/spree/minimal.html.erb+++ b/admin/app/views/layouts/spree/minimal.html.erb@@ -3,21 +3,20 @@<head><%= render "spree/admin/shared/head" %></head>- <body class="admin min-vh-100 <%= controller_name %> <%= action_name %>" data-controller="dialog">- <div class="container-fluid">- <div class="row bg-white">- <div- class="col-lg-5 d-none d-lg-flex bg-light min-vh-100"- style="background-image: url('<%= asset_path('login_sidebar_background.png') %>');background-repeat: no-repeat;background-size: cover;background-position: center')"- >- </div>- <div class="col-lg-6 col-xl-4 offset-xl-1 py-3 d-flex flex-column justify-content-center vh-100">+ <body class="admin min-h-screen <%= controller_name %> <%= action_name %>" data-controller="dialog">+ <div class="grid grid-cols-1 lg:grid-cols-2 min-h-screen">+ <div+ class="hidden lg:block bg-gray-25 bg-cover bg-center bg-no-repeat"+ style="background-image: url('<%= asset_path('login_sidebar_background.png') %>');"+ >+ </div>+ <div class="flex flex-col justify-center items-center p-6 lg:p-12">+ <div class="w-full max-w-md"><%= yield %></div></div></div><%= render "spree/admin/shared/dialog" %>- <%= render "spree/admin/shared/modal" %><%= render "spree/admin/shared/alerts" %></body></html>diff --git a/admin/app/views/layouts/spree/page_builder.html.erb b/admin/app/views/layouts/spree/page_builder.html.erbindex ebd42da500..5517217cc5 100644--- a/admin/app/views/layouts/spree/page_builder.html.erb+++ b/admin/app/views/layouts/spree/page_builder.html.erb@@ -40,7 +40,6 @@</main><%= render 'spree/admin/shared/dialog' %>- <%= render 'spree/admin/shared/modal' %><%= render 'spree/admin/shared/alerts' %></body></html>diff --git a/admin/app/views/spree/admin/admin_users/_admin_user.html.erb b/admin/app/views/spree/admin/admin_users/_admin_user.html.erbindex de621abef8..2a82144824 100644--- a/admin/app/views/spree/admin/admin_users/_admin_user.html.erb+++ b/admin/app/views/spree/admin/admin_users/_admin_user.html.erb@@ -1,10 +1,10 @@<tr id="<%= spree_dom_id admin_user %>" class="cursor-pointer" data-controller="row-link">- <td class="w-50" data-action="click->row-link#openLink">- <%= link_to spree.admin_admin_user_path(admin_user), data: { row_link_target: :link, turbo_frame: '_top' }, class: 'd-flex align-items-center' do %>- <%= render_avatar(admin_user, width: 48, height: 48, class: 'mr-3 avatar') %>- <div class="d-flex flex-column">+ <td class="w-1/2" data-action="click->row-link#openLink">+ <%= link_to spree.admin_admin_user_path(admin_user), data: { row_link_target: :link, turbo_frame: '_top' }, class: 'flex items-center gap-3' do %>+ <%= render_avatar(admin_user, width: 48, height: 48) %>+ <div class="flex flex-col"><%= admin_user.name %>- <span class="text-muted"><%= admin_user.email %></span>+ <span class="text-gray-600"><%= admin_user.email %></span></div><% end %></td>@@ -16,4 +16,4 @@<td class="w-20"><%= spree_time(admin_user.created_at) %></td>-</tr>\ No newline at end of file+</tr>diff --git a/admin/app/views/spree/admin/admin_users/_audit_log.html.erb b/admin/app/views/spree/admin/admin_users/_audit_log.html.erbindex 8ff5efefda..afe1aa43b1 100644--- a/admin/app/views/spree/admin/admin_users/_audit_log.html.erb+++ b/admin/app/views/spree/admin/admin_users/_audit_log.html.erb@@ -1,4 +1,4 @@-<div class="text-muted text-center py-5">+<div class="text-gray-600 py-12 gap-4 flex flex-col items-center justify-center"><p>Audit log is part of the Spree Enterprise offering.</p><%= external_link_to 'Upgrade to Spree Enterprise', 'https://spreecommerce.org/pricing', class: 'btn btn-primary' %>diff --git a/admin/app/views/spree/admin/admin_users/edit.html.erb b/admin/app/views/spree/admin/admin_users/edit.html.erbindex f4a7cfe7ee..3979fb9843 100644--- a/admin/app/views/spree/admin/admin_users/edit.html.erb+++ b/admin/app/views/spree/admin/admin_users/edit.html.erb@@ -8,7 +8,7 @@<% end %><%= turbo_frame_tag :edit_user do %>- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5>diff --git a/admin/app/views/spree/admin/admin_users/index.html.erb b/admin/app/views/spree/admin/admin_users/index.html.erbindex d7bc45cd21..9c6ac5136f 100644--- a/admin/app/views/spree/admin/admin_users/index.html.erb+++ b/admin/app/views/spree/admin/admin_users/index.html.erb@@ -11,9 +11,9 @@<table class="table"><thead><tr>- <th scope="col" class="rounded-lg-top-left"><%= Spree.t(:user) %></th>+ <th scope="col" class="rounded-xl-top-left"><%= Spree.t(:user) %></th><th scope="col"><%= Spree.t(:roles) %></th>- <th scope="col" class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>+ <th scope="col" class="rounded-xl-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th></tr></thead><tbody>diff --git a/admin/app/views/spree/admin/admin_users/new.html.erb b/admin/app/views/spree/admin/admin_users/new.html.erbindex 57c96800a3..c8f6ee498e 100644--- a/admin/app/views/spree/admin/admin_users/new.html.erb+++ b/admin/app/views/spree/admin/admin_users/new.html.erb@@ -1,7 +1,7 @@<%= form_with model: @admin_user, url: spree.admin_admin_users_path(token: @invitation.token), method: :post, scope: :admin_user do |f| %><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @admin_user } %>- <div class="rounded border p-3 mb-3 d-flex align-items-center gap-2">+ <div class="rounded-md border p-6 mb-6 flex items-center gap-2"><%= render_avatar(@invitation.inviter, height: 32, width: 32) %><%= @invitation.inviter.name %> has invited you to join <strong><%= @invitation.resource.name %></strong></div>@@ -9,11 +9,11 @@<%= render 'form', f: f %><div class="form-group"><%= f.label :password %>- <%= f.password_field :password, class: 'form-control', required: true %>+ <%= f.password_field :password, class: 'form-input', required: true %></div><div class="form-group"><%= f.label :password_confirmation %>- <%= f.password_field :password_confirmation, class: 'form-control', required: true %>+ <%= f.password_field :password_confirmation, class: 'form-input', required: true %></div><%= turbo_save_button_tag(Spree.t('create_a_new_account')) %>diff --git a/admin/app/views/spree/admin/admin_users/show.html.erb b/admin/app/views/spree/admin/admin_users/show.html.erbindex 6bb2243440..c9cbd03085 100644--- a/admin/app/views/spree/admin/admin_users/show.html.erb+++ b/admin/app/views/spree/admin/admin_users/show.html.erb@@ -7,9 +7,9 @@<%= @admin_user.name %><% end %>-<div class="row">- <div class="col-lg-8">- <div class="card mb-4">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-8">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= icon 'history', class: 'mr-1' %>@@ -22,10 +22,10 @@</div></div>- <div class="col-lg-4">- <div class="card mb-4" id="user-details">+ <div class="col-span-12 lg:col-span-4">+ <div class="card mb-6" id="user-details"><%= turbo_frame_tag :edit_user do %>- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5>@@ -33,20 +33,20 @@</div><div class="card-body p-0"><ul class="list-group list-group-flush">- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:email) %><span><%= @admin_user.email %><%= clipboard_component(@admin_user.email) %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:name) %><span><%= @admin_user.name %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:roles) %><span><% @role_users.each do |role_user| %>@@ -55,7 +55,7 @@</span></li><% if @admin_user.respond_to?(:sign_in_count) %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= I18n.t('activerecord.attributes.user.sign_in_count') %><span><%= @admin_user.sign_in_count %>@@ -63,7 +63,7 @@</li><% end %><% if @admin_user.respond_to?(:last_sign_in_at) %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= I18n.t('activerecord.attributes.user.last_sign_in') %><span><% if @admin_user.last_sign_in_at %>@@ -75,7 +75,7 @@</li><% end %><% if @admin_user.respond_to?(:current_sign_in_at) %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= I18n.t('activerecord.attributes.user.current_sign_in') %><span><% if @admin_user.current_sign_in_at %>@@ -86,23 +86,23 @@</span></li><% end %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:created_at) %><span><%= spree_time(@admin_user.created_at) %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:updated_at) %><span><%= spree_time(@admin_user.updated_at) %></span></li><% if @admin_user.invited_by %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:invited_by) %><span>- <%= link_to @admin_user.invited_by.email, spree.admin_admin_user_path(@admin_user.invited_by), class: 'text-decoration-none', data: { turbo_frame: '_top' } %>+ <%= link_to @admin_user.invited_by.email, spree.admin_admin_user_path(@admin_user.invited_by), class: 'no-underline', data: { turbo_frame: '_top' } %></span></li><% end %>diff --git a/admin/app/views/spree/admin/classifications/_classification.html.erb b/admin/app/views/spree/admin/classifications/_classification.html.erbindex bf59eb43a6..e003887f2d 100644--- a/admin/app/views/spree/admin/classifications/_classification.html.erb+++ b/admin/app/views/spree/admin/classifications/_classification.html.erb@@ -1,24 +1,24 @@-<div class="row mx-0 hover-light rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon_id, classification, format: :turbo_stream) %>">+<div class="grid grid-cols-12 gap-6 mx-0 hover:bg-gray-25 rounded" id="<%= spree_dom_id(classification) %>" data-sortable-update-url="<%= spree.admin_taxon_classification_path(classification.taxon_id, classification, format: :turbo_stream) %>"><% if classification.taxon.manual_sort_order? %>- <div class="col-1 text-center align-self-center">- <span class="rounded p-2 hover-gray move-handle cursor-grab">+ <div class="col-span-1 text-center self-center">+ <span class="rounded-md p-2 hover:bg-gray-100 move-handle cursor-grab"><%= icon('grip-vertical', class: 'mr-0') %></span></div><% end %>- <div class="<%= classification.taxon.manual_sort_order? ? 'col-5' : 'col-6' %>">- <%= link_to spree.edit_admin_product_path(classification.product), data: { 'turbo-frame': '_top' }, class: "d-flex align-items-center text-dark hover-none #{classification.taxon.manual_sort_order? ? 'py-3' : 'p-3'}" do %>+ <div class="<%= classification.taxon.manual_sort_order? ? 'col-span-5' : 'col-span-6' %>">+ <%= link_to spree.edit_admin_product_path(classification.product), data: { 'turbo-frame': '_top' }, class: "flex items-center text-gray-900 hover-none #{classification.taxon.manual_sort_order? ? 'py-4' : 'p-4'}" do %><%= render 'spree/admin/shared/product_image', object: classification.product %>- <span class="ml-3">+ <span class="ml-4"><%= classification.product.name %></span><% end %></div>- <div class="col-2 text-center align-self-center">+ <div class="col-span-2 text-center self-center"><%= product_status(classification.product) %></div>- <div class="col-2 text-center align-self-center">+ <div class="col-span-2 text-center self-center"><% if classification.product.in_stock? %><span class="badge badge-success"><%= Spree.t(:in_stock) %>@@ -30,7 +30,7 @@<% end %></div>- <div class="col-2 text-center align-self-center">+ <div class="col-span-2 text-center self-center"><%= button_to spree.admin_taxon_classification_path(classification.taxon_id, classification), class: 'btn btn-danger btn-sm', method: :delete, data: { controller: 'tooltip', turbo_confirm: Spree.t(:are_you_sure) } do %><%= icon 'trash', class: 'mr-0', style: 'pointer-events: none' %><%= tooltip(Spree.t('actions.destroy')) %>diff --git a/admin/app/views/spree/admin/classifications/index.html.erb b/admin/app/views/spree/admin/classifications/index.html.erbindex fbd5ffe6b2..6fcb267fa7 100644--- a/admin/app/views/spree/admin/classifications/index.html.erb+++ b/admin/app/views/spree/admin/classifications/index.html.erb@@ -9,7 +9,7 @@cached: can?(:delete, Spree::Classification) ? spree_base_cache_scope : false %></div><% else %>- <p class="text-center text-muted px-5 pt-5 pb-2">+ <p class="text-center text-gray-600 px-12 pt-12 pb-2"><%= Spree.t(:no_products_added) %></p><p class="text-center">diff --git a/admin/app/views/spree/admin/coupon_codes/_filters.html.erb b/admin/app/views/spree/admin/coupon_codes/_filters.html.erbindex 22470b7416..89b345067b 100644--- a/admin/app/views/spree/admin/coupon_codes/_filters.html.erb+++ b/admin/app/views/spree/admin/coupon_codes/_filters.html.erb@@ -1,11 +1,11 @@<%= search_form_for [:admin, @promotion, @search], class: "filter-wrap", data: {controller: "filters"} do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont %>- <div class="d-flex align-items-center justify-content-between">+ <div class="flex items-center justify-between"><%= dropdown do %><%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>- <span class="text-muted font-weight-normal mr-1">+ <span class="text-gray-600 font-normal mr-1"><%= Spree.t(:show) %></span><%= Spree.t(:all) if (params[:q] || {}).values_at(:state_eq).all?(&:blank?) %>diff --git a/admin/app/views/spree/admin/coupon_codes/_table_row.html.erb b/admin/app/views/spree/admin/coupon_codes/_table_row.html.erbindex 6d9d2ca706..a0a665d4f5 100644--- a/admin/app/views/spree/admin/coupon_codes/_table_row.html.erb+++ b/admin/app/views/spree/admin/coupon_codes/_table_row.html.erb@@ -1,8 +1,8 @@<tr id="<%= spree_dom_id coupon_code %>">- <td class="w-50">+ <td class="w-1/2"><code><%= coupon_code.code.upcase %></code><%= clipboard_component(coupon_code.code.upcase) %></td>- <td class="w-25 font-size-sm"><%= active_badge(coupon_code.state == 'used') %></td>- <td class="w-25 font-size-sm"><%= spree_time(coupon_code.created_at) %></td>+ <td class="w-1/4 text-sm"><%= active_badge(coupon_code.state == 'used') %></td>+ <td class="w-1/4 text-sm"><%= spree_time(coupon_code.created_at) %></td></tr>diff --git a/admin/app/views/spree/admin/coupon_codes/index.html.erb b/admin/app/views/spree/admin/coupon_codes/index.html.erbindex 9e0c41b2d1..4626246840 100644--- a/admin/app/views/spree/admin/coupon_codes/index.html.erb+++ b/admin/app/views/spree/admin/coupon_codes/index.html.erb@@ -6,12 +6,12 @@<%= render_admin_partials(:coupon_codes_header_partials) %>-<div class="row">- <div class="col-12 col-lg-8">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-8"><%= render 'spree/admin/shared/index_table', new_object_url: nil %></div>- <div class="col-12 col-lg-4">+ <div class="col-span-12 lg:col-span-4"><%= render 'spree/admin/promotions/sidebar' %></div></div>diff --git a/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erb b/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erbindex 5e7232ab74..4b1bfea789 100644--- a/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erb+++ b/admin/app/views/spree/admin/custom_domains/_custom_domains.html.erb@@ -1,5 +1,5 @@<% if current_store.custom_domains.any? %>- <div class="table-responsive rounded mt-3 border">+ <div class="table-responsive rounded-lg mt-4 border"><table class="table"><thead><tr>diff --git a/admin/app/views/spree/admin/custom_domains/_form.html.erb b/admin/app/views/spree/admin/custom_domains/_form.html.erbindex 7e7d2d3ad2..8f6f3ce2d2 100644--- a/admin/app/views/spree/admin/custom_domains/_form.html.erb+++ b/admin/app/views/spree/admin/custom_domains/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-3">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :url, label: Spree.t(:domain), prepend: 'https://', autofocus: f.object.new_record?, required: true %>diff --git a/admin/app/views/spree/admin/custom_domains/index.html.erb b/admin/app/views/spree/admin/custom_domains/index.html.erbindex 850317205c..541ed38431 100644--- a/admin/app/views/spree/admin/custom_domains/index.html.erb+++ b/admin/app/views/spree/admin/custom_domains/index.html.erb@@ -8,21 +8,21 @@<%= render_admin_partials(:custom_domains_header_partials) %>-<div class="card-lg p-4">- <h5 class="mb-3">Internal URL</h5>- <div class="row mb-4">- <div class="col-lg-4">- <p class="text-muted">+<div class="card-lg p-6">+ <h5 class="mb-2">Internal URL</h5>+ <div class="grid grid-cols-12 gap-6 mb-6">+ <div class="col-span-12 lg:col-span-4">+ <p class="text-gray-600">This is your internal Admin URL.</p></div>- <div class="col-lg-7 offset-lg-1">+ <div class="col-span-12 lg:col-span-7 lg:col-start-6"><%= form_for current_store, url: spree.admin_store_path, data: { turbo: false, controller: 'enable-button', 'enable-button-disable-when-not-changed-value': true } do |f| %><% if Spree.root_domain.present? %>- <div class="d-flex align-items-center gap-3">- <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1 <% if current_store.custom_domains.any? %>disabled<% end %>">- <span class="text-muted">https://</span>- <%= f.text_field :code, class: 'form-control-plaintext pl-0', data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %>+ <div class="flex items-center gap-6">+ <div class="input-group <% if current_store.custom_domains.any? %>disabled<% end %>">+ <span class="text-gray-600">https://</span>+ <%= f.text_field :code, class: 'border-0 focus:ring-0 focus:outline-none grow rounded-lg text-base', data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %><span>.<%= Spree.root_domain %></span><%= clipboard_component(current_store.formatted_url) %>@@ -32,10 +32,10 @@<% end %></div><% else %>- <div class="d-flex align-items-center gap-3">- <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1">- <span class="text-muted">https://</span>- <%= f.text_field :url, class: 'form-control-plaintext pl-0', required: true, data: { enable_button_target: 'input' } %>+ <div class="flex items-center gap-6">+ <div class="input-group pr-2 grow">+ <span class="text-gray-400 pl-3 pr-0">https://</span>+ <%= f.text_field :url, class: 'border-0 focus:ring-0 focus:outline-none grow rounded-lg text-base pl-0', required: true, data: { enable_button_target: 'input' } %><%= clipboard_component(current_store.formatted_url) %></div><%= turbo_save_button_tag %>@@ -44,15 +44,15 @@<% end %></div></div>- <hr class="my-5" />- <h5><%= Spree.t(:custom_domains) %></h5>- <div class="row">- <div class="col-lg-4">- <p class="text-muted">+ <hr class="my-12" />+ <h5 class="mb-2"><%= Spree.t(:custom_domains) %></h5>+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-4">+ <p class="text-gray-600">Connect your domain or subdomain to your storefront.</p></div>- <div class="col-lg-7 offset-lg-1">+ <div class="col-span-12 lg:col-span-7 lg:col-start-6"><div class="text-right"><%= link_to Spree.t(:new_domain), spree.new_admin_custom_domain_path, class: "btn btn-primary" %></div>diff --git a/admin/app/views/spree/admin/customer_returns/_table_row.html.erb b/admin/app/views/spree/admin/customer_returns/_table_row.html.erbindex a571927b04..3e646ec864 100644--- a/admin/app/views/spree/admin/customer_returns/_table_row.html.erb+++ b/admin/app/views/spree/admin/customer_returns/_table_row.html.erb@@ -4,7 +4,7 @@data-controller="row-link"class="cursor-pointer">- <td class="font-weight-bold" data-action="click->row-link#openLink">+ <td class="font-bold" data-action="click->row-link#openLink"><% if can?(:edit, customer_return) %><%= link_to customer_return.number,spree.edit_admin_order_customer_return_path( customer_return.order, customer_return),diff --git a/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb b/admin/app/views/spree/admin/dashboard/_setup_progress.html.erbindex 9c93f3926d..e75d72b2bc 100644--- a/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb+++ b/admin/app/views/spree/admin/dashboard/_setup_progress.html.erb@@ -1,10 +1,10 @@-<div class="card mb-3" id="setup_progress">+<div class="card mb-6" id="setup_progress"><div class="card-body">- <div class="mb-3">+ <div class="mb-4">Your overall setup progress<span class="float-right badge badge-<%= current_store.setup_completed? ? 'success' : 'info' %>"><% if current_store.setup_completed? %>- <%= icon('check', class: 'text-success') %>+ <%= icon('check', class: 'text-green-700') %><% end %><span>diff --git a/admin/app/views/spree/admin/dashboard/_setup_tasks.html.erb b/admin/app/views/spree/admin/dashboard/_setup_tasks.html.erbindex 3838fd0db3..10565f97d0 100644--- a/admin/app/views/spree/admin/dashboard/_setup_tasks.html.erb+++ b/admin/app/views/spree/admin/dashboard/_setup_tasks.html.erb@@ -1,22 +1,28 @@-<div id="setup_tasks">+<div id="setup_tasks" class="flex flex-col gap-4"><% task_in_progress = nil %><% current_store.setup_tasks_list.each_with_index do |task, index| %><% done = current_store.setup_task_done?(task) %><% unless done %><% task_in_progress ||= task %><% end %>+ <% is_expanded = task_in_progress == task %>- <details class="collapsable-card mb-3" <% if task_in_progress == task %>open<% end %> id="setup_task_<%= task %>">- <summary class="card-header border-0 h-auto text-decoration-none d-flex align-items-center p-3 text-dark font-weight-normal w-100 card-title bg-transparent list-style-none" role="button" tabindex="0">+ <div class="card overflow-hidden" data-controller="reveal" data-reveal-hidden-class="is-collapsed" id="setup_task_<%= task %>">+ <div class="card-header card-header--collapsible border-0 h-auto no-underline flex items-center p-3 text-gray-900 font-normal w-full bg-transparent cursor-pointer focus:outline-none focus:ring-0 hover:bg-gray-50"+ role="button"+ tabindex="0"+ data-action="click->reveal#toggle keydown.enter->reveal#toggle keydown.space->reveal#toggle"><%= onboarding_check_circle(done) %>- <span class="ml-3"><%= Spree.t("admin.store_setup_tasks.#{task}") %></span>- <%= icon('chevron-right', class: 'arrow ml-auto') %>- </summary>- <div class="animate__animated animate__fadeIn animate__faster">- <div class="card-body">- <%= render "spree/admin/dashboard/setup_tasks/#{task}", done: done %>+ <span class="ml-6 font-medium"><%= Spree.t("admin.store_setup_tasks.#{task}") %></span>+ <%= icon('chevron-right', class: 'arrow ml-auto transition-transform duration-200') %>+ </div>+ <div data-reveal-target="item" class="collapsible-content <%= 'is-collapsed' unless is_expanded %>">+ <div>+ <div class="card-body flex flex-col gap-3">+ <%= render "spree/admin/dashboard/setup_tasks/#{task}", done: done %>+ </div></div></div>- </details>+ </div><% end %></div>diff --git a/admin/app/views/spree/admin/dashboard/_store_preview.html.erb b/admin/app/views/spree/admin/dashboard/_store_preview.html.erbindex b44e796b40..d81e21b68a 100644--- a/admin/app/views/spree/admin/dashboard/_store_preview.html.erb+++ b/admin/app/views/spree/admin/dashboard/_store_preview.html.erb@@ -1,7 +1,7 @@<% if current_store.default_theme %>- <div class="card mb-4">- <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'd-block border rounded mx-2 mt-2 mb-0 overflow-auto bg-light position-relative store-preview-link', data: { turbo_prefetch: false } do %>- <div class="position-absolute w-100 h-100 align-items-center justify-content-center overlay-background store-preview-actions">+ <div class="card mb-6">+ <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'block border rounded-lg mx-2 mt-2 mb-0 overflow-auto bg-gray-25 relative store-preview-link hover:shadow-xs transition-shadow duration-200', data: { turbo_prefetch: false } do %>+ <div class="absolute w-full h-full items-center justify-center hover:opacity-100 opacity-0 transition-opacity duration-200 store-preview-actions"><button class="btn btn-primary"><%= icon('tools') %><%= Spree.t('admin.edit_theme') %>@@ -12,18 +12,18 @@<% end %><div class="card-body px-2 pt-0 pb-2">- <div class="flex my-2 p-1 w-100 rounded border">- <%= text_field_tag :domain, current_store.url_or_custom_domain, readonly: true, class: 'form-control-plaintext py-0' %>+ <div class="flex my-2 p-1 w-full rounded-lg border items-center focus-within:outline focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500">+ <%= text_field_tag :domain, current_store.url_or_custom_domain, readonly: true, class: 'border-none bg-transparent focus:outline-none focus:ring-0 text-base p-1 w-full' %><%= clipboard_component(current_store.url_or_custom_domain) %></div>- <div class="d-flex gap-2">- <%= link_to current_store.formatted_url_or_custom_domain, class: 'btn btn-light w-50', target: '_blank' do %>+ <div class="flex gap-2">+ <%= link_to current_store.formatted_url_or_custom_domain, class: 'btn btn-light w-1/2', target: '_blank' do %><%= icon 'eye', class: 'mr-1' %> <%= Spree.t(:view_store) %><% end %>- <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'btn btn-light w-50', data: { turbo_prefetch: false } do %>+ <%= link_to spree.edit_admin_theme_path(current_store.default_theme), class: 'btn btn-light w-1/2', data: { turbo_prefetch: false } do %><%= icon 'tools', class: 'mr-1' %> <%= Spree.t('admin.edit_theme') %>@@ -31,8 +31,8 @@</div></div><% unless current_store.default_custom_domain&.active? %>- <div class="card-footer border-top p-2">- <%= link_to_with_icon 'world-www', 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-secondary w-100 py-2' %>+ <div class="card-footer border-t p-2">+ <%= link_to_with_icon 'world-www', 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-secondary w-full py-2' %></div><% end %></div>diff --git a/admin/app/views/spree/admin/dashboard/_top_products.html.erb b/admin/app/views/spree/admin/dashboard/_top_products.html.erbindex 22843fe0c9..14025bfc20 100644--- a/admin/app/views/spree/admin/dashboard/_top_products.html.erb+++ b/admin/app/views/spree/admin/dashboard/_top_products.html.erb@@ -1,7 +1,7 @@<% report_link = spree.new_admin_report_path(type: 'products_performance', date_from: params[:date_from], date_to: params[:date_to], vendor_id: @vendor.try(:id)) %>-<div class="card mt-3 mb-4">- <div class="card-header d-flex justify-content-between align-items-center">+<div class="card mt-4 mb-6">+ <div class="card-header flex justify-between items-center"><h5 class="card-title"><%= Spree.t('admin.dashboard.top_products') %></h5>@@ -13,8 +13,8 @@<div class="table-responsive"><table class="table"><thead>- <tr class="border-bottom">- <th scope="col">+ <tr class="border-b">+ <th scope="col" class="rounded-none"><%= Spree.t(:product) %></th><% if defined?(Spree::Vendor) && !@vendor %>@@ -28,7 +28,7 @@<th class="text-center"><%= Spree.t(:quantity) %></th>- <th class="text-right">+ <th class="text-right rounded-none"><%= Spree.t(:total_sales) %></th></tr>@@ -40,8 +40,8 @@<tr><% cache_unless @vendor, spree_base_cache_scope.call(product) do %><td>- <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center font-weight-bold', data: { 'turbo-frame': '_top' } do %>- <div class="mr-3">+ <%= link_to spree.edit_admin_product_path(product), class: 'flex items-center font-bold', data: { 'turbo-frame': '_top' } do %>+ <div class="mr-4"><%= render 'spree/admin/shared/product_image', object: product %></div><%= product.name %>@@ -66,7 +66,7 @@<% end %><% else %><tr>- <td colspan="5" class="text-center text-muted py-5">+ <td colspan="5" class="text-center text-gray-600 py-12"><%= Spree.t(:no_resource_found, resource: Spree::Product.name.demodulize.underscore.humanize) %></td></tr>@@ -75,8 +75,8 @@</table></div><% if @top_products.any? && can?(:manage, Spree::Report) %>- <p class="text-center mt-0 border-top py-2 mb-0">- <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-50 btn btn-light mt-2', data: { turbo_frame: '_top' } %>+ <p class="text-center mt-0 border-t py-2 mb-0">+ <%= link_to Spree.t('admin.dashboard.view_report'), report_link, class: 'm-2 w-1/2 btn btn-light mt-2', data: { turbo_frame: '_top' } %></p><% end %></div>diff --git a/admin/app/views/spree/admin/dashboard/_updater.html.erb b/admin/app/views/spree/admin/dashboard/_updater.html.erbindex 36e236c56d..a40413d8db 100644--- a/admin/app/views/spree/admin/dashboard/_updater.html.erb+++ b/admin/app/views/spree/admin/dashboard/_updater.html.erb@@ -1,7 +1,7 @@<% if show_spree_updater_notice? %><div id="updater-notice" class="mb-3"><%= image_tag 'favicon_256x256.png', alt: 'Spree', width: 32, height: 32 %>- <div class="d-flex flex-column">+ <div class="flex flex-col"><p class="mb-1"><strong>Spree <%= spree_updater.latest_release['name'] %></strong> is available.<br />Your current version is <strong>Spree <%= spree_updater.current_release %></strong>.diff --git a/admin/app/views/spree/admin/dashboard/_visits.html.erb b/admin/app/views/spree/admin/dashboard/_visits.html.erbindex 167be5b853..62232fd068 100644--- a/admin/app/views/spree/admin/dashboard/_visits.html.erb+++ b/admin/app/views/spree/admin/dashboard/_visits.html.erb@@ -1,23 +1,23 @@-<div class="row row-cols-1 row-cols-md-2">- <div class="col mb-4">- <div class="card h-100">+<div class="grid grid-cols-1 md:grid-cols-2 gap-6">+ <div class="col mb-6">+ <div class="card h-full"><div class="card-header"><h5 class="card-title">Where are visitors coming from?</h5></div><% if @top_referrers.any? %>- <ul class="list-group list-group-flush small rounded-0">+ <ul class="list-group list-group-flush small rounded-none"><% @top_referrers.each do |referrer| %>- <li class="list-group-item d-flex justify-content-between hover-light">+ <li class="list-group-item flex justify-between hover:bg-gray-25"><span><%= referrer.first %></span><span><%= referrer.second %></span></li><% end %></ul><% else %>- <p class="m-5 text-center text-muted">- <%= icon 'share', height: 50, class: 'mb-3', style: 'opacity: 0.5' %>+ <p class="m-12 text-center text-gray-600">+ <%= icon 'share', height: 50, class: 'mb-4', style: 'opacity: 0.5' %><br /><strong>No data</strong><br />@@ -26,25 +26,25 @@<% end %></div></div>- <div class="col mb-4">- <div class="card h-100">+ <div class="col mb-6">+ <div class="card h-full"><div class="card-header"><h5 class="card-title">Top landing pages</h5></div><% if @top_landing_pages.any? %>- <ul class="list-group list-group-flush small rounded-0">+ <ul class="list-group list-group-flush small rounded-none"><% @top_landing_pages.each do |landing_page| %>- <li class="list-group-item d-flex justify-content-between hover-light">+ <li class="list-group-item flex justify-between hover:bg-gray-25"><span><%= landing_page.first %></span><span><%= landing_page.second %></span></li><% end %></ul><% else %>- <p class="m-5 text-center text-muted">- <%= icon 'pointer', height: 50, class: 'mb-3', style: 'opacity: 0.5' %>+ <p class="m-12 text-center text-gray-600">+ <%= icon 'pointer', height: 50, class: 'mb-4', style: 'opacity: 0.5' %><br /><strong>No data</strong><br />@@ -53,17 +53,17 @@<% end %></div></div>- <div class="col mb-4">- <div class="card h-100">+ <div class="col mb-6">+ <div class="card h-full"><div class="card-header"><h5 class="card-title">Visitor location</h5></div><% if @top_locations.any? %>- <ul class="list-group list-group-flush small rounded-0">+ <ul class="list-group list-group-flush small rounded-none"><% @top_locations.each do |location| %>- <li class="list-group-item d-flex justify-content-between hover-light">+ <li class="list-group-item flex justify-between hover:bg-gray-25"><% cache [*spree_base_cache_key, "visits-country/#{location.first}"] do %><span><span class="mr-1">@@ -77,8 +77,8 @@<% end %></ul><% else %>- <p class="m-5 text-center text-muted">- <%= icon 'world', height: 50, class: 'mb-3', style: 'opacity: 0.5' %>+ <p class="m-12 text-center text-gray-600">+ <%= icon 'world', height: 50, class: 'mb-4', style: 'opacity: 0.5' %><br /><strong>No data</strong><br />@@ -87,7 +87,7 @@<% end %></div></div>- <div class="col mb-4">+ <div class="col mb-6"><div class="card"><div class="card-header"><h5 class="card-title">@@ -99,8 +99,8 @@<%= pie_chart @top_devices, legend: "bottom", suffix: "%" %></div><% else %>- <p class="m-5 text-center text-muted">- <%= icon 'device-mobile', height: 50, class: 'mb-3', style: 'opacity: 0.5' %>+ <p class="m-12 text-center text-gray-600">+ <%= icon 'device-mobile', height: 50, class: 'mb-4', style: 'opacity: 0.5' %><br /><strong>No data</strong><br />diff --git a/admin/app/views/spree/admin/dashboard/analytics.html.erb b/admin/app/views/spree/admin/dashboard/analytics.html.erbindex 4361f43c83..a63186187f 100644--- a/admin/app/views/spree/admin/dashboard/analytics.html.erb+++ b/admin/app/views/spree/admin/dashboard/analytics.html.erb@@ -3,16 +3,16 @@<% end %><%= turbo_frame_tag :analytics do %>- <div class="card mb-4"+ <div class="card mb-6"data-controller="tabs"data-tabs-active-tab-class-value="active">- <div class="card-header d-block border-0 h-auto p-2">- <div class="row">- <div class="col-6 col-lg-4 pr-2">+ <div class="card-header block border-0 h-auto p-2">+ <div class="grid grid-cols-12 gap-2">+ <div class="col-span-6 lg:col-span-4 gap-2"><div class="analytics-card-tab active" data-tabs-target="tab" data-action="click->tabs#select">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">- <span class="font-size-sm text-muted">Total Sales</span>- <span class="font-size-lg text-dark font-weight-bold mt-1">+ <div class="flex justify-center flex-col mb-6 lg:mb-0">+ <span class="text-sm text-gray-500">Total Sales</span>+ <span class="text-lg text-gray-900 font-bold mt-1"><%= @sales_total %></span><div>@@ -22,11 +22,11 @@</div></div>- <div class="col-6 col-lg-2 pl-0 pr-2">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">- <span class="font-size-sm text-muted">Avg. Order Value</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @orders_average %></span>+ <div class="flex justify-center flex-col mb-6 lg:mb-0">+ <span class="text-sm text-gray-500">Avg. Order Value</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_average %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @orders_average_growth_rate %></div>@@ -34,11 +34,11 @@</div></div>- <div class="col-6 col-lg-2 pl-0 pr-2">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">- <span class="font-size-sm text-muted">Total Orders</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @orders_total %></span>+ <div class="flex justify-center flex-col mb-6 lg:mb-0">+ <span class="text-sm text-gray-500">Total Orders</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_total %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @orders_growth_rate %></div>@@ -46,11 +46,11 @@</div></div><% if @visits_total && @visits_growth_rate %>- <div class="col-6 col-lg-2 pl-0 pr-2">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">- <div class="d-flex justify-content-center flex-column">- <span class="font-size-sm text-muted">Visits</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @visits_total %></span>+ <div class="flex justify-center flex-col">+ <span class="text-sm text-gray-500">Visits</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @visits_total %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @visits_growth_rate %></div>@@ -60,11 +60,11 @@<% end %><% if @audience_total && @audience_growth_rate %>- <div class="col-6 col-lg-2 pl-0">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" data-tabs-target="tab" data-action="click->tabs#select">- <div class="d-flex justify-content-center flex-column">- <span class="font-size-sm text-muted">Sign-ups</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @audience_total %></span>+ <div class="flex justify-center flex-col">+ <span class="text-sm text-gray-500">Sign-ups</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @audience_total %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: @audience_growth_rate %></div>@@ -75,7 +75,7 @@</div></div><div class="card-body p-2">- <div data-tabs-target="panel" class="animate__animated animate__fadeIn">+ <div data-tabs-target="panel" class="animate-fade-in"><% if currency_money(current_currency).symbol_first? %><%= line_chart @grouped_orders_scope.sum(:total), prefix: currency_money(current_currency).symbol, zeros: true, points: false, library: {animation: {@@ -92,19 +92,19 @@} %><% end %></div>- <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>+ <div data-tabs-target="panel" class="animate-fade-in" hidden><%= line_chart @grouped_orders_scope.average(:total), suffix: currency_money(current_currency).symbol, zeros: true, points: false %></div>- <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>+ <div data-tabs-target="panel" class="animate-fade-in" hidden><%= line_chart @grouped_orders_scope.count, points: false %></div><% if @visits %>- <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>+ <div data-tabs-target="panel" class="animate-fade-in" hidden><%= line_chart @visits.count, points: false %></div><% end %><% if @audience %>- <div data-tabs-target="panel" class="animate__animated animate__fadeIn" hidden>+ <div data-tabs-target="panel" class="animate-fade-in" hidden><%= line_chart @audience.count, points: false %></div><% end %>diff --git a/admin/app/views/spree/admin/dashboard/getting_started.html.erb b/admin/app/views/spree/admin/dashboard/getting_started.html.erbindex 442076e5fb..19c4788ef7 100644--- a/admin/app/views/spree/admin/dashboard/getting_started.html.erb+++ b/admin/app/views/spree/admin/dashboard/getting_started.html.erb@@ -1,9 +1,9 @@-<div class="row pt-4">- <div class="col-lg-8 offset-lg-2 mb-4">+<div class="grid grid-cols-12 gap-6 pt-6">+ <div class="col-span-12 lg:col-span-8 lg:col-start-3 mb-6"><h2 class="page-header-title"><%= Spree.t('admin.getting_started') %></h2>- <p>+ <p class="mb-4"><%= Spree.t('admin.dashboard.getting_started.description') %></p>diff --git a/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb b/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erbindex 0ffe631675..75feb6e2a9 100644--- a/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb+++ b/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb@@ -14,7 +14,7 @@</p><% end %>-<div class="d-flex gap-3">+<div class="flex gap-3"><%= link_to_with_icon 'plus', Spree.t(:add_product), spree.new_admin_product_path, class: 'btn btn-primary', data: { turbo_frame: '_top' } if can?(:create, Spree::Product) %><%= link_to_with_icon 'table-import', Spree.t(:import), spree.new_admin_import_path(type: 'Spree::Imports::Products'), class: 'btn btn-light', data: { action: 'drawer#open',turbo_frame: :drawer } if can?(:create, Spree::Import) %>diff --git a/admin/app/views/spree/admin/dashboard/setup_tasks/_set_customer_support_email.html.erb b/admin/app/views/spree/admin/dashboard/setup_tasks/_set_customer_support_email.html.erbindex 636af56e0f..04b27cf45d 100644--- a/admin/app/views/spree/admin/dashboard/setup_tasks/_set_customer_support_email.html.erb+++ b/admin/app/views/spree/admin/dashboard/setup_tasks/_set_customer_support_email.html.erb@@ -1,11 +1,11 @@-<%= turbo_frame_tag :set_customer_support_email, class: 'w-100' do %>+<%= turbo_frame_tag :set_customer_support_email, class: 'w-full' do %><div class="alert alert-info">We need your customer support email to display on your storefront.This email will work as a contact point for your customers to reach out to you for any queries or support.</div><% if done %>- <p>+ <p class="mb-3">Your customer support email is <strong><%= current_store.customer_support_email %>.</strong></p><%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_emails_admin_store_path, class: 'btn btn-light' %>@@ -13,9 +13,9 @@<%= form_for current_store, url: spree.admin_store_path, as: :store do |f| %><div class="form-group"><%= f.label :customer_support_email, 'Customer support email' %>- <%= f.email_field :customer_support_email, class: 'form-control', required: true %>+ <%= f.email_field :customer_support_email, class: 'form-input', required: true %></div>- <div class="d-flex justify-content-between">+ <div class="flex justify-between"><%= turbo_save_button_tag %></div><% end %>diff --git a/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_payment_method.html.erb b/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_payment_method.html.erbindex a5217374fd..6b5d137edb 100644--- a/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_payment_method.html.erb+++ b/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_payment_method.html.erb@@ -1,5 +1,7 @@-<% if done %>- <%= Spree.t('admin.store_setup_tasks.payment_methods.done', link: spree.admin_payment_methods_path).html_safe %>+ <% if done %>+ <p>+ <%= Spree.t('admin.store_setup_tasks.payment_methods.done', link: spree.admin_payment_methods_path).html_safe %>+ </p><% else %><p><%= Spree.t('admin.store_setup_tasks.payment_methods.copy') %></p><%= link_to Spree.t('admin.store_setup_tasks.payment_methods.setup'), spree.admin_payment_methods_path, class: 'btn btn-primary', data: { turbo_frame: '_top' } %>diff --git a/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_taxes_collection.html.erb b/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_taxes_collection.html.erbindex 26b09dc84c..667cdbba35 100644--- a/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_taxes_collection.html.erb+++ b/admin/app/views/spree/admin/dashboard/setup_tasks/_setup_taxes_collection.html.erb@@ -1,5 +1,5 @@<% if current_store.setup_task_done?(:setup_taxes_collection) %>- <%= Spree.t('admin.store_setup_tasks.taxes.done', link: spree.admin_tax_rates_path).html_safe %>+ <p><%= Spree.t('admin.store_setup_tasks.taxes.done', link: spree.admin_tax_rates_path).html_safe %></p><% else %><p><%= Spree.t('admin.store_setup_tasks.taxes.copy') %></p><%= link_to Spree.t('admin.store_setup_tasks.taxes.setup'), spree.admin_tax_rates_path, class: 'btn btn-primary', data: { turbo_frame: '_top' } %>diff --git a/admin/app/views/spree/admin/dashboard/show.html.erb b/admin/app/views/spree/admin/dashboard/show.html.erbindex 5fb33e1099..d6c6601dc9 100644--- a/admin/app/views/spree/admin/dashboard/show.html.erb+++ b/admin/app/views/spree/admin/dashboard/show.html.erb@@ -1,28 +1,28 @@-<div class="row pt-4">- <div class="col-12">+<div class="grid grid-cols-12 gap-6 pt-6">+ <div class="col-span-12"><h2 class="page-header-title"><%= Spree.t('admin.dashboard.hi') %> <%= try_spree_current_user.first_name %>!</h2>- <p>+ <p class="mb-4"><%= Spree.t('admin.dashboard.whats_happening_on', store_name: current_store.name).html_safe %></p></div></div>-<div class="row">- <div class="col-lg-8">- <div class="mb-2 d-flex gap-2">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-8">+ <div class="mb-2 flex gap-2"><%= form_tag spree.admin_dashboard_analytics_path, method: :get, data: { turbo_frame: :analytics } do %><%= hidden_field_tag :vendor_id, @vendor.id if @vendor.present? %><%= render 'spree/admin/shared/calendar_range_picker',date_from_value: params[:date_from] || 1.month.ago.end_of_day,date_to_value: params[:date_to] || Time.zone.now.beginning_of_day,- css_classes: "btn btn-sm border rounded-lg hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>+ css_classes: "btn btn-sm btn-light rounded-xl hover:bg-gray-25 inline-flex items-center h-full dropdown-toggle bg-transparent" %><% end %></div><%= render 'analytics' %></div>- <div class="col-lg-4">+ <div class="col-span-12 lg:col-span-4"><%= render 'sidebar' %><%= render_admin_partials(:dashboard_sidebar_partials) %></div>diff --git a/admin/app/views/spree/admin/digital_assets/_form.html.erb b/admin/app/views/spree/admin/digital_assets/_form.html.erbindex f67f13245f..70c803db75 100644--- a/admin/app/views/spree/admin/digital_assets/_form.html.erb+++ b/admin/app/views/spree/admin/digital_assets/_form.html.erb@@ -1,6 +1,6 @@-<div class="form-group mb-3">+<div class="form-group mb-4"><%= f.label :attachment, Spree.t(:filename) %>- <%= f.file_field :attachment, required: true, class: "form-control w-100" %>+ <%= f.file_field :attachment, required: true, class: "form-input w-full" %></div><%= f.error_message_on :attachment %>diff --git a/admin/app/views/spree/admin/digital_assets/_table.html.erb b/admin/app/views/spree/admin/digital_assets/_table.html.erbindex b31db1dad1..4be6354ad6 100644--- a/admin/app/views/spree/admin/digital_assets/_table.html.erb+++ b/admin/app/views/spree/admin/digital_assets/_table.html.erb@@ -17,7 +17,7 @@<td colspan="4"><divclass="- text-muted p-5 d-flex align-items-center w-100 justify-content-center+ text-gray-600 p-12 flex items-center w-full justify-center"><%= Spree.t(:no_resource_found, resource: Spree.t(:digital_assets)) %>@@ -25,7 +25,7 @@<%= link_to_with_icon "plus",Spree.t(:add_one),spree.new_admin_product_digital_asset_path(@product),- class: "btn btn-light ml-3",+ class: "btn btn-light ml-12",data: {turbo_frame: "dialog",action: 'dialog#open',diff --git a/admin/app/views/spree/admin/errors/403.html.erb b/admin/app/views/spree/admin/errors/403.html.erbindex 76dae43600..ad11307deb 100644--- a/admin/app/views/spree/admin/errors/403.html.erb+++ b/admin/app/views/spree/admin/errors/403.html.erb@@ -3,8 +3,8 @@<% end %><div class="page-container py-12">- <div class="not-found-page text-center pt-5">- <h1 class="display-4 text-primary">403</h1>+ <div class="not-found-page text-center pt-12">+ <h1 class="display-4 text-zinc-950">403</h1><p class="display-5"><%= Spree.t(:forbidden) %></p><p class="display-6"><%= Spree.t(:forbidden_message) %></p><%= link_to Spree.t("admin.back_to_dashboard"),diff --git a/admin/app/views/spree/admin/errors/404.html.erb b/admin/app/views/spree/admin/errors/404.html.erbindex 41d08d6033..0c0c2db4a3 100644--- a/admin/app/views/spree/admin/errors/404.html.erb+++ b/admin/app/views/spree/admin/errors/404.html.erb@@ -3,8 +3,8 @@<% end %><div class="page-container py-12">- <div class="not-found-page text-center pt-5">- <h1 class="display-4 text-primary">404</h1>+ <div class="not-found-page text-center pt-12">+ <h1 class="display-4 text-zinc-950">404</h1><p class="display-5"><%= Spree.t(:page_not_found) %></p><p class="display-6"><%= Spree.t(:page_not_found_message) %></p><%= link_to Spree.t("admin.back_to_dashboard"),diff --git a/admin/app/views/spree/admin/errors/422.html.erb b/admin/app/views/spree/admin/errors/422.html.erbindex d9d6895ab6..12994fb1f0 100644--- a/admin/app/views/spree/admin/errors/422.html.erb+++ b/admin/app/views/spree/admin/errors/422.html.erb@@ -3,8 +3,8 @@<% end %><div class="page-container py-12">- <div class="not-found-page text-center pt-5">- <h1 class="display-4 text-primary">422</h1>+ <div class="not-found-page text-center pt-12">+ <h1 class="display-4 text-zinc-950">422</h1><p class="display-5"><%= Spree.t(:unprocessable_entity) %></p><p class="display-6"><%= Spree.t(:unprocessable_entity_message) %></p><%= link_to Spree.t("admin.back_to_dashboard"),diff --git a/admin/app/views/spree/admin/errors/500.html.erb b/admin/app/views/spree/admin/errors/500.html.erbindex 4106e9645e..a25b03911a 100644--- a/admin/app/views/spree/admin/errors/500.html.erb+++ b/admin/app/views/spree/admin/errors/500.html.erb@@ -3,8 +3,8 @@<% end %><div class="page-container py-12">- <div class="not-found-page text-center pt-5">- <h1 class="display-4 text-primary">500</h1>+ <div class="not-found-page text-center pt-12">+ <h1 class="display-4 text-zinc-950">500</h1><p class="display-5"><%= Spree.t(:internal_server_error) %></p><p class="display-6"><%= Spree.t(:internal_server_error_message) %></p><%= link_to Spree.t("admin.back_to_dashboard"),diff --git a/admin/app/views/spree/admin/errors/503.html.erb b/admin/app/views/spree/admin/errors/503.html.erbindex 2c3c529998..0cd03f363a 100644--- a/admin/app/views/spree/admin/errors/503.html.erb+++ b/admin/app/views/spree/admin/errors/503.html.erb@@ -3,8 +3,8 @@<% end %><div class="page-container py-12">- <div class="not-found-page text-center pt-5">- <h1 class="display-4 text-primary">503</h1>+ <div class="not-found-page text-center pt-12">+ <h1 class="display-4 text-zinc-950">503</h1><p class="display-5"><%= Spree.t(:service_unavailable) %></p><p class="display-6"><%= Spree.t(:service_unavailable_message) %></p><%= link_to Spree.t("admin.back_to_dashboard"),diff --git a/admin/app/views/spree/admin/exports/_export.html.erb b/admin/app/views/spree/admin/exports/_export.html.erbindex 2494ed1f41..f86b9d61a3 100644--- a/admin/app/views/spree/admin/exports/_export.html.erb+++ b/admin/app/views/spree/admin/exports/_export.html.erb@@ -19,7 +19,7 @@<% end %></td>- <td class="w-25">+ <td class="w-1/4"><% if export.user %><span><%= export.user.name %>diff --git a/admin/app/views/spree/admin/exports/new.html.erb b/admin/app/views/spree/admin/exports/new.html.erbindex 8efbe81078..1c961fe908 100644--- a/admin/app/views/spree/admin/exports/new.html.erb+++ b/admin/app/views/spree/admin/exports/new.html.erb@@ -14,21 +14,19 @@<%= f.radio_button :record_selection, 'filtered', class: 'custom-control-input' %><%= f.label :record_selection, for: :export_record_selection_filtered, class: 'custom-control-label' do %><%= Spree.t(:filtered_records) %>- <br />- <span class="text-muted font-weight-normal mr-1">- <%= Spree.t('admin.export_only_filtered_records') %>- </span><% end %>+ <span class="text-gray-600 font-normal ml-7 mt-2">+ <%= Spree.t('admin.export_only_filtered_records') %>+ </span></div>- <div class="custom-control custom-radio mt-3">+ <div class="custom-control custom-radio mt-4"><%= f.radio_button :record_selection, 'all', class: 'custom-control-input' %><%= f.label :record_selection, for: :export_record_selection_all, class: 'custom-control-label' do %><%= Spree.t(:all) %>- <br />- <span class="text-muted font-weight-normal mr-1">- <%= Spree.t('admin.export_all') %>- </span><% end %>+ <span class="text-gray-600 font-normal ml-7 mt-2">+ <%= Spree.t('admin.export_all') %>+ </span></div></div><div class="dialog-footer">diff --git a/admin/app/views/spree/admin/gift_card_batches/_form.html.erb b/admin/app/views/spree/admin/gift_card_batches/_form.html.erbindex fcaa3dc0fd..f3bcc04265 100644--- a/admin/app/views/spree/admin/gift_card_batches/_form.html.erb+++ b/admin/app/views/spree/admin/gift_card_batches/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:gift_card_batch) %>@@ -6,7 +6,7 @@</div><div class="card-body">- <%= f.spree_text_field :prefix, disabled: f.object.persisted?, label: Spree.t('admin.gift_card_batches.prefix') %>+ <%= f.spree_text_field :prefix, disabled: f.object.persisted?, label: Spree.t('admin.gift_card_batches.prefix'), autofocus: true %><%= f.spree_number_field :amount, required: true, disabled: f.object.persisted? %><%= f.spree_select :currency, options_for_select(supported_currency_options, f.object.currency), { label: Spree.t(:currency), autocomplete: true } %><%= f.spree_number_field :codes_count, required: true, min: 1, max: Spree::Config[:gift_card_batch_limit], label: Spree.t('admin.gift_card_batches.codes_count') %>diff --git a/admin/app/views/spree/admin/gift_cards/_filters.html.erb b/admin/app/views/spree/admin/gift_cards/_filters.html.erbindex a0b6e86585..f7e51bd628 100644--- a/admin/app/views/spree/admin/gift_cards/_filters.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_filters.html.erb@@ -10,10 +10,10 @@} do |f| %><%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %><%= render "table_filter_dropdown" %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>@@ -25,13 +25,13 @@<% if params[:user_id].blank? %><div class="form-group"><%= f.label :users_email_eq, Spree.t(:email) %>- <%= f.text_field :users_email_eq, class: "form-control", data: {filters_target: :input} %>+ <%= f.text_field :users_email_eq, class: "form-input", data: {filters_target: :input} %></div><% end %><div class="form-group"><%= f.label :batch_prefix_eq, Spree.t('admin.gift_card_batches.prefix') %>- <%= f.text_field :batch_prefix_eq, class: "form-control", data: {filters_target: :input} %>+ <%= f.text_field :batch_prefix_eq, class: "form-input", data: {filters_target: :input} %></div><%= render_admin_partials(:gift_cards_filters_partials, f: f) %>diff --git a/admin/app/views/spree/admin/gift_cards/_form.html.erb b/admin/app/views/spree/admin/gift_cards/_form.html.erbindex e396f5ef7f..4d001f7028 100644--- a/admin/app/views/spree/admin/gift_cards/_form.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_form.html.erb@@ -1,7 +1,7 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><% unless f.object.persisted? %>- <%= f.spree_text_field :code, required: true, help_bubble: Spree.t('admin.gift_cards.code_help_text') %>+ <%= f.spree_text_field :code, required: true, help_bubble: Spree.t('admin.gift_cards.code_help_text'), autofocus: true %><% end %><%= f.spree_number_field :amount, required: true %>diff --git a/admin/app/views/spree/admin/gift_cards/_gift_card.html.erb b/admin/app/views/spree/admin/gift_cards/_gift_card.html.erbindex 30f23321fc..4c16139f6e 100644--- a/admin/app/views/spree/admin/gift_cards/_gift_card.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_gift_card.html.erb@@ -1,8 +1,8 @@<% link = @user.present? ? spree.admin_user_gift_card_path(gift_card, user_id: @user.id) : spree.admin_gift_card_path(gift_card) %><tr id="<%= spree_dom_id gift_card %>" data-controller="row-link">- <td class="w-25 py-0">- <%= link_to gift_card.code.upcase, link, class: 'font-weight-bold d-block w-100 h-100 py-2', data: { 'turbo-frame': '_top', row_link_target: :link } %>+ <td class="w-1/4 py-0">+ <%= link_to gift_card.code.upcase, link, class: 'font-bold block w-full h-full py-2', data: { 'turbo-frame': '_top', row_link_target: :link } %></td><td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= gift_card.display_amount %></td><td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= gift_card.display_amount_used %></td>@@ -12,7 +12,7 @@<% if gift_card.expires_at.present? %><%= spree_date(gift_card.expires_at) %><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></td>@@ -20,7 +20,7 @@<% if gift_card.user.present? %><%= gift_card.user.email %><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %>diff --git a/admin/app/views/spree/admin/gift_cards/_list.html.erb b/admin/app/views/spree/admin/gift_cards/_list.html.erbindex ba0d030154..c53c6e5301 100644--- a/admin/app/views/spree/admin/gift_cards/_list.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_list.html.erb@@ -1,7 +1,7 @@<% if @collection.any? %><div class="table-responsive" id="listing_gift_cards"><table class="table">- <thead class="text-muted">+ <thead class="text-gray-600"><tr><th scope="col"><%= Spree.t(:code) %></th><th scope="col"><%= Spree.t(:amount) %></th>diff --git a/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erbindex 5a76b6d580..c9d94e4ad6 100644--- a/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/gift_cards/_table_filter_dropdown.html.erb@@ -1,6 +1,6 @@<%= dropdown do %><%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>- <span class="text-muted font-weight-normal">Show:</span>+ <span class="text-gray-600 font-normal">Show:</span><%= gift_cards_filter_dropdown_value %><% end %><%= dropdown_menu do %>diff --git a/admin/app/views/spree/admin/gift_cards/edit.html.erb b/admin/app/views/spree/admin/gift_cards/edit.html.erbindex 604b57de22..7b39770c36 100644--- a/admin/app/views/spree/admin/gift_cards/edit.html.erb+++ b/admin/app/views/spree/admin/gift_cards/edit.html.erb@@ -1,7 +1,7 @@<%= turbo_frame_tag :gift_card_settings do %><%= form_for [:admin, @user, @object] do |f| %><div class="card">- <div class="card-header d-flex justify-content-between">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:settings) %></h5>@@ -10,7 +10,7 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @object } %><%= render 'form', f: f %></div>- <div class="card-footer d-flex justify-content-between">+ <div class="card-footer flex justify-between"><%= turbo_save_button_tag Spree.t('actions.update') %><%= link_to Spree.t('actions.discard'), spree.admin_gift_card_path(@object), class: 'btn btn-light' %>diff --git a/admin/app/views/spree/admin/gift_cards/index.html.erb b/admin/app/views/spree/admin/gift_cards/index.html.erbindex bcff2abf2e..1669cad4d8 100644--- a/admin/app/views/spree/admin/gift_cards/index.html.erb+++ b/admin/app/views/spree/admin/gift_cards/index.html.erb@@ -8,7 +8,7 @@<%= link_to_export_modal %><%= dropdown id: 'page_actions_dropdown' do %>- <%= dropdown_toggle class: 'text-nowrap btn-primary align-self-center', id: 'more-actions-link' do %>+ <%= dropdown_toggle class: 'whitespace-nowrap btn-primary self-center', id: 'more-actions-link' do %><%= icon 'plus' %><%= Spree.t(:new_gift_card) %><% end %>diff --git a/admin/app/views/spree/admin/gift_cards/show.html.erb b/admin/app/views/spree/admin/gift_cards/show.html.erbindex 1600d197f8..01fd81e235 100644--- a/admin/app/views/spree/admin/gift_cards/show.html.erb+++ b/admin/app/views/spree/admin/gift_cards/show.html.erb@@ -16,21 +16,21 @@<%= @object.code.upcase %><% end %>-<div class="row">- <div class="col-md-8">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 md:col-span-8">- <div class="card mb-4">- <div class="card-header d-flex justify-content-between align-items-center">+ <div class="card mb-6">+ <div class="card-header flex justify-between items-center"><h5 class="card-title"><%= Spree.t('admin.gift_cards.usage') %></h5></div>- <div class="card-body border-bottom">- <div class="d-flex justify-content-between align-items-center">- <div class="w-75">+ <div class="card-body border-b">+ <div class="flex justify-between items-center">+ <div class="w-3/4"><%= progress_bar_component(@object.amount_used, max: @object.amount) %></div>- <div class="w-25 text-right">+ <div class="w-1/4 text-right"><%= @object.display_amount_used %> <%= Spree.t(:used).downcase %> / <%= @object.display_amount %></div></div>@@ -52,7 +52,7 @@<% @orders.each do |order| %><tr><td>- <%= link_to order.number, spree.edit_admin_order_path(order), class: 'text-dark font-weight-bold' %>+ <%= link_to order.number, spree.edit_admin_order_path(order), class: 'text-gray-900 font-bold' %></td><td><% if order.completed? %>@@ -88,10 +88,10 @@</div>- <div class="col-md-4">+ <div class="col-span-12 md:col-span-4"><%= turbo_frame_tag :gift_card_settings do %><div class="card">- <div class="card-header d-flex justify-content-between">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:settings) %></h5>@@ -99,8 +99,8 @@</div><div class="card-body p-0"><ul class="list-group list-group-flush">- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:code) %></span><span>@@ -109,31 +109,31 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:customer) %></span><span><% if @object.user %><%= link_to @object.user.email, spree.admin_user_path(@object.user), data: { turbo_frame: '_top' } %><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:amount) %></span><span><%= @object.display_amount %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:used) %></span><span>@@ -141,8 +141,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t('store_credit.remaining') %></span><span>@@ -150,8 +150,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:currency) %></span><span>@@ -159,34 +159,34 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:expires_at) %></span><% if @object.expires_at %><span><%= spree_time(@object.expires_at) %></span><% else %>- <span class="text-muted"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:created_by) %></span><span><% if @object.created_by %><%= link_to @object.created_by.email, spree.admin_admin_user_path(@object.created_by), data: { turbo_frame: '_top' } %><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:created_at) %></span><span><%= spree_time(@object.created_at) %></span>diff --git a/admin/app/views/spree/admin/import_rows/show.html.erb b/admin/app/views/spree/admin/import_rows/show.html.erbindex 5e7304bbb0..1c556a5da5 100644--- a/admin/app/views/spree/admin/import_rows/show.html.erb+++ b/admin/app/views/spree/admin/import_rows/show.html.erb@@ -2,7 +2,7 @@<%= drawer_header(Spree.t(:row) + ' ' + @import_row.row_number.to_s) %><div class="drawer-body" data-controller="highlight tabs">- <ul class="nav nav-pills mb-3">+ <ul class="nav nav-pills mb-6"><li class="nav-item"><a class="nav-link active" data-tabs-target="tab" data-action="click->tabs#select">JSON</a></li>@@ -11,18 +11,18 @@</li></ul>- <div data-tabs-target="panel" class="animate__animated animate__fadeIn">- <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= JSON.pretty_generate(@import_row.data_json) %></code></pre>+ <div data-tabs-target="panel" class="animate-fade-in">+ <pre class="m-0"><code data-highlight-target="code" class="language-json block overflow-auto" style="height: calc(100dvh - 11rem);"><%= JSON.pretty_generate(@import_row.data_json) %></code></pre></div>- <div data-tabs-target="panel" hidden class="animate__animated animate__fadeIn">- <dl class="row rounded border p-2 overflow-auto" style="height: calc(100dvh - 11rem);">+ <div data-tabs-target="panel" hidden class="animate-fade-in">+ <dl class="grid grid-cols-12 gap-6 rounded-lg border p-2 overflow-auto" style="height: calc(100dvh - 11rem);"><% @import_row.to_schema_hash.each do |field_name, value| %>- <dt class="col-sm-3"><%= field_name.humanize %></dt>- <dd class="col-sm-9">+ <dt class="col-span-12 sm:col-span-3"><%= field_name.humanize %></dt>+ <dd class="col-span-12 sm:col-span-9"><% if value.present? %><%= h(value) %><% else %>- <span class="text-muted">—</span>+ <span class="text-gray-600">—</span><% end %></dd><% end %>diff --git a/admin/app/views/spree/admin/imports/_footer.html.erb b/admin/app/views/spree/admin/imports/_footer.html.erbindex 000325036e..2cada21745 100644--- a/admin/app/views/spree/admin/imports/_footer.html.erb+++ b/admin/app/views/spree/admin/imports/_footer.html.erb@@ -1,6 +1,6 @@-<footer id="footer">+<footer id="footer" class="fixed bottom-0 left-0 w-full border-t border-gray-200 px-6 py-4 bg-gray-25 flex items-center justify-between gap-4 z-[1000]"><% if import.rows.any? %>- <div class="flex-grow-1 d-flex flex-column">+ <div class="grow flex flex-col"><%= progress_bar_component(import.rows.processed.count, min: 0, max: import.rows_count) %></div>diff --git a/admin/app/views/spree/admin/imports/_loader.html.erb b/admin/app/views/spree/admin/imports/_loader.html.erbindex 175280e6ea..6c980eae29 100644--- a/admin/app/views/spree/admin/imports/_loader.html.erb+++ b/admin/app/views/spree/admin/imports/_loader.html.erb@@ -1,14 +1,14 @@<% if import.completed? %>- <div class="d-flex justify-content-center align-items-center my-5 flex-column pb-5">- <%= icon('check', class: 'text-success', style: 'font-size: 4rem;') %>- <p class="text-success"><%= Spree.t('admin.imports.import_done') %>!</p>- <%= link_to_with_icon 'arrow-back-up', Spree.t('admin.back_to_dashboard'), spree.admin_path, class: 'btn btn-light mb-5' %>+ <div class="flex justify-center items-center my-12 flex-col pb-12">+ <%= icon('check', class: 'text-green-700', style: 'font-size: 4rem;') %>+ <p class="text-green-700 mb-3"><%= Spree.t('admin.imports.import_done') %>!</p>+ <%= link_to_with_icon 'arrow-back-up', Spree.t('admin.back_to_dashboard'), spree.admin_path, class: 'btn btn-light mb-12' %></div><% else %>- <div class="d-flex justify-content-center align-items-center my-5 flex-column" style="height: 200px;">- <div class="spinner-border mb-3 text-muted" role="status" style="width: 4rem; height: 4rem;">+ <div class="flex justify-center items-center my-12 flex-col" style="height: 200px;">+ <div class="inline-block w-16 h-16 border-4 border-current border-r-transparent rounded-full animate-spin mb-4 text-gray-600" role="status"><span class="sr-only"><%= Spree.t(:processing) %>...</span></div>- <p class="text-muted"><%= Spree.t(:processing) %>...</p>+ <p class="text-gray-600"><%= Spree.t(:processing) %>...</p></div><% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/imports/_mapping.html.erb b/admin/app/views/spree/admin/imports/_mapping.html.erbindex db8f642c72..c89d33a1dd 100644--- a/admin/app/views/spree/admin/imports/_mapping.html.erb+++ b/admin/app/views/spree/admin/imports/_mapping.html.erb@@ -1,12 +1,12 @@-<div class="d-flex justify-content-between align-items-center border-bottom hover-light" id="<%= spree_dom_id(mapping) %>">+<div class="flex justify-between items-center border-b hover:bg-gray-25" id="<%= spree_dom_id(mapping) %>"><div class="text-center w-10"><%= render 'spree/admin/imports/mapping_icon', mapping: mapping %></div>- <div class="text-wrap w-40 px-2 py-3">+ <div class="whitespace-normal w-40 px-2 py-4"><%= mapping.schema_field_label %><code class="ml-2"><%= mapping.schema_field %></code></div>- <div class="w-50 px-2 py-3">+ <div class="w-1/2 px-2 py-4"><%= render 'spree/admin/imports/mapping_form', import: @import, mapping: mapping, options: options %></div></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/imports/_mapping_footer.html.erb b/admin/app/views/spree/admin/imports/_mapping_footer.html.erbindex 9f690da908..7d069ef2e6 100644--- a/admin/app/views/spree/admin/imports/_mapping_footer.html.erb+++ b/admin/app/views/spree/admin/imports/_mapping_footer.html.erb@@ -1,8 +1,8 @@-<footer id="footer">- <div class="flex-grow-1 d-flex flex-column">+<footer id="footer" class="fixed bottom-0 left-0 w-full border-t border-gray-200 px-6 py-4 bg-gray-25 flex items-center justify-between gap-4 z-[1000]">+ <div class="grow flex flex-col"><% if import.mapping_done? %>- <p>- <%= icon('check', class: 'text-success') %>+ <p class="mb-3 text-green-700">+ <%= icon('check') %><%= Spree.t('admin.imports.all_required_columns_mapped') %></p><% else %>diff --git a/admin/app/views/spree/admin/imports/_mapping_icon.html.erb b/admin/app/views/spree/admin/imports/_mapping_icon.html.erbindex 7e26befcc4..030ae66d20 100644--- a/admin/app/views/spree/admin/imports/_mapping_icon.html.erb+++ b/admin/app/views/spree/admin/imports/_mapping_icon.html.erb@@ -1,6 +1,6 @@<% if mapping.required? %><div id="<%= spree_dom_id(mapping) %>-icon" data-controller="tooltip">- <%= icon('checklist', class: mapping.mapped? ? 'text-success' : 'text-muted') %>+ <%= icon('checklist', class: mapping.mapped? ? 'text-green-700' : 'text-gray-600') %><%= tooltip(Spree.t('admin.imports.mapping_required')) %></div><% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/imports/_row.html.erb b/admin/app/views/spree/admin/imports/_row.html.erbindex 08c71e6f08..2bf017917d 100644--- a/admin/app/views/spree/admin/imports/_row.html.erb+++ b/admin/app/views/spree/admin/imports/_row.html.erb@@ -1,8 +1,8 @@-<div class="import_row d-flex justify-content-between align-items-center border-bottom hover-light" id="<%= dom_id(row) %>">+<div class="import_row flex justify-between items-center border-b hover:bg-gray-25" id="<%= dom_id(row) %>"><div class="text-center w-10"><%= row.row_number %></div>- <div class="text-wrap w-20 px-2 py-3">+ <div class="whitespace-normal w-20 px-2 py-4"><% badge_class = case row.statuswhen 'completed''success'@@ -15,21 +15,21 @@<%= Spree.t(row.status) %></span></div>- <div class="w-60 px-2 py-3">+ <div class="w-60 px-2 py-4"><% if row.status == 'failed' %><div class="text-danger"><%= row.validation_errors %></div><% elsif row.status == 'completed' && row.item.present? %><%= render "spree/admin/import_rows/#{row.item_type.demodulize.underscore}", item: row.item %><% else %>- <div class="d-flex align-items-center gap-2">- <div class="spinner-border text-muted" role="status">+ <div class="flex items-center gap-2">+ <div class="inline-block w-5 h-5 border-2 border-current border-r-transparent rounded-full animate-spin text-gray-600" role="status"><span class="sr-only"><%= Spree.t(:processing) %>...</span></div><%= Spree.t(:processing) %>...</div><% end %></div>- <div class="w-10 px-2 py-3">+ <div class="w-10 px-2 py-4"><%= link_to_with_icon 'eye', Spree.t(:details), spree.admin_import_row_path(import, row), class: 'btn btn-sm btn-light', data: { action: 'drawer#open', turbo_frame: :drawer }, no_text: true %></div></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/imports/new.html.erb b/admin/app/views/spree/admin/imports/new.html.erbindex 35dd73036a..539e364134 100644--- a/admin/app/views/spree/admin/imports/new.html.erb+++ b/admin/app/views/spree/admin/imports/new.html.erb@@ -12,7 +12,7 @@data-active-storage-upload-inline-value="true"data-active-storage-upload-hide-cancel-button-value="true"data-active-storage-upload-disable-thumbnail-generator-value="true"- class="d-flex flex-column justify-content-center w-100 position-relative mb-4">+ class="flex flex-col justify-center w-full relative mb-6"></div><%= f.spree_select :preferred_delimiter, options_for_select([',', ';', '|', '\t'], @import.preferred_delimiter) %>diff --git a/admin/app/views/spree/admin/imports/show.html.erb b/admin/app/views/spree/admin/imports/show.html.erbindex 5b12af3f5c..01b652760a 100644--- a/admin/app/views/spree/admin/imports/show.html.erb+++ b/admin/app/views/spree/admin/imports/show.html.erb@@ -3,24 +3,24 @@<% end %><% content_for :steps do %>- <li class="border-right flex-grow-1 h-100 d-flex align-items-center justify-content-center <% if @import.mapping? %>active bg-white font-weight-bold<% end %>">1. Map fields</li>- <li class="border-right flex-grow-1 h-100 d-flex align-items-center justify-content-center <% if @import.processing? %>active bg-white font-weight-bold<% end %>">2. Process rows</li>- <li class="flex-grow-1 h-100 d-flex align-items-center justify-content-center <% if @import.complete? %>active bg-white font-weight-bold<% end %>">3. Complete</li>+ <li class="border-r grow h-full flex items-center justify-center <% if @import.mapping? %>bg-gray-100 font-bold<% end %>">1. Map fields</li>+ <li class="border-r grow h-full flex items-center justify-center <% if @import.processing? %>bg-gray-100 font-bold<% end %>">2. Process rows</li>+ <li class="grow h-full flex items-center justify-center <% if @import.complete? %>bg-gray-100 font-bold<% end %>">3. Complete</li><% end %><% if @import.status == 'mapping' %>- <div class="d-flex justify-content-between align-items-center bg-light border-top border-bottom text-muted mt-3 sticky-top">+ <div class="flex justify-between items-center bg-gray-25 border-t border-b text-gray-600 mt-4 sticky top-0 z-[1020]"><div class="w-10 p-2 text-center"><%= Spree.t('admin.imports.field_required') %></div><div class="w-40 p-2"><%= I18n.t('activerecord.attributes.spree/import_mapping.file_column') %></div>- <div class="w-50 p-2">+ <div class="w-1/2 p-2"><%= I18n.t('activerecord.attributes.spree/import_mapping.schema_field') %></div></div>- <div id="mappings" class="mb-5">+ <div id="mappings" class="mb-12"><%= render collection: @mappings, partial: 'spree/admin/imports/mapping', locals: { options: @mappings_options } %></div>@@ -30,7 +30,7 @@<%= turbo_stream_from "import_#{@import.id}_footer" %><%= turbo_stream_from "import_#{@import.id}_loader" %>- <div class="d-flex justify-content-between align-items-center bg-light border-top border-bottom text-muted mt-3 sticky-top">+ <div class="flex justify-between items-center bg-gray-25 border-t border-b text-gray-600 mt-4 sticky top-0 z-[1020]"><div class="w-10 p-2 text-center"><%= I18n.t('activerecord.attributes.spree/import_row.row_number') %></div>diff --git a/admin/app/views/spree/admin/integrations/_integration.html.erb b/admin/app/views/spree/admin/integrations/_integration.html.erbindex b719f8bc63..36a5457430 100644--- a/admin/app/views/spree/admin/integrations/_integration.html.erb+++ b/admin/app/views/spree/admin/integrations/_integration.html.erb@@ -3,10 +3,10 @@<% integration_description ||= Spree.t("admin.integrations.#{integration_class.integration_key}.description") %>-<div id="integration-<%= integration_class.integration_key %>" class="col mb-4 d-flex align-items-stretch">+<div id="integration-<%= integration_class.integration_key %>" class="col mb-6 flex items-stretch"><div class="card w-full">- <div class="card-header border-bottom d-flex align-items-center justify-content-between h-auto pr-3 <% if integration.present? %>bg-success<% end %>">- <div style="height: 36px" class="d-flex align-items-center">+ <div class="card-header border-b flex flex-col gap-4 items-center justify-between h-auto pr-4 <% if integration.present? %>bg-green-50<% end %>">+ <div class="flex items-center py-1"><%= image_tag integration_class.icon_path, alt: integration_name, height: 36 if integration_class.icon_path.present? %></div>@@ -22,14 +22,14 @@<p><%= integration_description %></p></div>- <div class="card-footer d-flex <% if integration.present? %>align-items-baseline justify-content-between<% else %>flex-column<% end %>">+ <div class="card-footer flex <% if integration.present? %>items-baseline justify-between<% else %>flex-col<% end %>"><% if integration.present? %>- <%= link_to spree.edit_admin_integration_path(integration), class: 'card-link btn btn-sm btn-light' do %>+ <%= link_to spree.edit_admin_integration_path(integration), class: 'btn btn-sm btn-light' do %><%= icon 'settings' %><%= Spree.t(:settings) %><% end if can?(:update, integration) %><% else %>- <%= link_to_with_icon 'plus', "#{Spree.t('actions.connect')} #{integration_class.integration_name}", spree.new_admin_integration_path(integration: { type: integration_class.name }), class: 'btn btn-primary' if can?(:create, Spree::Integration) %>+ <%= link_to_with_icon 'plus', "#{Spree.t('actions.connect')} #{integration_class.integration_name}", spree.new_admin_integration_path(integration: { type: integration_class.name }), class: 'btn btn-primary truncate w-full' if can?(:create, Spree::Integration) %><% end %></div></div>diff --git a/admin/app/views/spree/admin/integrations/edit.html.erb b/admin/app/views/spree/admin/integrations/edit.html.erbindex 683b47e462..c273c6adaf 100644--- a/admin/app/views/spree/admin/integrations/edit.html.erb+++ b/admin/app/views/spree/admin/integrations/edit.html.erb@@ -6,6 +6,10 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %><%= form_for @integration, as: :integration, url: spree.admin_integration_path(@integration) do |form| %>- <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>- <%= render 'spree/admin/shared/edit_resource_links', f: form %>+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4">+ <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>+ <%= render 'spree/admin/shared/edit_resource_links', f: form %>+ </div>+ </div><% end %>diff --git a/admin/app/views/spree/admin/integrations/index.html.erb b/admin/app/views/spree/admin/integrations/index.html.erbindex 26e171496a..d992e43162 100644--- a/admin/app/views/spree/admin/integrations/index.html.erb+++ b/admin/app/views/spree/admin/integrations/index.html.erb@@ -8,33 +8,33 @@<%= render_admin_partials(:integrations_header_partials) %>-<div class="row">- <div class="col-lg-8 offset-lg-2">- <div class="alert alert-info mb-4">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-8 lg:col-start-3">+ <div class="alert alert-info mb-6"><%= Spree.t('admin.integrations.page_subtitle') %></div><% if grouped_available_store_integrations.any? %><% grouped_available_store_integrations.each do |group, integrations| %><% if group.present? %>- <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>+ <div class="my-2 text-gray-600 font-light uppercase"><%= Spree.t(group) %></div><% end %>- <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">+ <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6 mb-6"><% integrations.each do |integration| %><%= render 'spree/admin/integrations/integration', integration_class: integration %><% end %></div><% end %>- <p class="text-muted text-center my-5">- Find more integrations in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', class: 'text-decoration-none font-weight-bold', target: '_blank' %>+ <p class="text-gray-600 text-center my-12">+ Find more integrations in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank' %></p><% else %>- <p class="text-muted text-center my-5">+ <p class="text-gray-600 text-center my-12">No integrations installed yet. Find integrations in- <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', class: 'text-decoration-none font-weight-bold', target: '_blank' %>+ <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank' %></p><% end %></div>diff --git a/admin/app/views/spree/admin/integrations/new.html.erb b/admin/app/views/spree/admin/integrations/new.html.erbindex 38d46b8c15..ea87ef35aa 100644--- a/admin/app/views/spree/admin/integrations/new.html.erb+++ b/admin/app/views/spree/admin/integrations/new.html.erb@@ -7,8 +7,8 @@<%= form.hidden_field :type %><%= form.hidden_field :active, value: true %>- <div class="row">- <div class="col-lg-6 offset-lg-3">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %><%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %><%= render 'spree/admin/shared/new_resource_links' %>diff --git a/admin/app/views/spree/admin/invitations/_invitation.html.erb b/admin/app/views/spree/admin/invitations/_invitation.html.erbindex 8ee1f64f32..5b640948ad 100644--- a/admin/app/views/spree/admin/invitations/_invitation.html.erb+++ b/admin/app/views/spree/admin/invitations/_invitation.html.erb@@ -21,7 +21,7 @@<span class="badge badge-warning"><%= Spree.t(:expired) %></span><% else %><span class="badge badge-light"><%= Spree.t(:pending) %></span>- <p class="text-muted font-size-sm mb-0 mt-2 pl-1">Expires at: <%= spree_time(invitation.expires_at) %></p>+ <p class="text-gray-600 text-sm mb-0 mt-2 pl-1">Expires at: <%= spree_time(invitation.expires_at) %></p><% end %></td><td class="w-10">@@ -29,7 +29,7 @@</td><td class="w-10 actions"><% if invitation.pending? && !invitation.expired? %>- <%= dropdown do %>+ <%= dropdown portal: false do %><%= dropdown_toggle class: 'btn-light btn-sm' do %><%= icon('dots-vertical', class: 'mr-0') %><% end %>@@ -43,7 +43,7 @@class: "dropdown-item",data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %><%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_invitation_path(invitation),- class: "dropdown-item btn-danger",+ class: "dropdown-item text-red-600 hover:bg-red-100",data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } if can?(:destroy, invitation) %><% end %><% end %>diff --git a/admin/app/views/spree/admin/invitations/index.html.erb b/admin/app/views/spree/admin/invitations/index.html.erbindex fc6e8fe57e..37fc9953f7 100644--- a/admin/app/views/spree/admin/invitations/index.html.erb+++ b/admin/app/views/spree/admin/invitations/index.html.erb@@ -10,11 +10,11 @@<table class="table"><thead><tr>- <th scope="col" class="rounded-lg-top-left"><%= Spree.t(:email) %></th>+ <th scope="col" class="rounded-xl-top-left"><%= Spree.t(:email) %></th><th scope="col"><%= I18n.t('activerecord.attributes.spree/invitation.inviter') %></th><th scope="col"><%= Spree.t(:role_id) %></th><th scope="col"><%= Spree.t(:status) %></th>- <th scope="col" class="rounded-lg-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>+ <th scope="col" class="rounded-xl-top-right"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th><th scope="col"></th></tr></thead>diff --git a/admin/app/views/spree/admin/invitations/show.html.erb b/admin/app/views/spree/admin/invitations/show.html.erbindex d87318573e..7b79555eba 100644--- a/admin/app/views/spree/admin/invitations/show.html.erb+++ b/admin/app/views/spree/admin/invitations/show.html.erb@@ -1,4 +1,4 @@-<div class="d-flex align-items-center gap-2 mb-4">+<div class="flex items-center gap-2 mb-6"><div><%= render_avatar(@invitation.inviter, height: 32, width: 32) %></div>@@ -6,4 +6,4 @@<strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong></div></div>-<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary mx-auto px-5', data: { turbo_method: :put } %>\ No newline at end of file+<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary mx-auto px-12', data: { turbo_method: :put } %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/json_previews/show.html.erb b/admin/app/views/spree/admin/json_previews/show.html.erbindex 0c691b9ae9..100c015947 100644--- a/admin/app/views/spree/admin/json_previews/show.html.erb+++ b/admin/app/views/spree/admin/json_previews/show.html.erb@@ -9,24 +9,24 @@<a class="nav-link" data-tabs-target="tab" data-action="click->tabs#select"><%= Spree.t('apis.platform') %></a></li></ul>- <div data-tabs-target="panel" class="animate__animated">+ <div data-tabs-target="panel" class="animate-fade-in"><% if storefront_serializer_exists?(@object) %>- <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :storefront) %></code></pre>+ <pre class="m-0"><code data-highlight-target="code" class="language-json block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :storefront) %></code></pre><% else %>- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">- <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>+ <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col">+ <%= icon 'map-search', class: 'mb-12 opacity-50 text-4xl' %><p><%= Spree.t('admin.json_preview.no_api_response') %></p></div><% end %></div>- <div data-tabs-target="panel" class="animate__animated" hidden>+ <div data-tabs-target="panel" class="animate-fade-in" hidden><% if platform_serializer_exists?(@object) %>- <pre class="m-0"><code data-highlight-target="code" class="language-json d-block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :platform) %></code></pre>+ <pre class="m-0"><code data-highlight-target="code" class="language-json block overflow-auto" style="height: calc(100dvh - 11rem);"><%= serialize_to_json(@object, api_type: :platform) %></code></pre><% else %>- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">- <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>+ <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col">+ <%= icon 'map-search', class: 'mb-12 opacity-50 text-4xl' %><p><%= Spree.t('admin.json_preview.no_api_response') %></p>diff --git a/admin/app/views/spree/admin/line_items/edit.html.erb b/admin/app/views/spree/admin/line_items/edit.html.erbindex f46a96f4fa..367e225d72 100644--- a/admin/app/views/spree/admin/line_items/edit.html.erb+++ b/admin/app/views/spree/admin/line_items/edit.html.erb@@ -1,5 +1,5 @@<%= turbo_frame_tag dom_id(@line_item) do %>- <div class="order-line-items__form d-flex align-items-center">+ <div class="order-line-items__form flex items-center"><div class="w-35"><%= render 'spree/admin/variants/variant', variant: @line_item.variant %></div>@@ -7,10 +7,10 @@<%= @line_item.single_money.to_html %></div>- <div class="w-40 border rounded p-2 bg-white shadow-xs mx-auto">- <%= form_with model: @line_item, url: spree.admin_order_line_item_path(@order, @line_item), class: "d-flex align-items-center gap-2 justify-content-between" do |f| %>+ <div class="w-40 border rounded-lg p-2 bg-white shadow-xs mx-auto">+ <%= form_with model: @line_item, url: spree.admin_order_line_item_path(@order, @line_item), class: "flex items-center gap-2 justify-between" do |f| %><%= f.label :quantity, Spree.t('quantity'), class: 'm-0' %>- <%= f.number_field :quantity, class: 'form-control form-control-sm', required: true, max: @line_item.variant.should_track_inventory? && !@line_item.variant.backorderable? ? @line_item.variant.total_on_hand + @line_item.quantity : nil, min: 1, autofocus: true %>+ <%= f.number_field :quantity, class: 'form-input form-input-sm', required: true, max: @line_item.variant.should_track_inventory? && !@line_item.variant.backorderable? ? @line_item.variant.total_on_hand + @line_item.quantity : nil, min: 1, autofocus: true %><%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %><%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>diff --git a/admin/app/views/spree/admin/line_items/new.html.erb b/admin/app/views/spree/admin/line_items/new.html.erbindex 89ed2a397d..5d17674aa7 100644--- a/admin/app/views/spree/admin/line_items/new.html.erb+++ b/admin/app/views/spree/admin/line_items/new.html.erb@@ -5,22 +5,22 @@<%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %><%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %><%= form.hidden_field :param_name, value: 'line_item' %>- <%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>+ <%= form.search_field :q, value: params[:q], class: 'form-input', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %><%= form.hidden_field :currency, value: @order.currency %><% end %></div><%= form_with model: @line_item, url: spree.admin_order_line_items_path(@order), data: {turbo_frame: '_top'} do |form| %><div class="dialog-body"><div id="variants_search_results" class="search-results">- <p class="text-muted text-center py-5">+ <p class="text-gray-600 text-center py-12"><%= Spree.t(:start_typing_to_search_for_variants) %></p></div></div><div class="dialog-footer">- <div class="d-flex gap-2 m-0 align-items-center mr-auto">+ <div class="flex gap-2 m-0 items-center mr-auto"><%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>- <%= form.number_field :quantity, class: "form-control", min: 1 %>+ <%= form.number_field :quantity, class: "form-input", min: 1 %></div><%= turbo_save_button_tag Spree.t(:add_selected_variant), disabled: true, data: { search_picker_target: :submit } %></div>diff --git a/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb b/admin/app/views/spree/admin/metafield_definitions/_filters.html.erbindex 2a659e7d60..5ff1a6ecdb 100644--- a/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb+++ b/admin/app/views/spree/admin/metafield_definitions/_filters.html.erb@@ -1,12 +1,12 @@<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters auto-submit"} do |f| %>- <div class="d-flex">+ <div class="flex"><%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, label: Spree.t(:title) %><%= select_tag 'q[resource_type_eq]',options_for_select(metafield_definition_resource_types, params.dig(:q, :resource_type_eq)),{include_blank: Spree.t(:all),- class: 'custom-select w-20',+ class: 'form-select w-20',data: {filters_target: :input,action: 'auto-submit#submit'diff --git a/admin/app/views/spree/admin/metafield_definitions/_form.html.erb b/admin/app/views/spree/admin/metafield_definitions/_form.html.erbindex a41668e5a5..2a565996d8 100644--- a/admin/app/views/spree/admin/metafield_definitions/_form.html.erb+++ b/admin/app/views/spree/admin/metafield_definitions/_form.html.erb@@ -1,14 +1,14 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><div class="form-group"><%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %></div>- <div class="row">- <div class="form-group col-lg-4">+ <div class="grid grid-cols-12 gap-6">+ <div class="form-group col-span-12 lg:col-span-4"><%= f.spree_text_field :namespace, required: true, placeholder: 'eg. custom' %></div>- <div class="form-group col-lg-8">+ <div class="form-group col-span-12 lg:col-span-8"><%= f.spree_text_field :key, required: true, placeholder: 'eg. id' %></div></div>@@ -28,12 +28,12 @@<div class="form-group"><%= f.label :resource_type, Spree.t(:resource) %>- <p class="font-weight-bold"><%= f.object.resource_type.demodulize.titleize %></p>+ <p class="font-bold"><%= f.object.resource_type.demodulize.titleize %></p></div><div class="form-group"><%= f.label :metafield_type, Spree.t(:type) %>- <p class="font-weight-bold"><%= f.object.metafield_type.demodulize.titleize %></p>+ <p class="font-bold"><%= f.object.metafield_type.demodulize.titleize %></p></div><% end %>diff --git a/admin/app/views/spree/admin/metafield_definitions/_table_row.html.erb b/admin/app/views/spree/admin/metafield_definitions/_table_row.html.erbindex 14a76784d4..0bb10552a5 100644--- a/admin/app/views/spree/admin/metafield_definitions/_table_row.html.erb+++ b/admin/app/views/spree/admin/metafield_definitions/_table_row.html.erb@@ -5,7 +5,7 @@<td><span class="badge badge-light"><%= metafield_definition.metafield_type.demodulize.titleize %></span></td><td><%= form_with model: metafield_definition, url: admin_metafield_definition_path(metafield_definition), method: :patch, data: { controller: 'auto-submit' } do |f| %>- <%= f.select :display_on, display_on_options(Spree::MetafieldDefinition), {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :display_on, display_on_options(Spree::MetafieldDefinition), {}, { class: 'form-select form-select-sm w-auto', data: { action: 'auto-submit#submit' } } %><% end %></td><td>@@ -13,7 +13,7 @@<%= metafield_definition.metafields.count %><%= Spree.t(metafield_definition.resource_type.demodulize.pluralize.to_sym) %><% else %>- <span class="text-muted"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></td><td class="text-right">diff --git a/admin/app/views/spree/admin/metafields/edit.html.erb b/admin/app/views/spree/admin/metafields/edit.html.erbindex c420831738..0cf8b0a1fe 100644--- a/admin/app/views/spree/admin/metafields/edit.html.erb+++ b/admin/app/views/spree/admin/metafields/edit.html.erb@@ -9,15 +9,15 @@<%= metafield_form.hidden_field :type %><% metafield_definition = metafield_form.object.metafield_definition %><div class="form-group">- <div class="d-flex justify-content-between">+ <div class="flex justify-between"><%= metafield_form.label :value do %><strong><%= metafield_definition.name %></strong>- <small class="text-muted mt-2"><code><%= metafield_definition.full_key %></code></small>+ <small class="text-gray-600 mt-2"><code><%= metafield_definition.full_key %></code></small><% end %><% if metafield_definition.display_on == 'back_end' %><span data-controller="tooltip">- <%= icon('eye-off', class: 'text-muted') %>+ <%= icon('eye-off', class: 'text-gray-600') %><%= tooltip(Spree.t("admin.display_on_options.#{metafield_definition.display_on}")) %></span><% end %>@@ -33,10 +33,10 @@<% end %><% else %><div class="drawer-body">- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">- <%= icon 'map-search', class: 'mb-3', style: 'font-size: 2rem;' %>+ <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col gap-4">+ <%= icon 'map-search', class: 'text-4xl' %><p>No metafield definitions configured for <%= model_class.name.demodulize.titleize.pluralize %>.</p>- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_metafield_definition_path(resource_type: model_class.to_s), class: 'btn btn-primary ml-3', data: { 'turbo-frame': '_top' } if can?(:create, Spree::MetafieldDefinition) %>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_metafield_definition_path(resource_type: model_class.to_s), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } if can?(:create, Spree::MetafieldDefinition) %></div></div><% end %>diff --git a/admin/app/views/spree/admin/metafields/types/_boolean.html.erb b/admin/app/views/spree/admin/metafields/types/_boolean.html.erbindex 4d8fcbbda9..8f9a6f997b 100644--- a/admin/app/views/spree/admin/metafields/types/_boolean.html.erb+++ b/admin/app/views/spree/admin/metafields/types/_boolean.html.erb@@ -1,4 +1,4 @@-<div class="custom-control custom-checkbox">+<div class="custom-control form-checkbox"><%= f.check_box :value, class: 'custom-control-input', checked: f.object.value&.to_b %><%= f.label :value, Spree.t(:say_yes), class: 'custom-control-label' %></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/metafields/types/_json.html.erb b/admin/app/views/spree/admin/metafields/types/_json.html.erbindex 0be02eaa3f..c819a452aa 100644--- a/admin/app/views/spree/admin/metafields/types/_json.html.erb+++ b/admin/app/views/spree/admin/metafields/types/_json.html.erb@@ -1,4 +1,4 @@-<div data-controller="codemirror" data-codemirror-language-value="json" class="form-control h-auto overflow-hidden p-0">+<div data-controller="codemirror" data-codemirror-language-value="json" class="form-input h-auto overflow-hidden p-0"><div data-codemirror-target="editor"></div><%= f.text_area :value, data: { codemirror_target: 'input' }, class: 'invisible' %></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/metafields/types/_long_text.html.erb b/admin/app/views/spree/admin/metafields/types/_long_text.html.erbindex 41e818b155..9b47e0b618 100644--- a/admin/app/views/spree/admin/metafields/types/_long_text.html.erb+++ b/admin/app/views/spree/admin/metafields/types/_long_text.html.erb@@ -1 +1 @@- <%= f.text_area :value, class: 'form-control', data: { controller: 'textarea-autogrow' } %>\ No newline at end of file+ <%= f.text_area :value, class: 'form-input', data: { controller: 'textarea-autogrow' } %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/metafields/types/_number.html.erb b/admin/app/views/spree/admin/metafields/types/_number.html.erbindex 0b57f469df..01773d183b 100644--- a/admin/app/views/spree/admin/metafields/types/_number.html.erb+++ b/admin/app/views/spree/admin/metafields/types/_number.html.erb@@ -1 +1 @@-<%= f.number_field :value, class: 'form-control' %>\ No newline at end of file+<%= f.number_field :value, class: 'form-input' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/metafields/types/_short_text.html.erb b/admin/app/views/spree/admin/metafields/types/_short_text.html.erbindex b31f2dda67..0a04b1ef1a 100644--- a/admin/app/views/spree/admin/metafields/types/_short_text.html.erb+++ b/admin/app/views/spree/admin/metafields/types/_short_text.html.erb@@ -1 +1 @@-<%= f.text_field :value, class: 'form-control' %>\ No newline at end of file+<%= f.text_field :value, class: 'form-input' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb b/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erbindex c9e9c20860..a135b90c08 100644--- a/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb+++ b/admin/app/views/spree/admin/newsletter_subscribers/_filters.html.erb@@ -1,10 +1,10 @@<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :email_cont, label: Spree.t(:email) %><%= dropdown do %><%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>- <span class="text-muted font-weight-normal mr-1">+ <span class="text-gray-600 font-normal mr-1"><%= Spree.t(:show) %></span><%# Show current filter value %>diff --git a/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erb b/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erbindex 16ae85ab3f..003adad22d 100644--- a/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erb+++ b/admin/app/views/spree/admin/newsletter_subscribers/_table_row.html.erb@@ -3,11 +3,11 @@<%= newsletter_subscriber.email %><%= clipboard_component(newsletter_subscriber.email) %></td>- <td class="w-25">+ <td class="w-1/4"><% if newsletter_subscriber.user.present? %><%= link_to newsletter_subscriber.user.full_name, spree.admin_user_path(newsletter_subscriber.user) %><% else %>- <span class="text-muted"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></td><td class="w-10">@@ -17,7 +17,7 @@<% if newsletter_subscriber.verified_at.present? %><%= spree_date(newsletter_subscriber.verified_at) %><% else %>- <span class="text-muted"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></td><td class="w-15">diff --git a/admin/app/views/spree/admin/oauth_applications/_form.html.erb b/admin/app/views/spree/admin/oauth_applications/_form.html.erbindex efaf56b23d..05dd642a0b 100644--- a/admin/app/views/spree/admin/oauth_applications/_form.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %><%= f.spree_select :scopes, [['Read Only', 'admin read'], ['Read & Write', 'admin write']], { selected: @oauth_application.scopes.to_s }, { required: true } %>diff --git a/admin/app/views/spree/admin/oauth_applications/_table_row.html.erb b/admin/app/views/spree/admin/oauth_applications/_table_row.html.erbindex 7b9effe32a..062f84f630 100644--- a/admin/app/views/spree/admin/oauth_applications/_table_row.html.erb+++ b/admin/app/views/spree/admin/oauth_applications/_table_row.html.erb@@ -1,11 +1,11 @@<tr id="<%= spree_dom_id oauth_application %>"><td class="w-20"><code><%= oauth_application.name %></code></td><td class="w-40">- <div class="d-flex gap-2 align-items-center" data-controller="password-toggle">+ <div class="flex gap-2 items-center" data-controller="password-toggle"><%= button_tag class: 'btn btn-light btn-sm px-1', data: { action: 'click->password-toggle#password' } do %><%= icon 'eye', class: 'mr-0' %><% end %>- <%= password_field_tag :password, oauth_application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>+ <%= password_field_tag :password, oauth_application.uid, class: 'form-input-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %></div></td><td class="w-15">@@ -25,7 +25,7 @@<% if oauth_application.last_used_at %><%= spree_time(oauth_application.last_used_at) %><% else %>- <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>+ <span class="text-gray-600"><%= Spree.t('admin.oauth_applications.never') %></span><% end %></td><td class="actions w-10">diff --git a/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erb b/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erbindex f0f3434b6d..84b00d2cd5 100644--- a/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erb+++ b/admin/app/views/spree/admin/oauth_applications/create.turbo_stream.erb@@ -1,28 +1,28 @@<%= turbo_stream.replace "new_oauth_application" do %>- <div class="row">- <div class="col-lg-6 offset-lg-3">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><div class="card"><div class="card-body"><div class="form-group"><%= label_tag :client_id, Spree.t('admin.oauth_applications.client_id') %>- <div class="d-flex gap-2 align-items-center">- <%= text_field_tag :client_id, @object.uid, class: 'form-control-plaintext bg-light rounded', readonly: true %>+ <div class="flex gap-2 items-center">+ <%= text_field_tag :client_id, @object.uid, class: 'form-input-plaintext bg-gray-25 rounded', readonly: true %><%= clipboard_component(@object.uid) %></div></div><div class="form-group"><%= label_tag :client_secret, Spree.t('admin.oauth_applications.client_secret') %>- <div class="d-flex gap-2 align-items-center">- <%= text_field_tag :client_secret, @object.plaintext_secret, class: 'form-control-plaintext bg-light rounded', readonly: true %>+ <div class="flex gap-2 items-center">+ <%= text_field_tag :client_secret, @object.plaintext_secret, class: 'form-input-plaintext bg-gray-25 rounded', readonly: true %><%= clipboard_component(@object.plaintext_secret) %></div>- <div class="alert alert-warning mt-3">+ <div class="alert alert-warning mt-6">This is your application's secret token, copy it now and keep it safe. It won't be shown again.</div></div></div>- <div class="card-footer border-top">+ <div class="card-footer border-t"><%= link_to 'Back to list', spree.admin_oauth_applications_url, class: 'btn btn-light' %></div></div>diff --git a/admin/app/views/spree/admin/option_types/_form.html.erb b/admin/app/views/spree/admin/option_types/_form.html.erbindex feb7ffa38f..03e37ae150 100644--- a/admin/app/views/spree/admin/option_types/_form.html.erb+++ b/admin/app/views/spree/admin/option_types/_form.html.erb@@ -1,19 +1,19 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_information) %></h5></div><div class="card-body" data-controller="slug-form">- <div class="row mb-3">- <div class="col-md-6">+ <div class="grid grid-cols-12 gap-6 mb-6">+ <div class="col-span-12 md:col-span-6"><%= f.spree_text_field :presentation, required: true, autofocus: f.object.new_record?, data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' }, help_text: "This is used to display the option type on the storefront." %></div>- <div class="col-md-6">+ <div class="col-span-12 md:col-span-6"><%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, help_text: raw("This is used internally to identify the option type. <strong>It must be unique.</strong>") %></div></div>- <div class="row">- <div class="col-12 col-md-6">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 md:col-span-6"><%= f.spree_check_box :filterable, help_text: raw(Spree.t('option_type_filterable_info')) %></div></div>@@ -26,15 +26,15 @@<% end %></template>- <div class="card mb-4">- <div class="card-header d-flex justify-content-between align-items-center">+ <div class="card mb-6">+ <div class="card-header flex justify-between items-center"><h5 class="card-title"><%= Spree.t(:option_values) %></h5></div><div class="card-body p-0"><div class="table-responsive"><table class="table"><thead>- <tr class="border-bottom">+ <tr class="border-b"><th scope="col"></th><th scope="col"><%= raw(Spree.t(:presentation) + required_span_tag) %></th><th scope="col"><%= raw(Spree.t(:internal_name) + required_span_tag) %></th>@@ -52,7 +52,7 @@<tr class="hover-none"><td colspan="4" class="text-center p-2">- <button type="button" data-action="nested-form#add" class="btn btn-secondary py-3 w-100" id="add_option_value_button">+ <button type="button" data-action="nested-form#add" class="btn btn-secondary py-3 w-full" id="add_option_value_button"><%= icon('plus') %><%= Spree.t(:add_one) %></button>diff --git a/admin/app/views/spree/admin/option_types/_option_value_fields.html.erb b/admin/app/views/spree/admin/option_types/_option_value_fields.html.erbindex 9958a40b56..697962ac8e 100644--- a/admin/app/views/spree/admin/option_types/_option_value_fields.html.erb+++ b/admin/app/views/spree/admin/option_types/_option_value_fields.html.erb@@ -10,15 +10,15 @@><td class="w-5 <%= f.object.id.present? ? 'move-handle text-center' : 'text-center' %>"><% if f.object.id.present? %>- <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>+ <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2') %><% end %><%= f.hidden_field :id %></td><td class="w-45 presentation">- <%= f.text_field :presentation, class: "form-control", data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>+ <%= f.text_field :presentation, class: "form-input", data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %></td><td class="w-40 name">- <%= f.text_field :name, class: "form-control", data: { slug_form_target: :url } %>+ <%= f.text_field :name, class: "form-input", data: { slug_form_target: :url } %></td><td class="w-10 actions"><button type="button" class="btn btn-danger btn-sm remove_option_value_button" data-action="nested-form#remove">diff --git a/admin/app/views/spree/admin/option_types/_table_row.html.erb b/admin/app/views/spree/admin/option_types/_table_row.html.erbindex aada999284..520885773b 100644--- a/admin/app/views/spree/admin/option_types/_table_row.html.erb+++ b/admin/app/views/spree/admin/option_types/_table_row.html.erb@@ -1,9 +1,9 @@<tr id="<%= spree_dom_id option_type %>" data-controller="row-link" data-sortable-update-url="<%= spree.admin_option_type_path(option_type) %>"><td class="move-handle text-center w-5">- <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>+ <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2') %></td><td class="w-20 cursor-pointer" data-action="click->row-link#openLink"><code><%= option_type.name %></code></td>- <td class="w-35 cursor-pointer font-weight-bold" data-action="click->row-link#openLink"><%= option_type.presentation %></td>+ <td class="w-35 cursor-pointer font-bold" data-action="click->row-link#openLink"><%= option_type.presentation %></td><td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= active_badge(option_type.filterable) %></td>diff --git a/admin/app/views/spree/admin/option_types/edit.html.erb b/admin/app/views/spree/admin/option_types/edit.html.erbindex 4db67105be..e140c563e2 100644--- a/admin/app/views/spree/admin/option_types/edit.html.erb+++ b/admin/app/views/spree/admin/option_types/edit.html.erb@@ -1,12 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_option_types_url %>- <%= @option_type.presentation %>-<% end %>---<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>--<%= form_for [:admin, @option_type], data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>-<% end %>+<%= render 'spree/admin/shared/edit_resource', data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/option_types/new.html.erb b/admin/app/views/spree/admin/option_types/new.html.erbindex 38a4d7b977..3f26ed56fa 100644--- a/admin/app/views/spree/admin/option_types/new.html.erb+++ b/admin/app/views/spree/admin/option_types/new.html.erb@@ -1,11 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_option_types_path %>- <%= Spree.t(:new_option_type) %>-<% end %>--<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>--<%= form_for [:admin, @option_type], data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>-<% end %>+<%= render 'spree/admin/shared/new_resource', data: { controller: 'nested-form', nested_form_wrapper_selector_value: '.nested-form-wrapper' } %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/_customer.html.erb b/admin/app/views/spree/admin/orders/_customer.html.erbindex 25ad2cb292..ef8f9801de 100644--- a/admin/app/views/spree/admin/orders/_customer.html.erb+++ b/admin/app/views/spree/admin/orders/_customer.html.erb@@ -1,4 +1,4 @@-<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-4 blur-busy" do %>+<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-6 blur-busy" do %><div class="card-header"><h5 class="card-title"><%= Spree.t(:customer) %>@@ -18,7 +18,7 @@<% end %><% if can?(:update_customer, @order) %><% if @order.user.present? %>- <%= link_to Spree.t('admin.orders.remove_user_from_this_order'), spree.admin_order_user_path(@order), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: :_top } %>+ <%= link_to Spree.t('admin.orders.remove_user_from_this_order'), spree.admin_order_user_path(@order), class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: :_top } %><% else %><%= link_to Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: 'dropdown-item' %><% end %>@@ -30,47 +30,47 @@<div class="card-body"><% unless defined?(current_vendor) && current_vendor %><% unless @order.user.present? %>- <h6><%= Spree.t(:contact_information) %></h6>+ <h5><%= Spree.t(:contact_information) %></h5><% end %>- <div class='card-text d-flex flex-col'>+ <div class='card-text flex flex-col'><% if @order.user.present? %><%= render 'spree/admin/shared/user', user: @order.user %><%= render 'spree/admin/orders/user_overview', user: @order.user %><% elsif @order.email.present? %>- <div class="d-flex align-items-center w-100">+ <div class="flex items-center w-full gap-2 py-2"><%= mail_to @order.email, @order.email, class: 'text-blue' %><%= clipboard_component(@order.email) %></div><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:no_email_provided) %></span><% end %><% if [email protected]? && can?(:update_customer, @order) %>- <%= link_to_with_icon 'plus', Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: "btn btn-secondary mt-3" %>+ <%= link_to_with_icon 'plus', Spree.t('admin.orders.add_user_to_this_order'), spree.new_admin_order_user_path(@order), class: "btn btn-secondary mt-4" %><% end %></div><% end %>- <h6 class="<%= defined?(current_vendor) && current_vendor ? "" : "mt-4" %> font-weight-bold"><%= Spree.t(:shipping_address) %></h6>+ <h6 class="font-bold mt-6 mb-2"><%= Spree.t(:shipping_address) %></h6><%= turbo_frame_tag :order_ship_address do %><% if @order.ship_address.present? %><%= render 'spree/admin/shared/address', address: @order.ship_address %><% elsif can?(:update_addresses, @order) %>- <%= link_to_with_icon 'plus', Spree.t(:new_shipping_address), spree.new_admin_order_shipping_address_path(@order), class: "btn btn-secondary w-100", data: { turbo_frame: 'dialog', action: 'dialog#open' } %>+ <%= link_to_with_icon 'plus', Spree.t(:new_shipping_address), spree.new_admin_order_shipping_address_path(@order), class: "btn btn-secondary w-full", data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% else %>- <span class="text-muted"><%= Spree.t(:no_shipping_address_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:no_shipping_address_available) %></span><% end %><% end %>- <h6 class="mt-4 font-weight-bold"><%= Spree.t(:billing_address) %></h6>+ <h6 class="font-bold mt-6 mb-2"><%= Spree.t(:billing_address) %></h6><%= turbo_frame_tag :order_bill_address do %><% if @order.shipping_eq_billing_address? && @order.bill_address.present? %>- <span class="text-muted"><%= Spree.t(:same_as_shipping_address) %></span>+ <span class="text-gray-600"><%= Spree.t(:same_as_shipping_address) %></span><% elsif @order.bill_address.present? %><%= render 'spree/admin/shared/address', address: @order.bill_address %><% elsif can?(:update_addresses, @order) %>- <%= link_to_with_icon 'plus', Spree.t(:new_billing_address), spree.new_admin_order_billing_address_path(@order), class: "btn btn-secondary w-100", data: { turbo_frame: 'dialog', action: 'dialog#open' } %>+ <%= link_to_with_icon 'plus', Spree.t(:new_billing_address), spree.new_admin_order_billing_address_path(@order), class: "btn btn-secondary w-full", data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% else %>- <span class="text-muted"><%= Spree.t(:no_billing_address_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:no_billing_address_available) %></span><% end %><% end %></div>diff --git a/admin/app/views/spree/admin/orders/_customer_returns.html.erb b/admin/app/views/spree/admin/orders/_customer_returns.html.erbindex 5c891f03c3..cc1757ef32 100644--- a/admin/app/views/spree/admin/orders/_customer_returns.html.erb+++ b/admin/app/views/spree/admin/orders/_customer_returns.html.erb@@ -1,13 +1,13 @@<% if @customer_returns.exists? && can?(:read, Spree::CustomerReturn) %>- <div class="card mb-4">- <div class="card-header justify-content-between">+ <div class="card mb-6">+ <div class="card-header justify-between"><h5 class="card-title"><%= Spree.t(:customer_returns) %></h5></div><div class="card-body p-0"><div class="table-responsive"><table class="table">- <thead class="border-bottom">+ <thead class="border-b"><tr><th scope="col"><%= Spree.t(:date) %></th><th scope="col"><%= Spree.t(:status) %></th>diff --git a/admin/app/views/spree/admin/orders/_customer_summary.html.erb b/admin/app/views/spree/admin/orders/_customer_summary.html.erbindex 79fc43f83f..153ddb2340 100644--- a/admin/app/views/spree/admin/orders/_customer_summary.html.erb+++ b/admin/app/views/spree/admin/orders/_customer_summary.html.erb@@ -1,19 +1,19 @@<% if order %><% if order.user %>- <span class="d-flex">+ <span class="flex"><% if can?(:manage, order.user) %>- <%= link_to order.full_name, spree.admin_user_path(order.user), class: 'text-dark', data: { 'turbo-frame': '_top' } %>+ <%= link_to order.full_name, spree.admin_user_path(order.user), class: 'text-gray-900', data: { 'turbo-frame': '_top' } %><% else %><%= order.full_name %><% end %></span><% elsif order.email.present? %>- <span class="text-muted">+ <span class="text-gray-600"><%= order.full_name %></span><%= help_bubble('This order was placed by a guest customer') %><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %>diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erbindex 292ca82fe6..63fbe2a66d 100644--- a/admin/app/views/spree/admin/orders/_filters.html.erb+++ b/admin/app/views/spree/admin/orders/_filters.html.erb@@ -19,7 +19,7 @@} do |f| %><%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %><% if controller_name == 'checkouts' %>@@ -37,7 +37,7 @@<% end %><%= render "spree/admin/orders/table_filter_dropdown" %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>@@ -64,20 +64,20 @@<% unless @user %><div class="form-group"><%= label_tag :q_bill_address_firstname_i_cont_any, Spree.t(:first_name) %>- <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>+ <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-input", data: { filters_target: :input } %></div><div class="form-group"><%= label_tag :q_bill_address_lastname_eq, Spree.t(:last_name) %>- <%= f.text_field :bill_address_lastname_eq, class: "form-control", data: { filters_target: :input } %>+ <%= f.text_field :bill_address_lastname_eq, class: "form-input", data: { filters_target: :input } %></div><div class="form-group"><%= label_tag :q_email_eq, Spree.t(:email) %>- <%= f.email_field :email_eq, class: "form-control", data: { filters_target: :input } %>+ <%= f.email_field :email_eq, class: "form-input", data: { filters_target: :input } %></div><% end %><div class="form-group"><%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>- <%= f.text_field :line_items_variant_sku_eq, class: "form-control", data: { filters_target: :input } %>+ <%= f.text_field :line_items_variant_sku_eq, class: "form-input", data: { filters_target: :input } %></div><div class="form-group">@@ -100,7 +100,7 @@<%= f.select :payment_state_eq,payment_state_options,{ include_blank: true },- { class: "custom-select", data: { filters_target: :input } } %>+ { class: "form-select", data: { filters_target: :input } } %></div><%= render_admin_partials(:orders_filters_partials, f: f) %>diff --git a/admin/app/views/spree/admin/orders/_form.html.erb b/admin/app/views/spree/admin/orders/_form.html.erbindex fc83260d8f..72721ab1b7 100644--- a/admin/app/views/spree/admin/orders/_form.html.erb+++ b/admin/app/views/spree/admin/orders/_form.html.erb@@ -7,6 +7,6 @@<%= tom_select_tag 'order[user_id]', { include_blank: Spree.t(:select_user), options: users_for_select_options } %></div>-<p class="text-center text-muted my-0"><%= Spree.t(:or) %></p>+<p class="text-center text-gray-600 my-0"><%= Spree.t(:or) %></p><%= f.spree_email_field :email, autofocus: f.object.new_record?, label: Spree.t('admin.orders.provide_email') %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/_header.html.erb b/admin/app/views/spree/admin/orders/_header.html.erbindex c98bc9039b..5c854c21bb 100644--- a/admin/app/views/spree/admin/orders/_header.html.erb+++ b/admin/app/views/spree/admin/orders/_header.html.erb@@ -9,7 +9,7 @@<%= order_payment_state(@order) %><%= order_shipment_state(@order) %><% if @order.completed? %>- <span class="text-muted font-size-sm font-weight-normal">+ <span class="text-gray-600 text-sm font-normal"><%= I18n.t('activerecord.attributes.spree/order.completed_at') %><%= spree_time_ago(@order.completed_at) %></span>@@ -60,7 +60,7 @@<% if can?(:cancel, @order) %><div class="dropdown-divider"></div><%= link_to spree.cancel_admin_order_path(@order),- class: 'text-left btn-danger dropdown-item',+ class: 'dropdown-item text-danger hover:bg-red-100',data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } do %><%= icon "cancel" %><%= Spree.t(:cancel_order) %>diff --git a/admin/app/views/spree/admin/orders/_line_item.html.erb b/admin/app/views/spree/admin/orders/_line_item.html.erbindex 492aacc284..b0f68286d6 100644--- a/admin/app/views/spree/admin/orders/_line_item.html.erb+++ b/admin/app/views/spree/admin/orders/_line_item.html.erb@@ -1,5 +1,5 @@<%= turbo_frame_tag dom_id(line_item) do %>- <div class="order-line-items__form d-flex align-items-center">+ <div class="order-line-items__form flex items-center"><div class="w-35"><%= render "spree/admin/variants/variant", variant: line_item.variant %></div>@@ -46,7 +46,7 @@<% if can?(:destroy, line_item) %><div class="dropdown-divider"></div>- <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item btn-danger' %>+ <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item text-red-600 hover:bg-red-100' %><% end %><% end %><% end %>diff --git a/admin/app/views/spree/admin/orders/_line_items.html.erb b/admin/app/views/spree/admin/orders/_line_items.html.erbindex 4ca9f46d74..fb1f4b8498 100644--- a/admin/app/views/spree/admin/orders/_line_items.html.erb+++ b/admin/app/views/spree/admin/orders/_line_items.html.erb@@ -1,52 +1,59 @@<% if @line_items.any? %>- <details class="card mb-4" <% if [email protected]? || params[:line_item_updated].present? %>open<% end %>>- <summary class="card-header d-flex justify-content-between align-items-center list-style-none cursor-pointer border-0 bg-transparent">- <h5 class="card-title d-flex align-items-center">+ <% line_items_expanded = [email protected]? || params[:line_item_updated].present? %>+ <div class="card mb-6" data-controller="reveal" data-reveal-hidden-class="is-collapsed">+ <div class="card-header card-header--collapsible flex justify-between items-center cursor-pointer border-0 bg-transparent"+ data-action="click->reveal#toggle">+ <h5 class="card-title flex items-center"><%= icon('shopping-cart', class: 'mr-2') %><%= Spree.t(:line_items) %><span class="badge badge-info ml-2"><%= @line_items.count %></span></h5>- <div class="d-flex gap-2">+ <div class="flex gap-2"><% if can?(:create, Spree::LineItem.new(order: @order)) %>- <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary btn-sm" %>+ <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open click->reveal:stop' }, class: "btn btn-secondary btn-sm" %><% end %>- <span class="btn btn-light btn-sm d-inline-flex align-items-center">+ <span class="btn btn-light btn-sm inline-flex items-center"><%= Spree.t(:show_details) %>- <%= icon('selector', class: 'mr-0 ml-1 arrow') %>+ <%= icon('selector', class: 'mr-0 ml-1 transition-transform duration-200') %></span></div>- </summary>- <div class="card-body mb-0 p-0" id="line-items">- <div class="d-flex align-items-center text-muted border-bottom py-2 px-3 font-size-sm order-line-items__row bg-light border-top">- <div class="w-35">- <%= Spree.t(:item_description) %>- </div>- <div class="w-10">- <%= Spree.t(:price) %>- </div>- <div class="w-10">- <%= Spree.t(:quantity) %>- </div>- <div class="w-10">- <%= Spree.t(:subtotal) %>- </div>- <div class="w-10">- <%= Spree.t(:tax) %>- </div>- <div class="w-10">- <%= Spree.t(:discount) %>- </div>- <div class="w-10">- <%= Spree.t(:total) %>- </div>- <div class="w-5">+ </div>+ <div data-reveal-target="item"+ class="collapsible-content <%= 'is-collapsed' unless line_items_expanded %>">+ <div>+ <div class="card-body mb-0 p-0" id="line-items">+ <div class="flex items-center text-gray-600 border-b py-2 px-4 text-sm order-line-items__row bg-gray-25 border-t">+ <div class="w-35">+ <%= Spree.t(:item_description) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:price) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:quantity) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:subtotal) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:tax) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:discount) %>+ </div>+ <div class="w-10">+ <%= Spree.t(:total) %>+ </div>+ <div class="w-5">+ </div>+ </div>+ <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %></div></div>- <%= render collection: @line_items, partial: 'spree/admin/orders/line_item', cached: spree_base_cache_scope %></div>- </details>+ </div><% elsif can?(:create, Spree::LineItem.new(order: @order)) %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= icon('shopping-cart', class: 'mr-2') %>@@ -54,7 +61,7 @@</h5></div><div class="card-body">- <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary w-100 py-3" %>+ <%= link_to_with_icon 'plus', Spree.t(:new_line_item), spree.new_admin_order_line_item_path(@order), data: { turbo_frame: 'dialog', action: 'dialog#open' }, class: "btn btn-secondary w-full py-4" %></div></div><% end %>diff --git a/admin/app/views/spree/admin/orders/_order.html.erb b/admin/app/views/spree/admin/orders/_order.html.erbindex 8632b92cd4..a9107fc248 100644--- a/admin/app/views/spree/admin/orders/_order.html.erb+++ b/admin/app/views/spree/admin/orders/_order.html.erb@@ -1,6 +1,6 @@<tr id="<%= dom_id(order) %>" data-controller="row-link"><td class="p-0 w-10">- <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-weight-bolder d-block p-2 px-3 text-decoration-none', data: { 'turbo-frame': '_top', row_link_target: :link } %>+ <%= link_to order.number, spree.edit_admin_order_path(order), class: 'font-bolder block p-2 px-4 no-underline', data: { 'turbo-frame': '_top', row_link_target: :link } %></td><td class="w-15 cursor-pointer" data-action="click->row-link#openLink"><%= spree_time_ago(order.completed? ? order.completed_at : order.created_at, format: '%b %e, %Y %l:%M%P') %>@@ -8,7 +8,7 @@<td class="d-customer w-15 cursor-pointer" data-action="click->row-link#openLink"><%= render 'spree/admin/orders/customer_summary', order: order %></td>- <td class="text-wrap w-20 cursor-pointer" data-action="click->row-link#openLink">+ <td class="whitespace-normal w-20 cursor-pointer" data-action="click->row-link#openLink"><% order.shipments.map(&:stock_location).compact.uniq.each_with_index do |stock_location, index| %><% if index > 0 %>, <% end %><%= stock_location.name %><% end %>diff --git a/admin/app/views/spree/admin/orders/_payments.html.erb b/admin/app/views/spree/admin/orders/_payments.html.erbindex 05080c0de4..0dd2cc90a2 100644--- a/admin/app/views/spree/admin/orders/_payments.html.erb+++ b/admin/app/views/spree/admin/orders/_payments.html.erb@@ -1,20 +1,20 @@<% if can?(:read, Spree::Payment) && (@order.payment_required? && @order.bill_address.present?) || @payments.any? %>- <div class="card mb-4">- <div class="card-header d-flex align-items-center border-0">- <h6 class="card-title">+ <div class="card mb-6">+ <div class="card-header flex items-center border-0">+ <h5 class="card-title"><%= icon('credit-card-pay', class: 'mr-2') %><%= Spree.t(:payments) %>- </h6>+ </h5><% if @payments.any? %><span class="badge badge-info ml-2"><%= @payments.count %></span><%= order_payment_state(@order, class: "ml-auto") %><% end %></div>- <div class="card-body d-flex flex-column gap-2 px-2 pt-0 pb-2">+ <div class="card-body flex flex-col gap-2 px-2 pt-0 pb-2"><%= render collection: @payments, partial: 'spree/admin/payments/payment', as: :payment %><% if @order.payment_total < @order.total && can?(:create, Spree::Payment.new(order: @order)) %>- <div class="d-flex justify-content-center w-100 gap-3 p-3">+ <div class="flex justify-center w-full gap-6 p-6"><%= link_to_with_icon 'plus', Spree.t(:new_payment), spree.new_admin_order_payment_path(@order), class: 'btn btn-primary' %><% if spree.respond_to?(:checkout_state_url) %>diff --git a/admin/app/views/spree/admin/orders/_refunds.html.erb b/admin/app/views/spree/admin/orders/_refunds.html.erbindex a3062f8f9b..3fc94735c0 100644--- a/admin/app/views/spree/admin/orders/_refunds.html.erb+++ b/admin/app/views/spree/admin/orders/_refunds.html.erb@@ -1,17 +1,17 @@<% if @refunds.any? %>- <div class="card mb-4">- <div class="card-header d-flex align-items-center">- <h6 class="card-title">+ <div class="card mb-6">+ <div class="card-header flex items-center">+ <h5 class="card-title"><%= icon('credit-card-refund', class: 'mr-2') %><%= Spree.t(:refunds) %>- </h6>+ </h5><span class="badge badge-info ml-2"><%= @refunds.count %></span></div><div class="card-body p-0"><div class="table-responsive"><table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'><thead>- <tr data-hook="refunds_header" class="border-bottom">+ <tr data-hook="refunds_header" class="border-b"><th scope="col"><%= Spree.t(:amount) %></th><th scope="col"><%= Spree.t(:status) %></th><th scope="col"><%= Spree.t(:reason) %></th>diff --git a/admin/app/views/spree/admin/orders/_return_authorizations.html.erb b/admin/app/views/spree/admin/orders/_return_authorizations.html.erbindex f7d8a90a24..438d6cf543 100644--- a/admin/app/views/spree/admin/orders/_return_authorizations.html.erb+++ b/admin/app/views/spree/admin/orders/_return_authorizations.html.erb@@ -1,13 +1,13 @@<% if @return_authorizations.exists? && can?(:read, Spree::ReturnAuthorization) %>- <div class="card mb-4">- <div class="card-header justify-content-between">+ <div class="card mb-6">+ <div class="card-header justify-between"><h5 class="card-title"><%= Spree.t(:return_authorizations) %></h5></div><div class="card-body p-0"><div class="table-responsive"><table class="table">- <thead class="border-bottom">+ <thead class="border-b"><tr><th scope="col"><%= Spree.t(:rma_number) %></th><th scope="col"><%= Spree.t(:status) %></th>diff --git a/admin/app/views/spree/admin/orders/_risk_analysis.html.erb b/admin/app/views/spree/admin/orders/_risk_analysis.html.erbindex 506de390c9..8f3f5175f6 100644--- a/admin/app/views/spree/admin/orders/_risk_analysis.html.erb+++ b/admin/app/views/spree/admin/orders/_risk_analysis.html.erb@@ -1,5 +1,5 @@-<ul class="list-group mt-3 hidden" data-reveal-target="item">- <li class="list-group-item d-flex justify-content-between align-items-center">+<ul class="list-group mt-4 hidden" data-reveal-target="item">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:avs_response) %><span class="badge badge-<%= payment.is_avs_risky? ? 'warning' : 'complete' %>"><% if payment.is_avs_risky? %>@@ -11,7 +11,7 @@<% end %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:cvv_response) %><span class="badge badge-<%= payment.is_cvv_risky? ? 'warning' : 'complete' %>"><% if payment.is_cvv_risky? %>diff --git a/admin/app/views/spree/admin/orders/_shipment.html.erb b/admin/app/views/spree/admin/orders/_shipment.html.erbindex 12ef924d95..9d3eca271d 100644--- a/admin/app/views/spree/admin/orders/_shipment.html.erb+++ b/admin/app/views/spree/admin/orders/_shipment.html.erb@@ -1,18 +1,18 @@<% order ||= shipment.order %><%= turbo_frame_tag dom_id(shipment), class: "card" do %>- <div class="card-header align-items-center justify-content-between">- <div class="d-flex align-items-center gap-2">- <span class="d-flex align-items-center"><%= shipment_state(shipment.state) %></span>+ <div class="card-header items-center justify-between">+ <div class="flex items-center gap-2">+ <span class="flex items-center"><%= shipment_state(shipment.state) %></span><strong class="shipment-number"><%= shipment.number %></strong><% if shipment.shipped_at.present? %>- <small class="text-muted">+ <small class="text-gray-600"><%= spree_time_ago(shipment.shipped_at) %></small><% end %></div>- <span class="d-flex justify-content-between align-items-center gap-2">- <small class="text-muted"><%= Spree.t(:package_from).downcase %></small>+ <span class="flex justify-between items-center gap-2">+ <small class="text-gray-600"><%= Spree.t(:package_from).downcase %></small><strong><% if can?(:edit, shipment.stock_location) %><%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_path(shipment.stock_location), data: { turbo_frame: '_top' } %>@@ -24,7 +24,7 @@</div><div class="card-body mb-0 p-0"><div class="shipment-line-items">- <div class="text-muted text-center border-bottom py-2 px-3 font-size-sm shipment-line-items__row">+ <div class="text-gray-600 text-center border-b py-2 px-4 text-sm shipment-line-items__row"><span class="text-left"><%= Spree.t(:item_description) %></span>@@ -42,7 +42,7 @@</div><%= render collection: shipment.manifest, partial: 'spree/admin/orders/shipment_manifest_item', as: :item, locals: { shipment: shipment } %></div>- <%= turbo_frame_tag dom_id(shipment, :shipping_method), class: "py-2 px-3 d-flex justify-content-between align-items-center min-h-14" do %>+ <%= turbo_frame_tag dom_id(shipment, :shipping_method), class: "py-2 px-4 flex justify-between items-center min-h-14" do %><div><% if rate = shipment.selected_shipping_rate %><strong><%= rate.name %></strong>@@ -60,8 +60,8 @@<% end %><% unless shipment.digital? %>- <%= turbo_frame_tag dom_id(shipment, :tracking), class: "border-top px-3 d-flex justify-content-between align-items-center min-h-14" do %>- <div class="py-3">+ <%= turbo_frame_tag dom_id(shipment, :tracking), class: "border-t px-4 flex justify-between items-center min-h-14" do %>+ <div class="py-4"><strong><%= Spree.t(:tracking) %>: </strong><% if shipment.tracked? %><% if shipment.tracking_url.present? %>@@ -70,7 +70,7 @@<span><%= shipment.tracking %></span><% end %><% else %>- <span class="text-muted"><%= Spree.t(:no_tracking_present) %></span>+ <span class="text-gray-600"><%= Spree.t(:no_tracking_present) %></span><% end %></div>@@ -85,7 +85,7 @@<% end %><% if can_ship?(shipment) %>- <div class="card-footer d-flex justify-content-end border-top bg-light">+ <div class="card-footer flex justify-end border-t bg-gray-25"><% if shipment.tracked? %><%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure)} %><% elsif !shipment.digital? %>@@ -95,7 +95,7 @@<%= tooltip(Spree.t('admin.shipment.please_provide_tracking_details')) %></span><% else %>- <span class="text-muted w-100">+ <span class="text-gray-600 w-full"><%= Spree.t('admin.digital_shipment_fulfillment_note') %></span><% end %>diff --git a/admin/app/views/spree/admin/orders/_shipment_manifest_item.html.erb b/admin/app/views/spree/admin/orders/_shipment_manifest_item.html.erbindex f0685fc5d6..cbc5a56396 100644--- a/admin/app/views/spree/admin/orders/_shipment_manifest_item.html.erb+++ b/admin/app/views/spree/admin/orders/_shipment_manifest_item.html.erb@@ -1,16 +1,16 @@-<%= turbo_frame_tag dom_id(item.variant, :shipment_item), class: "border-bottom py-2 px-3 shipment-line-items__row" do %>+<%= turbo_frame_tag dom_id(item.variant, :shipment_item), class: "border-b py-2 px-4 shipment-line-items__row" do %><%= render 'spree/admin/variants/variant', variant: item.variant %>- <span class="d-flex align-items-center justify-content-center"><%= item.line_item.single_money.to_html %></span>- <span class="d-flex align-items-center justify-content-center">+ <span class="flex items-center justify-center"><%= item.line_item.single_money.to_html %></span>+ <span class="flex items-center justify-center"><% item.states.each do |state,count| %><%= count %> x <%= Spree.t(state).downcase %><% end %></span>- <span class="d-flex align-items-center justify-content-center">+ <span class="flex items-center justify-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></span><% if can?(:split, shipment) %>- <span class="d-flex align-items-center justify-content-end">+ <span class="flex items-center justify-end"><%= link_to_with_icon 'arrows-split', Spree.t(:split), spree.split_admin_order_shipment_path(@order, shipment, variant_id: item.variant), class: "btn btn-sm btn-light", no_text: true, data: { test_id: :split_item } %></span><% end %>diff --git a/admin/app/views/spree/admin/orders/_shipments.html.erb b/admin/app/views/spree/admin/orders/_shipments.html.erbindex 01a369e8c3..b4235bdca1 100644--- a/admin/app/views/spree/admin/orders/_shipments.html.erb+++ b/admin/app/views/spree/admin/orders/_shipments.html.erb@@ -1,20 +1,20 @@-<div class="card mb-4">- <div class="card-header d-flex align-items-center border-0">- <h6 class="card-title">+<div class="card mb-6">+ <div class="card-header flex items-center border-0">+ <h5 class="card-title"><%= icon('truck', class: 'mr-2') %><%= Spree.t(:shipments) %>- </h6>+ </h5><% if @shipments.any? %><span class="badge badge-info ml-2"><%= @shipments.count %></span><%= order_shipment_state(@order, class: "ml-auto") %><% end %></div>- <div class="card-body px-2 pt-0 pb-2 d-flex flex-column gap-2">+ <div class="card-body px-2 pt-0 pb-2 flex flex-col gap-2"><% if @shipments.any? %><%= render partial: "shipment", collection: @shipments %><% else %>- <p class="text-center text-muted p-5">+ <p class="text-center text-gray-600 p-12"><%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Shipment)) %></p><% end %>diff --git a/admin/app/views/spree/admin/orders/_special_instructions.html.erb b/admin/app/views/spree/admin/orders/_special_instructions.html.erbindex 973e371c6d..5c890ae271 100644--- a/admin/app/views/spree/admin/orders/_special_instructions.html.erb+++ b/admin/app/views/spree/admin/orders/_special_instructions.html.erb@@ -1,5 +1,5 @@<% if @order.special_instructions.present? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= I18n.t('activerecord.attributes.spree/order.special_instructions') %>diff --git a/admin/app/views/spree/admin/orders/_summary.html.erb b/admin/app/views/spree/admin/orders/_summary.html.erbindex b8ed3f5b1e..237a6fdeaa 100644--- a/admin/app/views/spree/admin/orders/_summary.html.erb+++ b/admin/app/views/spree/admin/orders/_summary.html.erb@@ -1,33 +1,33 @@-<div class="card mb-4" id="order_tab_summary">+<div class="card mb-6" id="order_tab_summary"><div class="card-header"><h5 class="card-title"><%= Spree.t(:summary) %></h5></div><ul class="list-group list-group-flush"><% if @order.canceled? && @order.canceled_at %>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span><%= Spree.t(:canceled_at) %></span>- <span class="text-rightfont-weight-bold">+ <span class="text-rightfont-bold"><%= spree_time(@order.canceled_at) %></span></li><% if @order.canceler.present? %>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span><%= Spree.t(:canceler) %></span>- <span class="text-rightfont-weight-bold">+ <span class="text-rightfont-bold"><%= @order.canceler.name %></span></li><% end %><% end %>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span><%= Spree.t(:currency) %></span><span id='currency'><%= @order.currency %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span data-hook='admin_order_tab_subtotal_title'><%= Spree.t(:subtotal) %></span><span id='item_total'><%= @order.display_item_total.to_html %>@@ -35,7 +35,7 @@</li><% if @order.promo_total != 0 %>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span><%= Spree.t(:discount_amount) %></span><span class="text-right span" id='date_complete'><%= @order.display_promo_total.to_html %>@@ -44,7 +44,7 @@<% end %><% if @order.checkout_steps.include?("delivery") && @order.ship_total > 0 %>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span data-hook='admin_order_tab_ship_total_title'><%= Spree.t(:ship_total) %></span>@@ -54,7 +54,7 @@</li><% end %>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span data-hook='admin_order_tab_included_tax_title'><%= Spree.t(:tax_included) %></span><span id='included_tax_total'><%= @order.display_included_tax_total.to_html %>@@ -64,13 +64,13 @@<% tax_lines = order_summary_tax_lines_additional(@order) %><li class="list-group-item border-0" data-controller="reveal">- <span class="d-flex justify-content-between align-items-center">+ <span class="flex justify-between items-center"><span><%= Spree.t(:tax) %></span><span id="additional_tax_total"><% if tax_lines.any? %><button type="button" class="btn btn-light btn-sm mr-2" data-action="click->reveal#toggle"><%= Spree.t(:show_details) %>- <%= icon('selector', height: 12, class: 'mr-0 ml-1') %>+ <%= icon('selector', height: 12, class: 'mr-0 ml-2') %></button><% end %>@@ -83,21 +83,21 @@<%= render_admin_partials(:order_page_summary_partials, order: @order) %>- <li class="list-group-item d-flex justify-content-between align-items-center border-0">+ <li class="list-group-item flex justify-between items-center border-0"><span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>- <span class="font-weight-bold text-capitalize" id='order_total'>+ <span class="font-bold capitalize" id='order_total'><%= @order.display_total.to_html %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center border-top bg-light">+ <li class="list-group-item flex justify-between items-center border-t bg-gray-25"><span data-hook='admin_order_tab_payment_total_title'><%= Spree.t(:payment_total) %></span><span id='payment_total'><%= @order.display_payment_total.to_html %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center bg-light">+ <li class="list-group-item flex justify-between items-center bg-gray-25"><span data-hook='admin_order_tab_outstanding_balance_title'><%= Spree.t(:outstanding_balance) %></span><span id='outstanding_balance'><%= @order.display_outstanding_balance.to_html %>diff --git a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erbindex 5478017efb..909b3b6ca4 100644--- a/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/orders/_table_filter_dropdown.html.erb@@ -1,7 +1,7 @@<% if controller_name == 'orders' %><%= dropdown do %><%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>- <span class="text-muted font-weight-normal mr-1">+ <span class="text-gray-600 font-normal mr-1"><%= Spree.t(:show) %></span><%= order_filter_dropdown_value %>@@ -9,7 +9,7 @@<%= dropdown_menu do %><%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %><%= link_to params.to_unsafe_h.deep_merge({q: {shipment_state_not_in: [:shipped, :canceled], shipment_state_eq: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),- class: "dropdown-item d-flex align-items-center justify-content-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>+ class: "dropdown-item flex items-center justify-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %><%= Spree.t('admin.orders.unfulfilled') %><% if ready_to_ship_orders_count&.positive? %><span class="badge badge-light ml-2">diff --git a/admin/app/views/spree/admin/orders/_tax_lines.html.erb b/admin/app/views/spree/admin/orders/_tax_lines.html.erbindex 83f76386e0..95a84c12e4 100644--- a/admin/app/views/spree/admin/orders/_tax_lines.html.erb+++ b/admin/app/views/spree/admin/orders/_tax_lines.html.erb@@ -1,6 +1,6 @@-<ul class="list-group mt-3 mb-3 hidden" data-reveal-target="item">+<ul class="list-group mt-4 mb-4 hidden" data-reveal-target="item"><% tax_lines.each do |tax_line| %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= tax_line.name %><span class="text-right">diff --git a/admin/app/views/spree/admin/orders/_user_overview.html.erb b/admin/app/views/spree/admin/orders/_user_overview.html.erbindex f241929b87..dc103549b7 100644--- a/admin/app/views/spree/admin/orders/_user_overview.html.erb+++ b/admin/app/views/spree/admin/orders/_user_overview.html.erb@@ -1,9 +1,9 @@<% if @order.user.orders.complete.any? %><div class="alert alert-info mt-2 mb-0"><div>- <h6 class="font-weight-bold">+ <h5 class="font-bold"><%= icon('magic') %> Assistant- </h6>+ </h5>This is a repeat customer that has spent a total of<strong><%= Spree::Money.new(@order.user.orders.complete.sum(:total)) %></strong> across<strong><%= @order.user.orders.complete.count %> orders</strong>, averagingdiff --git a/admin/app/views/spree/admin/orders/billing_address/_form.html.erb b/admin/app/views/spree/admin/orders/billing_address/_form.html.erbindex dfb1e52030..7ff39e6143 100644--- a/admin/app/views/spree/admin/orders/billing_address/_form.html.erb+++ b/admin/app/views/spree/admin/orders/billing_address/_form.html.erb@@ -1,4 +1,4 @@-<div data-form="new_address" class="d-none">+<div data-form="new_address" class="hidden"><%= render 'spree/admin/shared/error_messages', target: address %><%= render 'spree/addresses/form',address_name: 'address',@@ -7,10 +7,10 @@address: address %></div><% if @order.user.present? && @order.user.addresses.many? %>- <div data-form="existing_address" class="d-none">+ <div data-form="existing_address" class="hidden"><%= label_tag :billing_address_id, Spree.t(:existing_address), class: 'sr-only' %><%= select_tag :billing_address_id,options_for_select(@order.user.addresses.map { |a| [a.to_s.gsub('<br/>', ", "), a.id]}),- { include_blank: Spree.t(:select_existing_address), class: "custom-select", data: { action: 'auto-submit#submit' } } %>+ { include_blank: Spree.t(:select_existing_address), class: "form-select", data: { action: 'auto-submit#submit' } } %></div><% end %>diff --git a/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erbindex 004d6438da..a3b04c1419 100644--- a/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb+++ b/admin/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb@@ -1,22 +1,22 @@<%= turbo_stream.update :dialog do %><%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %><%= dialog_header(Spree.t(:new_billing_address)) %>- <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">+ <div class="dialog-body flex flex-col gap-4" data-controller="order-billing-address"><div><% if @order.shipping_address.present? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>- <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span><% end %><% end %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :new, @order.shipping_address.nil?, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:add_new_address) %></span><% end %><% if @order.user.present? && @order.user.addresses.many? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span><% end %><% end %></div>diff --git a/admin/app/views/spree/admin/orders/billing_address/edit.html.erb b/admin/app/views/spree/admin/orders/billing_address/edit.html.erbindex bcb27830f0..77e1a5984d 100644--- a/admin/app/views/spree/admin/orders/billing_address/edit.html.erb+++ b/admin/app/views/spree/admin/orders/billing_address/edit.html.erb@@ -1,29 +1,29 @@<%= turbo_frame_tag :dialog do %><%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %><%= dialog_header(Spree.t(:billing_address)) %>- <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">+ <div class="dialog-body flex flex-col gap-6" data-controller="order-billing-address"><div><% if @order.shipping_address.present? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>- <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span><% end %><% end %><% if @order.shipping_eq_billing_address? %>- <%= link_to spree.new_admin_order_billing_address_path(@order, selected_form: :new), class:"form-control custom-radio mb-2" do %>+ <%= link_to spree.new_admin_order_billing_address_path(@order, selected_form: :new), class:"custom-radio flex no-underline" do %><%= radio_button_tag :billing_address_type, :new, false, class: 'custom-control-input' %>- <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:add_new_address) %></span><% end %><% else %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :new, true, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:update_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:update_address) %></span><% end %><% end %><% if @order.user.present? && @order.user.addresses.many? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span><% end %><% end %></div>diff --git a/admin/app/views/spree/admin/orders/billing_address/new.html.erb b/admin/app/views/spree/admin/orders/billing_address/new.html.erbindex 1abc5c7321..88b03a466e 100644--- a/admin/app/views/spree/admin/orders/billing_address/new.html.erb+++ b/admin/app/views/spree/admin/orders/billing_address/new.html.erb@@ -1,22 +1,22 @@<%= turbo_frame_tag :dialog do %><%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %><%= dialog_header(Spree.t(:billing_address)) %>- <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">+ <div class="dialog-body flex flex-col gap-4" data-controller="order-billing-address"><div><% if @order.shipping_address.present? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>- <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span><% end %><% end %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :new, @order.shipping_address.nil? || params[:selected_form] == 'new', class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:add_new_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:add_new_address) %></span><% end %><% if @order.user.present? && @order.user.addresses.many? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span><% end %><% end %></div>diff --git a/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erbindex f19677145a..f35c216b09 100644--- a/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb+++ b/admin/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb@@ -1,22 +1,22 @@<%= turbo_stream.update :dialog do %><%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %><%= dialog_header(Spree.t(:update_billing_address)) %>- <div class="dialog-body d-flex flex-col gap-3" data-controller="order-billing-address">+ <div class="dialog-body flex flex-col gap-4" data-controller="order-billing-address"><div><% if @order.shipping_address.present? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :same_as_shipping, true, class: 'custom-control-input', data: {action: 'order-billing-address#hideForms'} %>- <span class="custom-control-label ml-4"><%= Spree.t(:same_as_shipping_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:same_as_shipping_address) %></span><% end %><% end %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :new, [email protected]_eq_billing_address?, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "new_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:update_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:update_address) %></span><% end %><% if @order.user.present? && @order.user.addresses.many? %>- <%= label_tag nil, class: 'form-control custom-radio' do %>+ <%= label_tag nil, class: 'custom-radio' do %><%= radio_button_tag :billing_address_type, :existing, false, class: 'custom-control-input', data: {action: 'order-billing-address#showForm', order_billing_address_form_name_param: "existing_address"} %>- <span class="custom-control-label ml-4"><%= Spree.t(:select_existing_address) %></span>+ <span class="custom-control-label"><%= Spree.t(:select_existing_address) %></span><% end %><% end %></div>diff --git a/admin/app/views/spree/admin/orders/contact_information/edit.html.erb b/admin/app/views/spree/admin/orders/contact_information/edit.html.erbindex 79e7ed6e67..b69440e4d0 100644--- a/admin/app/views/spree/admin/orders/contact_information/edit.html.erb+++ b/admin/app/views/spree/admin/orders/contact_information/edit.html.erb@@ -4,7 +4,7 @@<div class="dialog-body"><div class="form-group"><%= f.label :email, Spree.t(:email) %>- <%= f.email_field :email, class: 'form-control', required: true %>+ <%= f.email_field :email, class: 'form-input', required: true %></div></div><div class="dialog-footer">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 98dcbccceb..cd0d8fb182 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@@ -14,7 +14,7 @@data-controller="row-link"class="cursor-pointer">- <td data-action="click->row-link#openLink" class="font-weight-bolder">+ <td data-action="click->row-link#openLink" class="font-bolder"><%= link_to customer_return.number, edit_link %></td><td data-action="click->row-link#openLink">diff --git a/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb b/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erbindex 1b5f3c18b6..1b775f0495 100644--- a/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/_reimbursements_table.html.erb@@ -14,7 +14,7 @@data-controller="row-link"class="cursor-pointer">- <td data-action="click->row-link#openLink" class="font-weight-bolder">+ <td data-action="click->row-link#openLink" class="font-bolder"><%= link_to reimbursement.number,(if reimbursement.reimbursed?diff --git a/admin/app/views/spree/admin/orders/customer_returns/_return_item_decision.html.erb b/admin/app/views/spree/admin/orders/customer_returns/_return_item_decision.html.erbindex f1d77a777f..c5e9efa7b8 100644--- a/admin/app/views/spree/admin/orders/customer_returns/_return_item_decision.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/_return_item_decision.html.erb@@ -35,7 +35,7 @@end %></td><% if show_decision %>- <td class='actions d-flex gap-2'>+ <td class='actions flex gap-2'><% if can?(:accept, return_item) %><%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-primary btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, title: Spree.t(:accept), method: 'put' } do %><%= Spree.t(:accept) %>diff --git a/admin/app/views/spree/admin/orders/customer_returns/_return_item_selection.html.erb b/admin/app/views/spree/admin/orders/customer_returns/_return_item_selection.html.erbindex 316d9fa673..fbf00b4b39 100644--- a/admin/app/views/spree/admin/orders/customer_returns/_return_item_selection.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/_return_item_selection.html.erb@@ -1,9 +1,9 @@-<div class="table-responsive bg-white rounded-lg">+<div class="table-responsive bg-white rounded-xl"><table class="table">- <thead class="border-bottom">+ <thead class="border-b"><tr><th scope="col">- <div class="custom-control custom-checkbox ml-1">+ <div class="custom-control form-checkbox ml-1"><inputtype="checkbox"class="custom-control-input"@@ -25,7 +25,7 @@<% return_item = item_fields.object %><tr><td class="align-center">- <div class="custom-control custom-checkbox ml-1">+ <div class="custom-control form-checkbox ml-1"><%= item_fields.hidden_field :inventory_unit_id %><%= item_fields.hidden_field :return_authorization_id %><%= item_fields.hidden_field :pre_tax_amount %>diff --git a/admin/app/views/spree/admin/orders/customer_returns/edit.html.erb b/admin/app/views/spree/admin/orders/customer_returns/edit.html.erbindex 39f61a6138..3e17fcbace 100644--- a/admin/app/views/spree/admin/orders/customer_returns/edit.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/edit.html.erb@@ -1,6 +1,6 @@<% content_for :page_title do %><%= page_header_back_button spree.edit_admin_order_path(@order) %>- <div class="d-flex gap-3 align-items-center">+ <div class="flex gap-6 items-center"><%= @customer_return.number %><% if @customer_return.fully_reimbursed? %>@@ -11,21 +11,21 @@</div><% end %>-<ul class="list-group bg-white mb-4">+<ul class="list-group bg-white mb-6"><% if @customer_return.order %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:customer) %><div><%= render "spree/admin/orders/customer_summary", order: @customer_return.order %></div></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:order) %><strong><%= link_to @customer_return.order.number,spree.edit_admin_order_path(@customer_return.order) %></strong></li><% end %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:reimbursement_status) %><% if @customer_return.fully_reimbursed? %><span class="badge badge-success"><%= Spree.t(:reimbursed) %></span>@@ -33,13 +33,13 @@<span class="badge badge-inactive"><%= Spree.t(:incomplete) %></span><% end %></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:pre_tax_total) %><span><%= @customer_return.display_pre_tax_total.to_html %></span></li></ul><% if @manual_intervention_return_items.any? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5><%= Spree.t(:manual_intervention_required) %></h5></div>@@ -54,7 +54,7 @@<% end %><% if @pending_return_items.any? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5><%= Spree.t(:pending) %></h5></div>@@ -69,7 +69,7 @@<% end %><% if @accepted_return_items.any? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5><%= Spree.t(:accepted) %></h5></div>@@ -84,7 +84,7 @@<% end %><% if @rejected_return_items.any? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5><%= Spree.t(:rejected) %></h5></div>@@ -98,7 +98,7 @@</div><% end %>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5><%= plural_resource_name(Spree::Reimbursement) %></h5></div>@@ -127,7 +127,7 @@<% if !@customer_return.fully_reimbursed? && @customer_return.no_pending_reimbursements? && !@customer_return.completely_decided? %><divclass="- text-muted p-5 d-flex align-items-center w-100 justify-content-center+ text-gray-600 p-12 flex items-center w-full justify-center"><%= Spree.t(:unable_to_create_reimbursements) %>diff --git a/admin/app/views/spree/admin/orders/customer_returns/new.html.erb b/admin/app/views/spree/admin/orders/customer_returns/new.html.erbindex 098bb1947d..17b32014b8 100644--- a/admin/app/views/spree/admin/orders/customer_returns/new.html.erb+++ b/admin/app/views/spree/admin/orders/customer_returns/new.html.erb@@ -11,9 +11,9 @@} %><%= form_for [:admin, @order, @customer_return] do |f| %>- <div class="card mb-4" data-controller="checkbox-select-all">+ <div class="card mb-6" data-controller="checkbox-select-all"><div class="card-header">- <h6 class="card-title"><%= Spree.t(:items_in_rmas) %></h6>+ <h5 class="card-title"><%= Spree.t(:items_in_rmas) %></h5></div><div class="card-body p-0"><% if @rma_return_items.any? %>@@ -25,7 +25,7 @@<% else %><divclass="- text-muted p-5 d-flex align-items-center w-100 justify-content-center+ text-gray-600 p-12 flex items-center w-full justify-center"><%= Spree.t(:none) %>@@ -34,7 +34,7 @@</div></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-body"><%= f.spree_select :stock_location_id,available_stock_locations_list,@@ -50,8 +50,8 @@<div class="card"><divclass="- card-body text-muted d-flex align-items-center justify-content-center- flex-column gap-2+ card-body text-gray-600 flex items-center justify-center+ flex-col gap-2"><%= Spree.t(:all_items_have_been_returned) %>,diff --git a/admin/app/views/spree/admin/orders/edit.html.erb b/admin/app/views/spree/admin/orders/edit.html.erbindex 936be13fc6..36e496bfab 100644--- a/admin/app/views/spree/admin/orders/edit.html.erb+++ b/admin/app/views/spree/admin/orders/edit.html.erb@@ -1,22 +1,20 @@<%= render 'header' %><%= render_admin_partials(:order_page_header_partials, order: @order) %>-<div class="container px-0">- <div class="row">- <div class="col-lg-8">- <%= render 'line_items' %>- <%= render 'shipments' %>- <%= render 'customer_returns' %>- <%= render 'return_authorizations' %>- <%= render 'payments'%>- <%= render 'refunds'%>- <%= render_admin_partials(:order_page_body_partials, order: @order) %>- <%= render 'summary' %>- </div>- <div class="col-lg-4">- <%= render 'customer' %>- <%= render 'special_instructions' %>- <%= render_admin_partials(:order_page_sidebar_partials, order: @order) %>- </div>+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-8">+ <%= render 'line_items' %>+ <%= render 'shipments' %>+ <%= render 'customer_returns' %>+ <%= render 'return_authorizations' %>+ <%= render 'payments'%>+ <%= render 'refunds'%>+ <%= render_admin_partials(:order_page_body_partials, order: @order) %>+ <%= render 'summary' %></div>-</div>+ <div class="col-span-12 lg:col-span-4">+ <%= render 'customer' %>+ <%= render 'special_instructions' %>+ <%= render_admin_partials(:order_page_sidebar_partials, order: @order) %>+ </div>+</div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/orders/new.html.erb b/admin/app/views/spree/admin/orders/new.html.erbindex ed79775ef5..2caf6164b0 100644--- a/admin/app/views/spree/admin/orders/new.html.erb+++ b/admin/app/views/spree/admin/orders/new.html.erb@@ -8,10 +8,10 @@<% end %><%= form_for @order, url: spree.admin_orders_path do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @order } %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-body"><%= render 'form', f: f %></div>diff --git a/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erb b/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erbindex b6300e8a29..cb82b98e8b 100644--- a/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erb+++ b/admin/app/views/spree/admin/orders/return_authorizations/_form.html.erb@@ -7,7 +7,7 @@<tr><th scope="col"><% if allow_return_item_changes %>- <div class="custom-control custom-checkbox ml-1">+ <div class="custom-control form-checkbox ml-0.5"><inputtype="checkbox"class="custom-control-input"@@ -38,7 +38,7 @@<tr><td class="inventory-unit-checkbox"><% if editable %>- <div class="custom-control custom-checkbox ml-1">+ <div class="custom-control form-checkbox ml-0.5"><%= item_fields.hidden_field :inventory_unit_id %><%= item_fields.check_box :_destroy,@@ -79,7 +79,7 @@<% if editable %><%= item_fields.number_field :return_quantity,{- class: "refund-quantity-input form-control",+ class: "refund-quantity-input form-input",min: 0,required: true,data: {@@ -95,7 +95,7 @@<% if editable %><%= item_fields.text_field :pre_tax_amount,{- class: "refund-amount-input form-control",+ class: "refund-amount-input form-input",required: true,data: {action: "return-items#updateTotalRefundAmount",@@ -110,7 +110,7 @@<%= item_fields.select :preferred_reimbursement_type_id,@reimbursement_types.collect { |r| [r.name.humanize, r.id] },{ include_blank: true },- { class: "custom-select" } %>+ { class: "form-select" } %><% end %></td><td>@@ -125,7 +125,7 @@{ include_blank: true },{class:- "custom-select return-item-exchange-selection",+ "form-select return-item-exchange-selection",} %><% end %><% end %>@@ -141,7 +141,7 @@<span data-return-items-target="totalPreTaxRefund">0.00</span></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-body"><%= f.spree_select :stock_location_id,available_stock_locations_list,diff --git a/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erb b/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erbindex c9f66f5704..b6e455eebf 100644--- a/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erb+++ b/admin/app/views/spree/admin/orders/return_authorizations/_return_authorization.html.erb@@ -13,7 +13,7 @@data-controller="row-link"class="cursor-pointer">- <td data-action="click->row-link#openLink" class="font-weight-bolder">+ <td data-action="click->row-link#openLink" class="font-bolder"><%= link_to return_authorization.number, edit_link %></td><td data-action="click->row-link#openLink">diff --git a/admin/app/views/spree/admin/orders/return_authorizations/edit.html.erb b/admin/app/views/spree/admin/orders/return_authorizations/edit.html.erbindex 663d078c85..8d3be406f0 100644--- a/admin/app/views/spree/admin/orders/return_authorizations/edit.html.erb+++ b/admin/app/views/spree/admin/orders/return_authorizations/edit.html.erb@@ -1,7 +1,7 @@<% content_for :page_title do %><%= page_header_back_button spree.edit_admin_order_path(@order) %>- <div class="d-flex gap-3 align-items-center">+ <div class="flex gap-6 items-center"><%= @return_authorization.number %><span class="badge badge-<%= @return_authorization.state %>">@@ -20,7 +20,7 @@ locals: {<div class="form-actions"><%= turbo_save_button_tag Spree.t("actions.update") %>- <div class="ml-auto d-flex gap-3">+ <div class="ml-auto flex gap-6"><% if f.object.can_cancel? && can?(:cancel, f.object) %><%= link_to Spree.t("actions.cancel"),spree.cancel_admin_return_authorization_path(f.object),diff --git a/admin/app/views/spree/admin/orders/return_authorizations/show.html.erb b/admin/app/views/spree/admin/orders/return_authorizations/show.html.erbindex 9e30a74915..fc1e254a32 100644--- a/admin/app/views/spree/admin/orders/return_authorizations/show.html.erb+++ b/admin/app/views/spree/admin/orders/return_authorizations/show.html.erb@@ -1,6 +1,6 @@<% content_for :page_title do %><%= page_header_back_button spree.edit_admin_order_path(@order) %>- <div class="d-flex gap-3 align-items-center">+ <div class="flex gap-6 items-center"><span><%= Spree.t(:return_authorization) %></span><span><%= @return_authorization.number %></span><span class="badge badge-<%= @return_authorization.state %>">@@ -19,12 +19,12 @@ locals: {} %><% if flash[:errors].present? %>- <div class="alert alert-danger border-danger text-break">+ <div class="alert alert-danger border-danger break-words"><%= flash[:errors].to_sentence %></div><% end %>-<div class="card-lg mb-4">+<div class="card-lg mb-6"><div class="table-responsive"><table class="table table-condensed return-items-table"><thead>@@ -74,9 +74,9 @@ locals: {</div><% if @return_authorization.reason.present? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header">- <h6 class="card-title"><%= Spree.t(:reason) %></h6>+ <h5 class="card-title"><%= Spree.t(:reason) %></h5></div><div class="card-body"><%= @return_authorization.reason.name %>@@ -85,9 +85,9 @@ locals: {<% end %><% if @return_authorization.memo.present? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header">- <h6 class="card-title"><%= Spree.t(:memo) %></h6>+ <h5 class="card-title"><%= Spree.t(:memo) %></h5></div><div class="card-body"><%= @return_authorization.memo %>@@ -96,7 +96,7 @@ locals: {<% end %><% if @refunds.any? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5><%= Spree.t(:reimbursement) %></h5></div>diff --git a/admin/app/views/spree/admin/orders/shipping_address/_form.html.erb b/admin/app/views/spree/admin/orders/shipping_address/_form.html.erbindex cab44a92a9..1b74c8bb3b 100644--- a/admin/app/views/spree/admin/orders/shipping_address/_form.html.erb+++ b/admin/app/views/spree/admin/orders/shipping_address/_form.html.erb@@ -6,10 +6,10 @@address: address %><% if @order.user.present? && @order.user.addresses.many? %><div>- <div class="w-100 text-center mb-2"><%= Spree.t(:or_select_other_address) %></div>+ <div class="w-full text-center mb-2"><%= Spree.t(:or_select_other_address) %></div><%= label_tag :shipping_address_id, Spree.t(:existing_address), class: 'sr-only' %><%= select_tag :shipping_address_id,options_for_select(@order.user.addresses.map { |a| [a.to_s.gsub('<br/>', ", "), a.id]}),- { include_blank: Spree.t(:select_existing_address), class: "custom-select", data: { action: 'auto-submit#submit' } } %>+ { include_blank: Spree.t(:select_existing_address), class: "form-select", data: { action: 'auto-submit#submit' } } %></div><% end %>diff --git a/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb b/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erbindex f5bcc99846..a48ddf57ce 100644--- a/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb+++ b/admin/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb@@ -1,7 +1,7 @@<%= turbo_stream.update :dialog do %><%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %><%= dialog_header(Spree.t(:new_shipping_address)) %>- <div class="dialog-body d-flex flex-col gap-3">+ <div class="dialog-body flex flex-col gap-4"><%= render 'form', address: @address, f: f%></div><div class="dialog-footer">diff --git a/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb b/admin/app/views/spree/admin/orders/shipping_address/edit.html.erbindex 21921b332b..f27be7d26e 100644--- a/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb+++ b/admin/app/views/spree/admin/orders/shipping_address/edit.html.erb@@ -1,7 +1,7 @@<%= turbo_frame_tag :dialog do %><%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %><%= dialog_header(Spree.t(:update_shipping_address)) %>- <div class="dialog-body d-flex flex-col gap-3">+ <div class="dialog-body flex flex-col gap-4"><%= render 'form', address: @address, f: f %></div><div class="dialog-footer">diff --git a/admin/app/views/spree/admin/orders/shipping_address/new.html.erb b/admin/app/views/spree/admin/orders/shipping_address/new.html.erbindex a727ee7589..bf8227b2c0 100644--- a/admin/app/views/spree/admin/orders/shipping_address/new.html.erb+++ b/admin/app/views/spree/admin/orders/shipping_address/new.html.erb@@ -1,7 +1,7 @@<%= turbo_frame_tag :dialog do %><%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {turbo_frame: :_top}, method: :post do |f| %><%= dialog_header(Spree.t(:new_shipping_address)) %>- <div class="dialog-body d-flex flex-col gap-3">+ <div class="dialog-body flex flex-col gap-4"><%= render 'form', address: @address, f: f%></div><div class="dialog-footer">diff --git a/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb b/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erbindex 0af40d95b7..be67d080ac 100644--- a/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb+++ b/admin/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb@@ -1,7 +1,7 @@<%= turbo_stream.update :dialog do %><%= form_for @address, url: spree.admin_order_shipping_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %><%= dialog_header(Spree.t(:update_shipping_address)) %>- <div class="dialog-body d-flex flex-col gap-3">+ <div class="dialog-body flex flex-col gap-4"><%= render 'form', address: @address, f: f %></div><div class="dialog-footer">diff --git a/admin/app/views/spree/admin/orders/user/new.html.erb b/admin/app/views/spree/admin/orders/user/new.html.erbindex 9aeaa90d35..d315a84fdf 100644--- a/admin/app/views/spree/admin/orders/user/new.html.erb+++ b/admin/app/views/spree/admin/orders/user/new.html.erb@@ -1,6 +1,6 @@<% show_form ||= params[:show_form] %>-<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-4 blur-busy" do %>- <div class="card-header d-flex justify-content-between">+<%= turbo_frame_tag dom_id(@order, :customer_information), class: "card mb-6 blur-busy" do %>+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:customer) %></h5>@@ -11,19 +11,19 @@<%= form_with model: @user, scope: :user, url: spree.admin_order_user_path(@order) do |f| %><%= render 'spree/admin/shared/error_messages', target: @user %><%= render 'spree/admin/users/form', f: f %>- <div class="d-flex justify-content-between">+ <div class="flex justify-between"><%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %><%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@order, :edit) }, type: :submit, class: 'btn btn-primary text-center btn-sm' %></div><% end %><% else %>- <div class="d-flex gap-2 flex-column">+ <div class="flex gap-2 flex-col"><%= form_with url: spree.admin_order_user_path(@order), data: { controller: 'auto-submit' }, method: :patch do %><%= label_tag :user_id, Spree.t(:select_user), class: "sr-only" %>- <%= tom_select_tag :user_id, { include_blank: Spree.t(:select_user), options: users_for_select_options, select_data: {action: 'auto-submit#submit'}, disable_with: "<span class='spinner-border spinner-border-sm' role='status'></span>" } %>+ <%= tom_select_tag :user_id, { include_blank: Spree.t(:select_user), options: users_for_select_options, select_data: {action: 'auto-submit#submit'}, disable_with: "<span class='inline-block w-4 h-4 border-2 border-current border-r-transparent rounded-full animate-spin' role='status'></span>" } %><% end %>- <span class="d-flex w-100 justify-content-center align-items-center"><%= Spree.t(:or) %></span>- <%= link_to Spree.t(:create_new), spree.new_admin_order_user_path(@order, show_form: true), class: "btn btn-secondary w-100" %>+ <span class="flex w-full justify-center items-center"><%= Spree.t(:or) %></span>+ <%= link_to Spree.t(:create_new), spree.new_admin_order_user_path(@order, show_form: true), class: "btn btn-secondary w-full" %></div><% end %></div>diff --git a/admin/app/views/spree/admin/page_blocks/edit.html.erb b/admin/app/views/spree/admin/page_blocks/edit.html.erbindex 776a839cba..7b4de3e565 100644--- a/admin/app/views/spree/admin/page_blocks/edit.html.erb+++ b/admin/app/views/spree/admin/page_blocks/edit.html.erb@@ -1,27 +1,27 @@<%= 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 shadow-none px-2' do %>+ <%= link_to spree.edit_admin_theme_path(@theme, page_id: @page&.id), data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover:bg-gray-100 shadow-none px-3' do %><%= icon 'chevron-left', class: 'mr-0' %><% end %><%= @page_block.display_name %></h6>- <div class="px-3 pb-5 mb-5 edit-block" style="margin-bottom: 6rem;">+ <div class="p-3 edit-block"><%= form_for @page_block, url: spree.admin_page_section_block_path(@page_block.section, @page_block), data: { controller: 'auto-submit' }, as: :page_block do |f| %><div data-controller="tabs">- <ul class="nav nav-pills nav-fill mb-3" id="pills-tab" role="tablist">+ <ul class="nav nav-pills nav-fill mb-6" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <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>+ <button class="nav-link w-full <%= 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="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-full <%= 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 %>>+ <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate-fade-in" <%= 'hidden' unless tab_selected == :content %>><%= render "spree/admin/page_blocks/forms/#{@page_block.form_partial_name}", f: f %><%= render 'spree/admin/page_blocks/form_tab_buttons', tab: :content %></div>- <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :design %>>+ <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" class="animate-fade-in" <%= 'hidden' unless tab_selected == :design %>><%= render 'spree/admin/page_sections/fields/top_padding', f: f %><%= render 'spree/admin/page_sections/fields/bottom_padding', f: f %><% if @page_block.respond_to?(:preferred_text_color) %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_brand.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_brand.html.erbindex 49a4375bf8..8c991f8c93 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_brand.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_brand.html.erb@@ -1,12 +1,12 @@<% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_text_alignment, Spree.t(:text_alignment) %>- <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_container_alignment, Spree.t(:container_alignment) %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_blocks/forms/_brand_logo.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_brand_logo.html.erbindex af9bf14429..703cef40e7 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_brand_logo.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_brand_logo.html.erb@@ -1,4 +1,4 @@<div class="form-group"><%= f.label :brand %>- <%= tom_select_tag 'page_block[brand_id]', active_option: @page_block.brand_id, class: 'w-100', url: spree.admin_brands_select_options_path(format: :json), select_data: {action: 'auto-submit#submit'} %>+ <%= tom_select_tag 'page_block[brand_id]', active_option: @page_block.brand_id, class: 'w-full', url: spree.admin_brands_select_options_path(format: :json), select_data: {action: 'auto-submit#submit'} %></div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_buttons.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_buttons.html.erbindex 94b33f359a..a440ec2fc9 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_buttons.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_buttons.html.erb@@ -2,12 +2,12 @@<div class="form-group"><%= f.label :preferred_button_style_1, Spree.t('admin.page_builder.button_style') %>- <%= f.select :preferred_button_style_1, options_for_select(['primary', 'secondary'], @page_block.preferred_button_style_1), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_button_style_1, options_for_select(['primary', 'secondary'], @page_block.preferred_button_style_1), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_text_alignment, Spree.t('admin.page_builder.button_alignment') %>- <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_heading.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_heading.html.erbindex 29a280e3fc..d114260ac6 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_heading.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_heading.html.erb@@ -1,24 +1,24 @@<div class="trix-container"><%= f.rich_text_area :text, data: {action: 'trix-change->auto-submit#submit'- }, class: 'mb-3' %>+ }, class: 'mb-6' %></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_size %>- <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><% unless @page_block.section.is_a? Spree::PageSections::Video %><div class="form-group"><%= f.label :preferred_text_alignment %>- <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_link.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_link.html.erbindex 3423670700..780bf2f917 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_link.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_link.html.erb@@ -1,7 +1,7 @@<%= f.fields_for :link do |lf| %><div class="form-group"><%= lf.label :linkable_type, 'Link' %>- <%= lf.select :linkable_type, @page_block.allowed_linkable_types, { include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>+ <%= lf.select :linkable_type, @page_block.allowed_linkable_types, { include_blank: false }, { class: 'form-select mb-6', data: { action: 'auto-submit#submit' } } %><div id="linkable_type_dropdown"><%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: lf.object, form_name: 'page_block[link_attributes]' %></div>@@ -9,10 +9,10 @@<div class="form-group"><%= lf.label :label %>- <%= lf.text_field :label, class: 'form-control', data: { action: 'blur->auto-submit#submit' }, placeholder: 'eg. About us', required: true %>+ <%= lf.text_field :label, class: 'form-input', data: { action: 'blur->auto-submit#submit' }, placeholder: 'eg. About us', required: true %></div>- <div class="custom-control custom-checkbox mb-5">+ <div class="custom-control form-checkbox mb-6"><%= lf.check_box :open_in_new_tab, class: 'custom-control-input', data: { action: 'auto-submit#submit' } %><%= lf.label :open_in_new_tab, class: 'custom-control-label' %></div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_mega_nav.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav.html.erbindex 21e64e7d67..cf3a38de8b 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_mega_nav.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav.html.erb@@ -1,13 +1,13 @@-<h5 class="font-weight-bold"><%= Spree.t(:title_link) %></h5>+<h5 class="font-bold"><%= Spree.t(:title_link) %></h5><%= render 'spree/admin/page_blocks/forms/link', f: f %><%= render 'spree/admin/page_links/list', parent: @page_block, show_add_link_button: true %>-<h5 class="font-weight-bold"><%= Spree.t(:featured_taxon) %></h5>+<h5 class="font-bold"><%= Spree.t(:featured_taxon) %></h5><div class="form-group"><%= tom_select_tag 'page_block[preferred_featured_taxon_id]',active_option: @page_block.preferred_featured_taxon_id,- class: 'w-100',+ class: 'w-full',url: spree.admin_taxons_select_options_path(format: :json),select_data: { action: 'auto-submit#submit' },include_blank: "" %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_mega_nav_with_subcategories.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav_with_subcategories.html.erbindex f4e36cd599..9e0fe60360 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_mega_nav_with_subcategories.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_mega_nav_with_subcategories.html.erb@@ -1,9 +1,9 @@-<h5 class="font-weight-bold"><%= Spree.t(:category) %></h5>+<h5 class="font-bold"><%= Spree.t(:category) %></h5><div class="form-group">- <%= tom_select_tag 'page_block[preferred_taxon_id]', active_option: @page_block.preferred_taxon_id, class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json), select_data: { action: 'auto-submit#submit' } %>+ <%= tom_select_tag 'page_block[preferred_taxon_id]', active_option: @page_block.preferred_taxon_id, class: 'w-full', url: spree.admin_taxons_select_options_path(format: :json), select_data: { action: 'auto-submit#submit' } %></div>-<h5 class="font-weight-bold"><%= Spree.t(:featured_taxon) %></h5>+<h5 class="font-bold"><%= Spree.t(:featured_taxon) %></h5><div class="form-group">- <%= tom_select_tag 'page_block[preferred_featured_taxon_id]', active_option: @page_block.preferred_featured_taxon_id, class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json), select_data: { action: 'auto-submit#submit' } %>+ <%= tom_select_tag 'page_block[preferred_featured_taxon_id]', active_option: @page_block.preferred_featured_taxon_id, class: 'w-full', url: spree.admin_taxons_select_options_path(format: :json), select_data: { action: 'auto-submit#submit' } %></div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_metafields.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_metafields.html.erbindex 36a5b038ce..c5ec85147d 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_metafields.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_metafields.html.erb@@ -1,18 +1,18 @@<div class="form-group">- <div class="mb-2">+ <div class="mb-4"><label class="form-label"><%= Spree.t(:metafields) %></label>- <div class="p-1 border rounded d-flex flex-column gap-1 mb-3"- data-controller="sortable-auto-submit"+ <div class="p-1 border rounded-lg flex flex-col gap-1 mb-6"+ data-controller="sortable-auto-submit"data-sortable-auto-submit-handle-value=".handle"><%= hidden_field_tag "#{f.object_name}[preferred_metafield_definition_ids][]", "" %><% selected_keys = f.object.preferred_metafield_definition_ids.map(&:to_s) %><% sorted_definitions = f.object.available_metafield_definitions.sort_by { |definition| selected_keys.index(definition.id.to_s) || selected_keys.length } %><% sorted_definitions.each do |definition| %>- <div class="rounded hover-light pl-2 pr-1 py-1 d-flex align-items-center justify-content-between"+ <div class="rounded-md hover:bg-gray-25 pl-4 pr-1 py-1 flex items-center justify-between"id="<%= spree_dom_id(definition) %>">- <div class="custom-control custom-checkbox flex-grow-1 d-flex">+ <div class="custom-control form-checkbox grow flex"><input type="checkbox"class="custom-control-input"name="<%= "#{f.object_name}[preferred_metafield_definition_ids][]" %>"@@ -20,12 +20,12 @@value="<%= definition.id %>"data-action="change->auto-submit#submit"<%= 'checked' if selected_keys.include?(definition.id.to_s) %>>- <label class="custom-control-label flex-grow-1" for="<%= "#{f.object_name}_preferred_metafield_definition_ids_#{definition.id}" %>" data-controller="tooltip">+ <label class="custom-control-label grow" for="<%= "#{f.object_name}_preferred_metafield_definition_ids_#{definition.id}" %>" data-controller="tooltip"><%= definition.name %><%= tooltip(definition.full_key) %></label></div>- <button class="btn btn-sm pr-0 handle hover-gray h-100 mr-1 px-1" type="button">+ <button class="btn btn-sm pr-0 handle hover:bg-gray-100 h-full mr-1 px-1" type="button"><%= icon('grip-vertical', class: 'mr-0') %></button></div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_nav.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_nav.html.erbindex 578c7f5870..774846071d 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_nav.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_nav.html.erb@@ -1,6 +1,6 @@<div class="form-group"><%= f.label :preferred_label %>- <%= f.text_field :preferred_label, data: { action: 'auto-submit#submit' }, class: 'form-control' %>+ <%= f.text_field :preferred_label, data: { action: 'auto-submit#submit' }, class: 'form-input' %></div><%= render 'spree/admin/page_links/list', parent: @page_block, show_add_link_button: true %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_newsletter_form.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_newsletter_form.html.erbindex 47184d2519..76b77d203f 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_newsletter_form.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_newsletter_form.html.erb@@ -1,20 +1,20 @@<div class="form-group"><%= f.label :preferred_button_text %>- <%= f.text_field :preferred_button_text, data: { action: 'auto-submit#submit' }, class: 'form-control' %>+ <%= f.text_field :preferred_button_text, data: { action: 'auto-submit#submit' }, class: 'form-input' %></div><div class="form-group"><%= f.label :preferred_placeholder %>- <%= f.text_field :preferred_placeholder, data: { action: 'auto-submit#submit' }, class: 'form-control' %>+ <%= f.text_field :preferred_placeholder, data: { action: 'auto-submit#submit' }, class: 'form-input' %></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_justify %>- <%= f.select :preferred_justify, options_for_select(['start', 'center', 'end'], @page_block.preferred_justify), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_justify, options_for_select(['start', 'center', 'end'], @page_block.preferred_justify), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_button_style %>- <%= f.select :preferred_button_style, options_for_select(['primary', 'secondary'], @page_block.preferred_button_style), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_button_style, options_for_select(['primary', 'secondary'], @page_block.preferred_button_style), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><% end %>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_price.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_price.html.erbindex d7ed2391f4..a1294aafc6 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_price.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_price.html.erb@@ -1,12 +1,12 @@<% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_text_alignment %>- <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_blocks/forms/_share.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_share.html.erbindex 5605ba6c94..1abcefa7f7 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_share.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_share.html.erb@@ -1,5 +1,5 @@<div class="trix-container"><%= f.rich_text_area :text, data: {action: 'trix-change->auto-submit#submit'- }, class: 'mb-3' %>+ }, class: 'mb-6' %></div>diff --git a/admin/app/views/spree/admin/page_blocks/forms/_subheading.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_subheading.html.erbindex 43df776556..d992ba9547 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_subheading.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_subheading.html.erb@@ -1,23 +1,23 @@<div class="trix-container"><%= f.rich_text_area :text, data: {action: 'trix-change->auto-submit#submit'- }, class: 'mb-3' %>+ }, class: 'mb-6' %></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_size %>- <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_text_alignment %>- <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_blocks/forms/_text.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_text.html.erbindex dcc5621811..5b4e86eefc 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_text.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_text.html.erb@@ -1,18 +1,18 @@<div class="trix-container"><%= f.rich_text_area :text, data: {action: 'trix-change->auto-submit#submit'- }, class: 'mb-3' %>+ }, class: 'mb-6' %></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_text_alignment %>- <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_blocks/forms/_title.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_title.html.erbindex 2d7f57e807..e868300159 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_title.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_title.html.erb@@ -1,17 +1,17 @@<% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_size %>- <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_size, options_for_select(['small', 'medium', 'large'], @page_block.preferred_size), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_text_alignment %>- <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_text_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_text_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_blocks/forms/_variant_picker.html.erb b/admin/app/views/spree/admin/page_blocks/forms/_variant_picker.html.erbindex 1ea9c23b97..a5a74e94cd 100644--- a/admin/app/views/spree/admin/page_blocks/forms/_variant_picker.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/_variant_picker.html.erb@@ -1,7 +1,7 @@<% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_blocks/forms/products/_buy_buttons.html.erb b/admin/app/views/spree/admin/page_blocks/forms/products/_buy_buttons.html.erbindex 1ea9c23b97..a5a74e94cd 100644--- a/admin/app/views/spree/admin/page_blocks/forms/products/_buy_buttons.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/products/_buy_buttons.html.erb@@ -1,7 +1,7 @@<% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_blocks/forms/products/_quantity_selector.html.erb b/admin/app/views/spree/admin/page_blocks/forms/products/_quantity_selector.html.erbindex 1ea9c23b97..a5a74e94cd 100644--- a/admin/app/views/spree/admin/page_blocks/forms/products/_quantity_selector.html.erb+++ b/admin/app/views/spree/admin/page_blocks/forms/products/_quantity_selector.html.erb@@ -1,7 +1,7 @@<% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_container_alignment %>- <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_container_alignment, options_for_select(['left', 'center', 'right'], @page_block.preferred_container_alignment), {}, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_builder/_add_block.html.erb b/admin/app/views/spree/admin/page_builder/_add_block.html.erbindex 3ca5895790..a1165a910e 100644--- a/admin/app/views/spree/admin/page_builder/_add_block.html.erb+++ b/admin/app/views/spree/admin/page_builder/_add_block.html.erb@@ -2,7 +2,7 @@<%= f.hidden_field :type, data: { block_form_target: 'type' } %><%= dropdown portal: false do %>- <%= dropdown_toggle class: 'btn-sm btn-secondary d-flex-inline' do %>+ <%= dropdown_toggle class: 'btn-sm btn-secondary flex-inline' do %><%= icon("circle-plus") %><%= Spree.t(:add_page_block) %><% end %>diff --git a/admin/app/views/spree/admin/page_builder/_color_palette.html.erb b/admin/app/views/spree/admin/page_builder/_color_palette.html.erbindex 3e24ad2377..de28e431ee 100644--- a/admin/app/views/spree/admin/page_builder/_color_palette.html.erb+++ b/admin/app/views/spree/admin/page_builder/_color_palette.html.erb@@ -6,8 +6,8 @@data-color-palette-button-text-color-param="<%= button_text_color %>"data-color-palette-border-color-param="<%= border_color %>"data-color-palette-background-color-param="<%= background_color %>"- class="mb-3 d-block w-100 rounded overflow-hidden border cursor-pointer <% if active %>border-2 border-primary<% end %>" style="height: 40px">- <div class="row mx-0 h-100">+ class="mb-4 block w-full rounded-lg overflow-hidden border cursor-pointer <% if active %>border-2 border-primary<% end %>" style="height: 40px">+ <div class="row mx-0 h-full"><div class="col" style="background-color: <%= primary_color %>"></div><div class="col" style="background-color: <%= text_color %>"></div><div class="col" style="background-color: <%= button_text_color %>"></div>diff --git a/admin/app/views/spree/admin/page_builder/_color_picker.html.erb b/admin/app/views/spree/admin/page_builder/_color_picker.html.erbindex 8a2c5e8681..049fcc30e1 100644--- a/admin/app/views/spree/admin/page_builder/_color_picker.html.erb+++ b/admin/app/views/spree/admin/page_builder/_color_picker.html.erb@@ -5,8 +5,8 @@data-controller="color-picker"data-color-picker-clear-value="<%= defined?(clear) ? clear : false %>"data-color-picker-default-color-value="<%= color_picker_value %>">- <div class="d-flex align-items-center">- <%= f.hidden_field field, class: 'form-control mr-2', data: {+ <div class="flex items-center">+ <%= f.hidden_field field, class: 'form-input mr-1', data: {'color-picker-target': 'input','color-palette-target': field.to_s.camelize(:lower),action: action,@@ -14,12 +14,12 @@<div><label class="mb-0"><%= label %></label><br />- <span data-color-picker-target="value" class="text-muted">+ <span data-color-picker-target="value" class="text-gray-600"><%= color_picker_value&.upcase || Spree.t('admin.page_builder.not_set') %></span></div>- <div class="ml-auto d-flex align-items-center" style="width:40px">- <div data-color-picker-target="picker" class="border d-inline-block rounded-circle <% unless color_picker_value.present? %>checkered-background<% end %>" style="height: 40px;width: 40px; background-color: <%= color_picker_value %>;">+ <div class="ml-auto flex items-center" style="width:40px">+ <div data-color-picker-target="picker" class="border inline-block rounded-full <% unless color_picker_value.present? %>checkered-background<% end %>" style="height: 40px;width: 40px; background-color: <%= color_picker_value %>;"></div></div></div>diff --git a/admin/app/views/spree/admin/page_builder/_header.html.erb b/admin/app/views/spree/admin/page_builder/_header.html.erbindex 1b786c58f9..556b4c1187 100644--- a/admin/app/views/spree/admin/page_builder/_header.html.erb+++ b/admin/app/views/spree/admin/page_builder/_header.html.erb@@ -2,21 +2,21 @@<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 shadow-none px-2' do %>+ <%= link_to back_url, class: 'btn hover:bg-gray-100 shadow-none px-2' do %><%= icon('x', class: 'mr-0') %><% end %><%= tooltip(Spree.t('admin.back_to_dashboard')) %></div><% if @page.custom? %><div class="px-3">- <span class="text-muted mr-1"><%= I18n.t('activerecord.models.spree/page.one') %>:</span>+ <span class="text-gray-600 mr-1"><%= I18n.t('activerecord.models.spree/page.one') %>:</span><strong><%= @page.display_name %></strong></div><%= link_to_with_icon 'settings', Spree.t(:settings), spree.edit_admin_page_path(@page.id), class: 'btn btn-light', data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% else %><div class="px-3">- <span class="text-muted mr-1"><%= Spree.t(:theme) %>:</span>+ <span class="text-gray-600 mr-1"><%= Spree.t(:theme) %>:</span><strong class="mr-1"><%= @theme.name %></strong> <% if @theme.default? %>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 a5bcbc7ee8..3c4898c60e 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,10 +1,10 @@<%= dropdown id: 'pages_dropdown', direction: 'left' do %><%= dropdown_toggle class: 'btn-light' do %>- <span class="d-flex align-items-center pr-5">+ <span class="flex items-center pr-12"><%= icon @page.icon_name, class: 'mr-2' %><%= @page.display_name %></span>- <%= icon 'selector', class: 'mr-0 ml-2 mb-0 text-muted' %>+ <%= icon 'selector', class: 'mr-0 ml-2 mb-0 text-gray-600' %><% end %><%= dropdown_menu style: 'min-width: 250px' do %><% @theme.pages.standard.order(name: :asc).find_all(&:customizable?).each do |page| %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar.html.erbindex a0cd7890b9..936b7f3db6 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar.html.erb@@ -1,14 +1,12 @@-<aside id="page-builder-sidebar" class="overflow-y-auto">- <div class="mb5">- <div data-tabs-target="panel" id="sections" role="tabpanel" aria-labelledby="sidebar-icon-page" class="animate__animated animate__fadeIn">- <%= render 'spree/admin/page_builder/sidebar_sections' %>- <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>- </div>- <div data-tabs-target="panel" role="tabpanel" aria-labelledby="sidebar-icon-colors" id="colors" hidden class="animate__animated animate__fadeIn">- <%= render 'spree/admin/page_builder/sidebar_colors' %>- </div>- <div data-tabs-target="panel" role="tabpanel" aria-labelledby="sidebar-icon-fonts" id="fonts" hidden class="animate__animated animate__fadeIn">- <%= render 'spree/admin/page_builder/sidebar_fonts' %>- </div>+<aside id="page-builder-sidebar" class="overflow-y-scroll">+ <div data-tabs-target="panel" id="sections" role="tabpanel" aria-labelledby="sidebar-icon-page" class="animate-fade-in">+ <%= render 'spree/admin/page_builder/sidebar_sections' %>+ <%= render 'spree/admin/page_builder/sidebar_sections_toolbar' %>+ </div>+ <div data-tabs-target="panel" role="tabpanel" aria-labelledby="sidebar-icon-colors" id="colors" hidden class="animate-fade-in">+ <%= render 'spree/admin/page_builder/sidebar_colors' %>+ </div>+ <div data-tabs-target="panel" role="tabpanel" aria-labelledby="sidebar-icon-fonts" id="fonts" hidden class="animate-fade-in">+ <%= render 'spree/admin/page_builder/sidebar_fonts' %></div></aside>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 3530791827..8a79653753 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@@ -5,10 +5,10 @@page_builder_editor_id_param: "block-#{block.id}",sortable_update_url: spree.admin_page_section_block_path(block.section, block, format: :turbo_stream)} do %>- <div class="d-flex align-items-center justify-content-between sidebar-block-title p-1 rounded-sm">- <div class="d-flex align-items-center flex-fill">+ <div class="flex items-center justify-between sidebar-block-title p-1 rounded-md">+ <div class="flex items-center flex-1"><%= link_to(edit_admin_page_section_block_path(block.section, block),- class: 'block-edit-link flex-fill text-dark',+ class: 'block-edit-link flex-1 text-gray-900',data: {turbo_frame: :page_sidebar,action: 'click->page-builder#makeOverlayActive',@@ -18,9 +18,9 @@<%= block.display_name %><% end %></div>- <div class="d-flex align-items-center d-none">+ <div class="flex items-center hidden"><% if block.section.can_sort_blocks? %>- <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 px-1 handle-block shadow-none">+ <button class="btn btn-sm pr-0 handle hover:bg-gray-100 h-full 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 e2bc73f0e6..5b234d80d0 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@@ -5,17 +5,17 @@<%= form_for @theme_preview, as: :theme, url: spree.admin_theme_path(@theme_preview), method: :put, data: { 'page-builder-target': 'form' } do |f| %><div data-controller="tabs">- <ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist">+ <ul class="nav nav-pills nav-fill m-4" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <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>+ <button class="nav-link w-full 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="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-full" 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">- <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn">- <div class="px-3 py-2" data-controller="color-palette">+ <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate-fade-in">+ <div class="px-4 py-2" data-controller="color-palette"><% color_palettes.each do |color_palette| %><%#= render 'spree/admin/page_builder/color_palette',active: color_palette_active?(color_palette),@@ -28,7 +28,7 @@%><% end %>- <%# <hr class="my-4 bg-light" /> %>+ <%# <hr class="my-4 bg-gray-25" /> %><%= render 'spree/admin/page_builder/color_picker', f: f,field: :preferred_primary_color, label: Spree.t("theme_settings.brand_color"),@@ -65,8 +65,8 @@value: @theme_preview.preferred_success_color, action: 'change->page-builder#refreshPreview' %></div></div>- <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" hidden class="animate__animated animate__fadeIn">- <div class="px-3 py-2">+ <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" hidden class="animate-fade-in">+ <div class="px-4 py-2"><%= render 'spree/admin/page_builder/range_input',f: f, field: :preferred_button_border_radius, min: 0, max: 100, unit: 'px', action: 'change->page-builder#refreshPreview'%>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 949f4c173f..d7f22cd11b 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@@ -4,24 +4,24 @@<%= form_for @theme_preview, as: :theme, url: spree.admin_theme_path(@theme_preview), method: :put, data: { 'page-builder-target': 'fontForm' } do |f| %><div data-controller="tabs">- <ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist">+ <ul class="nav nav-pills nav-fill m-4" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <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">+ <button class="nav-link w-full 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="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-full" 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></ul><div id="pills-tabContent">- <div data-tabs-target="panel" id="pills-standard-tab" role="tabpanel" aria-labelledby="pills-standard" class="animate__animated animate__fadeIn">- <div class="px-3 py-2">- <div class="mb-3 form-group">+ <div data-tabs-target="panel" id="pills-standard-tab" role="tabpanel" aria-labelledby="pills-standard" class="animate-fade-in">+ <div class="px-4 py-2">+ <div class="mb-4 form-group"><%= f.label :preferred_font_family, Spree.t(:font_family) %>- <%= f.select :preferred_font_family, options_for_select(all_fonts_options, f.object.preferred_font_family), { include_blank: true }, class: 'd-none', data: { action: 'change->page-builder#refreshFontPreview', controller: 'font-picker', font_picker_fonts_from_google_value: google_fonts_list.to_json } %>+ <%= f.select :preferred_font_family, options_for_select(all_fonts_options, f.object.preferred_font_family), { include_blank: true }, class: 'hidden', data: { action: 'change->page-builder#refreshFontPreview', controller: 'font-picker', font_picker_fonts_from_google_value: google_fonts_list.to_json } %></div><div class="mb-3 form-group" data-controller="range-input"><%= f.label :preferred_font_size_scale, Spree.t(:font_size_scale) %>@@ -34,9 +34,9 @@</span>%</div><hr />- <div class="mb-3 form-group">+ <div class="mb-4 form-group"><%= f.label :preferred_header_font_family, Spree.t(:header_font_family) %>- <%= f.select :preferred_header_font_family, options_for_select(all_fonts_options, f.object.preferred_header_font_family), { include_blank: true }, class: 'd-none', data: { action: 'change->page-builder#refreshFontPreview', controller: 'font-picker', font_picker_fonts_from_google_value: google_fonts_list.to_json } %>+ <%= f.select :preferred_header_font_family, options_for_select(all_fonts_options, f.object.preferred_header_font_family), { include_blank: true }, class: 'hidden', data: { action: 'change->page-builder#refreshFontPreview', controller: 'font-picker', font_picker_fonts_from_google_value: google_fonts_list.to_json } %></div><div class="mb-3 form-group" data-controller="range-input"><%= f.label :preferred_header_font_size_scale, Spree.t(:header_font_size_scale) %>@@ -48,15 +48,15 @@<%= f.object.preferred_header_font_size_scale %></span>%</div>- <div class="mb-3 custom-control custom-checkbox">+ <div class="mb-4 custom-control form-checkbox"><%= f.check_box :preferred_headings_uppercase, class: "custom-control-input", data: { action: 'change->page-builder#refreshFontPreview' } %><%= f.label :preferred_headings_uppercase, "Make all headings uppercase", class: "custom-control-label" %></div></div></div>- <div data-tabs-target="panel" id="pills-custom-tab" role="tabpanel" aria-labelledby="pills-custom" hidden class="animate__animated animate__fadeIn">- <div class="px-3 py-2">- <div class="mb-3">+ <div data-tabs-target="panel" id="pills-custom-tab" role="tabpanel" aria-labelledby="pills-custom" hidden class="animate-fade-in">+ <div class="px-4 py-2">+ <div class="mb-4"><div class="alert alert-warning">Using custom fonts can slow down your store.</div>@@ -64,10 +64,10 @@</div><%= f.submit Spree.t('actions.update'), class: 'btn btn-primary' %>- <hr class="my-4" />+ <hr class="my-6" />- <h6>Example how to add custom fonts</h6>- <textarea class="bg-gray-100 rounded w-100 border-0 p-2 text-muted" style="height: 250px"><link rel="stylesheet" href="https://url.to.your.font.com/font.js" />+ <h6 class="mb-3">Example how to add custom fonts</h6>+ <textarea class="form-input h-[250px]" ><link rel="stylesheet" href="https://url.to.your.font.com/font.js" /><style>/* set font for body */body {@@ -77,8 +77,7 @@h1, h2, h3, h4, h5, h6 {font-family: "your font name", sans-serif;}-</style>- </textarea>+</style></textarea></div></div></div>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 f6945af2a8..20bf04f3d3 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@@ -1,13 +1,13 @@<% if section.persisted? %><%= turbo_frame_tag dom_id(section), class: 'list-group-item py-0 border-0 sidebar-page-section draggable rounded-sm',data: { sortable_update_url: spree.admin_page_section_path(section, format: :turbo_stream) } do %>- <div class="d-flex align-items-center justify-content-between sidebar-section-title py-1 rounded"+ <div class="flex items-center justify-between sidebar-section-title py-1 rounded-xl"data-action="mouseover->page-builder#toggleHighlightElement mouseout->page-builder#toggleHighlightElement"data-page-builder-editor-id-param="section-<%= section.id %>">- <div class="d-flex align-items-center flex-fill py-1 px-2">+ <div class="flex items-center flex-1 py-1 px-2"><%= icon("#{section.icon_name}", height: 18, class: 'mr-2') if section.icon_name.present? %><%= link_to section.display_name, spree.edit_admin_page_section_path(section),- class: 'section-edit-link flex-fill font-weight-bold text-dark',+ class: 'section-edit-link flex-1 font-bold text-gray-900',data: {turbo_frame: :page_sidebar,action: 'click->page-builder#makeOverlayActive',@@ -15,14 +15,14 @@}%></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 shadow-none">+ <div class="flex items-center hidden">+ <button class="btn btn-sm pr-0 handle hover:bg-gray-100 h-full mr-1 px-1 handle-section shadow-none"><%= icon('grip-vertical', class: 'mr-0') %></button></div></div><% if section.blocks_available? %>- <div class="d-flex flex-column ml-1 mb-2">+ <div class="flex flex-col ml-1 mb-2"><%= turbo_frame_tag [:blocks, section.id].join('_'), class: 'list-group-flush' do %><% if section.can_sort_blocks? %><div data-controller="sortable"diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_sections.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_sections.html.erbindex 5a8600cc20..f54c441dc3 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_sections.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_sections.html.erb@@ -1,8 +1,8 @@<%= turbo_frame_tag :page_sidebar do %>-<div class="d-none d-md-block">+<div class="hidden md:block"><h6 class="sidebar-header">Page sections</h6><% if @page_preview.layout_sections? %>- <div class="list-group-flush border-bottom mb-1 pb-2">+ <div class="list-group-flush border-b mb-1 pb-2"><div data-controller="sortable"data-sortable-handle-value=".handle-section"data-sortable-resource-name-value="page_section"@@ -21,11 +21,11 @@as: :section %></div></div>- <div class="px-3">- <%= link_to_with_icon 'new-section', Spree.t(:add_section), spree.new_admin_page_section_path(@page_preview), class: 'btn btn-primary rounded-pill text-uppercase w-100 my-2 py-2' %>+ <div class="px-4">+ <%= link_to_with_icon 'new-section', Spree.t(:add_section), spree.new_admin_page_section_path(@page_preview), class: 'btn btn-primary rounded-full uppercase w-full my-2 py-2' %></div><% if @page_preview.layout_sections? %>- <div class="list-group-flush border-top py-2">+ <div class="list-group-flush border-t py-2"><div data-controller="sortable"data-sortable-handle-value=".handle-section"data-sortable-resource-name-value="page_section"@@ -35,9 +35,4 @@</div><% end %></div>-<div class="d-flex justify-content-center pt-5 d-md-none align-items-center">- <div class="spinner-border" role="status">- </div>- <p class="ml-2 m-0"><%= Spree.t(:loading) %>...</p>-</div><% end if @page_preview.present? %>diff --git a/admin/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erb b/admin/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erbindex 26372648ca..d2aa6d947d 100644--- a/admin/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erb+++ b/admin/app/views/spree/admin/page_builder/_sidebar_sections_toolbar.html.erb@@ -1,5 +1,5 @@<%= turbo_frame_tag :page_sidebar_toolbar do %>- <div class="d-none">+ <div class="hidden"><% sections =@page_preview.sections.includes(:blocks).map { |s| [@page_preview, s] } %>diff --git a/admin/app/views/spree/admin/page_links/_form.html.erb b/admin/app/views/spree/admin/page_links/_form.html.erbindex 5ed0135a9c..0b6d0ef636 100644--- a/admin/app/views/spree/admin/page_links/_form.html.erb+++ b/admin/app/views/spree/admin/page_links/_form.html.erb@@ -1,9 +1,9 @@<% data_action = (@page_link.persisted? && !@page_link.parent.is_a?(Spree::Store) ? { action: 'blur->auto-submit#submit' } : {}) %>-<%= f.spree_select :linkable_type, @page_link.parent.allowed_linkable_types, { label: 'Link', include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>+<%= f.spree_select :linkable_type, @page_link.parent.allowed_linkable_types, { label: 'Link', include_blank: false }, { class: 'form-select mb-6', data: { action: 'auto-submit#submit' } } %><%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_link, form_name: 'page_link' %>-<hr class="my-4" />+<hr class="my-6" /><%= f.spree_text_field :label, label: Spree.t(:name), data: data_action, required: true %>diff --git a/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb b/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erbindex 9a64010a01..b82bc5ce7f 100644--- a/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb+++ b/admin/app/views/spree/admin/page_links/_linkable_type_dropdown.html.erb@@ -1,15 +1,15 @@<% if page_link.linkable_type == 'Spree::Product' %>- <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.select_options_admin_products_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-full', url: spree.select_options_admin_products_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %><% elsif page_link.linkable_type == 'Spree::Taxon' %>- <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json, with_automatic: true), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-full', url: spree.admin_taxons_select_options_path(format: :json, with_automatic: true), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %><% elsif page_link.linkable_type == 'Spree::Post' %>- <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.select_options_admin_posts_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-full', url: spree.select_options_admin_posts_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %><% elsif page_link.linkable_type == 'Spree::Page' %><%= select_tag "#{form_name}[linkable_id]", options_for_select(all_linkable_pages, page_link.linkable_id), { data: { controller: 'autocomplete-select', action: 'auto-submit#submit' } } %><% elsif page_link.linkable_type == 'Spree::Policy' %><%= select_tag "#{form_name}[linkable_id]", options_for_select(all_linkable_policies, page_link.linkable_id), { data: { controller: 'autocomplete-select', action: 'auto-submit#submit' } } %><% elsif page_link.linkable_type == 'Spree::Vendor' %>- <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-100', url: spree.select_options_admin_vendors_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %>+ <%= tom_select_tag "#{form_name}[linkable_id]", class: 'w-full', url: spree.select_options_admin_vendors_path(format: :json), active_option: page_link.linkable_id, select_data: { action: 'auto-submit#submit' } %><% else %>- <%= text_field_tag "#{form_name}[url]", page_link.url, class: "form-control", required: true, placeholder: 'eg. google.com', data: { action: 'blur->auto-submit#submit' } %>+ <%= text_field_tag "#{form_name}[url]", page_link.url, class: "form-input", required: true, placeholder: 'eg. google.com', data: { action: 'blur->auto-submit#submit' } %><% end %>diff --git a/admin/app/views/spree/admin/page_links/_list.html.erb b/admin/app/views/spree/admin/page_links/_list.html.erbindex c011005fdb..e054588c91 100644--- a/admin/app/views/spree/admin/page_links/_list.html.erb+++ b/admin/app/views/spree/admin/page_links/_list.html.erb@@ -1,25 +1,25 @@-<div class="mb-4">- <h5 class="font-weight-bold">Links</h5>+<div class="mb-6">+ <h5 class="font-bold">Links</h5><% if parent.links.any? %>- <ul class="list-group mb-3"+ <ul class="list-group mb-6"data-controller="sortable"data-sortable-handle-value=".handle"data-sortable-resource-name-value="page_link"data-sortable-response-kind-value="turbo-stream"><% parent.links.each do |link| %>- <li class="list-group-item p-0 d-flex align-items-center hover-gray"+ <li class="list-group-item p-0 flex items-center hover:bg-gray-100"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 shadow-none">+ <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'block py-4 px-6 text-gray-900 flex-1' %>+ <button class="btn btn-sm pr-0 handle hover:bg-gray-100 h-full mr-1 px-1 shadow-none"><%= icon 'grip-vertical', class: 'mr-0' %></button></li><% end %></ul><% else %>- <p class="text-muted text-center p-5">+ <p class="text-gray-600 text-center p-12"><%= Spree.t(:no_resource_found, resource: Spree::PageLink.model_name.human) %></p><% end %>@@ -31,6 +31,6 @@<% add_url = spree.admin_page_section_block_links_path(parent.section, parent) %><% end %>- <%= link_to_with_icon 'plus', Spree.t(:add_link), add_url, class: 'btn btn-primary w-100', data: { turbo_method: :post } if add_url && can?(:create, Spree::PageLink.new(parent: parent)) %>+ <%= link_to_with_icon 'plus', Spree.t(:add_link), add_url, class: 'btn btn-primary w-full', data: { turbo_method: :post } if add_url && can?(:create, Spree::PageLink.new(parent: parent)) %><% end %></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/page_links/edit.html.erb b/admin/app/views/spree/admin/page_links/edit.html.erbindex b603552d9e..e29f315931 100644--- a/admin/app/views/spree/admin/page_links/edit.html.erb+++ b/admin/app/views/spree/admin/page_links/edit.html.erb@@ -1,23 +1,21 @@<% if @page_link.parent.is_a?(Spree::Store) %>- <%= turbo_frame_tag spree_dom_id(@page_link), class: 'd-flex align-items-center w-100 py-2 pl-3 pr-2' do %>- <%= link_to collection_url, class: 'btn-close position-absolute top-0 right-0 mt-2 mr-2' do %>- <%= icon 'x', class: 'mr-0' %>- <% end %>- <%= form_for @page_link, url: spree.admin_page_link_path(@page_link), data: { controller: 'auto-submit' }, html: { class: 'w-100 mt-2 mr-1 mb-2' } do |f| %>+ <%= turbo_frame_tag spree_dom_id(@page_link), class: 'flex items-center w-full py-2 pl-6 pr-2' do %>+ <%= link_to '', collection_url, class: 'btn-close absolute top-0 right-0 mt-4 mr-4' %>+ <%= form_for @page_link, url: spree.admin_page_link_path(@page_link), data: { controller: 'auto-submit' }, html: { class: 'w-full mt-4 mr-1 mb-4' } do |f| %><%= render 'spree/admin/page_links/form', f: f %>- <hr class="my-3">+ <hr class="my-6"><%= render 'spree/admin/shared/edit_resource_links', f: f %><% end %><% end %><% 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 shadow-none px-2' do %>+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover:bg-gray-100 shadow-none px-3' do %><%= icon 'chevron-left', class: 'mr-0' %><% end %><%= @page_link.label %></h6>- <div class="px-3 pb-5 mb-5 edit-block">+ <div class="px-6 pb-12 mb-12 edit-block"><%= form_for @page_link, url: spree.admin_page_link_path(@page_link), data: { controller: 'auto-submit' } do |f| %><%= render 'spree/admin/page_links/form', f: f %><% end %>diff --git a/admin/app/views/spree/admin/page_links/update.turbo_stream.erb b/admin/app/views/spree/admin/page_links/update.turbo_stream.erbindex 83ede2af9a..2bb97f608e 100644--- a/admin/app/views/spree/admin/page_links/update.turbo_stream.erb+++ b/admin/app/views/spree/admin/page_links/update.turbo_stream.erb@@ -1,7 +1,9 @@<% if @page_link.parent.is_a?(Spree::Store) %>- <%= turbo_stream.replace spree_dom_id(@page_link) do %>+ <% unless params[:sorting_only] %>+ <%= turbo_stream.replace spree_dom_id(@page_link) do %><%= render template: 'spree/admin/page_links/edit' %><% end %>+ <% end %><% else %><% unless params[:sorting_only] %><%= turbo_stream.replace :page_sidebar do %>diff --git a/admin/app/views/spree/admin/page_sections/edit.html.erb b/admin/app/views/spree/admin/page_sections/edit.html.erbindex 7f7a51e794..8f9fd85867 100644--- a/admin/app/views/spree/admin/page_sections/edit.html.erb+++ b/admin/app/views/spree/admin/page_sections/edit.html.erb@@ -1,27 +1,27 @@<%= 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 shadow-none px-2' do %>+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover:bg-gray-100 shadow-none px-3' do %><%= icon 'chevron-left', class: 'mr-0 back' %><% end %><%= @page_section.display_name %></h6>- <div class="px-3 pb-5 mb-5 edit-block" style="margin-bottom: 6rem;">+ <div class="p-3 edit-block"><%= form_for @page_section, url: spree.admin_page_section_path(@page_section), data: { controller: 'auto-submit' }, as: :page_section do |f| %><div data-controller="tabs">- <ul class="nav nav-pills nav-fill mb-3" id="pills-tab" role="tablist">+ <ul class="nav nav-pills nav-fill mb-6" id="pills-tab" role="tablist"><li class="nav-item" role="presentation">- <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>+ <button class="nav-link w-full <%= 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="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-full <%= 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 %>>+ <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate-fade-in" <%= 'hidden' unless tab_selected == :content %>><%= render "spree/admin/page_sections/forms/#{@page_section.type.demodulize.underscore}", f: f %><%= render 'spree/admin/page_sections/form_tab_buttons', tab: :content %></div>- <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :design %>>+ <div data-tabs-target="panel" id="pills-profile" role="tabpanel" aria-labelledby="pills-profile-tab" class="animate-fade-in" <%= 'hidden' unless tab_selected == :design %>><%= render 'spree/admin/page_sections/fields/top_padding', f: f %><%= render 'spree/admin/page_sections/fields/bottom_padding', f: f %><%= render 'spree/admin/page_sections/fields/background_color', f: f %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_announcement_bar.html.erb b/admin/app/views/spree/admin/page_sections/forms/_announcement_bar.html.erbindex 5605ba6c94..a50d67c3ca 100644--- a/admin/app/views/spree/admin/page_sections/forms/_announcement_bar.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_announcement_bar.html.erb@@ -1,5 +1,5 @@<div class="trix-container"><%= f.rich_text_area :text, data: {action: 'trix-change->auto-submit#submit'- }, class: 'mb-3' %>+ }, class: 'mb-4' %></div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_custom_code.html.erb b/admin/app/views/spree/admin/page_sections/forms/_custom_code.html.erbindex 42805ee910..d866a2a24f 100644--- a/admin/app/views/spree/admin/page_sections/forms/_custom_code.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_custom_code.html.erb@@ -1,4 +1,4 @@-<p class="text-muted">+<p class="text-gray-600">You can use all HTML tags, JavaScript or CSS here</p>-<%= f.text_area :preferred_custom_code, rows: 10, class: 'mb-3 form-control', data: { action: 'auto-submit#submit' } %>+<%= f.text_area :preferred_custom_code, rows: 10, class: 'mb-6 form-input', data: { action: 'auto-submit#submit' } %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_posts.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_posts.html.erbindex 3f4e5ec1bf..0398d1c600 100644--- a/admin/app/views/spree/admin/page_sections/forms/_featured_posts.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_posts.html.erb@@ -1,24 +1,24 @@<div class="form-group"><%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>- <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-input" %></div><div class="form-group"><%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>- <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>- <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.label :description %><div class="trix-container">- <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-3 w-full' %>+ <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-4 w-full' %></div></div><div class="form-group"><%= f.label :preferred_description_alignment, Spree.t('admin.page_builder.description_alignment') %>- <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group">diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_product.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_product.html.erbindex 06356b9397..291898c341 100644--- a/admin/app/views/spree/admin/page_sections/forms/_featured_product.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_product.html.erb@@ -1,4 +1,4 @@<div class="form-group"><%= f.label :preferred_product, Spree.t(:product) %>- <%= tom_select_tag 'page_section[preferred_product_id]', active_option: @page_section.preferred_product_id, class: 'w-100', url: spree.select_options_admin_products_path(format: :json), include_blank: false, select_data: {action: 'auto-submit#submit'} %>+ <%= tom_select_tag 'page_section[preferred_product_id]', active_option: @page_section.preferred_product_id, class: 'w-full', url: spree.select_options_admin_products_path(format: :json), include_blank: false, select_data: {action: 'auto-submit#submit'} %></div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_taxon.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_taxon.html.erbindex f24e748c6a..989dbe03cd 100644--- a/admin/app/views/spree/admin/page_sections/forms/_featured_taxon.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_taxon.html.erb@@ -1,24 +1,24 @@<div class="form-group"><%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>- <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-input" %></div><div class="form-group"><%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>- <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>- <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.label :description %><div class="trix-container">- <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-3 w-full' %>+ <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-4 w-full' %></div></div><div class="form-group"><%= f.label :preferred_description_alignment, Spree.t('admin.page_builder.description_alignment') %>- <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.check_box :preferred_use_description_from_admin, class: "checkbox-input", data: { action: 'auto-submit#submit' } %>@@ -27,7 +27,7 @@</div><div class="form-group"><%= f.label :preferred_button_text, Spree.t('admin.page_builder.button_text') %>- <%= f.text_field :preferred_button_text, class: 'form-control', data: { action: 'blur->auto-submit#submit' }, placeholder: 'eg. Explore category', required: true %>+ <%= f.text_field :preferred_button_text, class: 'form-input', data: { action: 'blur->auto-submit#submit' }, placeholder: 'eg. Explore category', required: true %></div><div class="form-group"><%= f.check_box :preferred_show_taxon_image, class: "checkbox-input", data: { action: 'auto-submit#submit' } %>@@ -35,7 +35,7 @@</div><div class="form-group"><%= f.label :preferred_taxon, Spree.t('admin.page_builder.category') %>- <%= tom_select_tag 'page_section[preferred_taxon_id]', active_option: @page_section.preferred_taxon_id, class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json, with_automatic: true), select_data: {action: 'auto-submit#submit'} %>+ <%= tom_select_tag 'page_section[preferred_taxon_id]', active_option: @page_section.preferred_taxon_id, class: 'w-full', url: spree.admin_taxons_select_options_path(format: :json, with_automatic: true), select_data: {action: 'auto-submit#submit'} %></div><div class="form-group"><%= f.check_box :preferred_show_more_button, class: "checkbox-input", data: { action: 'auto-submit#submit' } %>@@ -45,15 +45,15 @@<div data-controller="better-slider"><label><%= Spree.t('admin.page_builder.maximum_products_to_show') %>: <span data-better-slider-target="currentValueLabel"></span></label><div class="flex flex-row w-full">- <span class="mr-2">3</span>+ <span class="mr-4">3</span><%= f.range_field :preferred_max_products_to_show, class: "custom-range w-full", min: 3, max: 20, data: {'better-slider-target': 'rangeInput', action: 'auto-submit#submit'} %>- <span class="ml-2">20</span>+ <span class="ml-4">20</span></div></div></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_button_style, Spree.t('admin.page_builder.button_style') %>- <%= f.select :preferred_button_style, options_for_select([['Primary', 'primary'], ['Secondary', 'secondary']], @page_section.preferred_button_style), {}, data: { action: 'auto-submit#submit' }, class: 'custom-select' %>+ <%= f.select :preferred_button_style, options_for_select([['Primary', 'primary'], ['Secondary', 'secondary']], @page_section.preferred_button_style), {}, data: { action: 'auto-submit#submit' }, class: 'form-select' %></div><% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_featured_taxons.html.erb b/admin/app/views/spree/admin/page_sections/forms/_featured_taxons.html.erbindex 67710e0859..35fa8ae8d0 100644--- a/admin/app/views/spree/admin/page_sections/forms/_featured_taxons.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_featured_taxons.html.erb@@ -1,13 +1,13 @@<div class="form-group"><%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>- <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-input" %></div><div class="form-group"><%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>- <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>- <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><%= render 'spree/admin/page_links/list', parent: @page_section, show_add_link_button: true %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_footer.html.erb b/admin/app/views/spree/admin/page_sections/forms/_footer.html.erbindex 5fc085f0bf..386dc3d2db 100644--- a/admin/app/views/spree/admin/page_sections/forms/_footer.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_footer.html.erb@@ -1,10 +1,10 @@-<div class="alert alert-info mb-3">+<div class="alert alert-info mb-6">If you don't upload a logo we'll use the one from the header.</div><%= render 'spree/admin/shared/page_section_logo', f: f %>-<p class="text-muted small mt-2">+<p class="text-gray-600 small mt-4">We recommend transparent images with a minimum size of 400x128 pixels.</p>diff --git a/admin/app/views/spree/admin/page_sections/forms/_header.html.erb b/admin/app/views/spree/admin/page_sections/forms/_header.html.erbindex 9e78641fc0..fb5eac24e0 100644--- a/admin/app/views/spree/admin/page_sections/forms/_header.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_header.html.erb@@ -1,6 +1,6 @@<%= render 'spree/admin/shared/page_section_logo', f: f %>-<p class="text-muted small mt-2">+<p class="text-gray-600 small mt-2">We recommend transparent images with a minimum size of 400x128 pixels.</p>diff --git a/admin/app/views/spree/admin/page_sections/forms/_image_banner.html.erb b/admin/app/views/spree/admin/page_sections/forms/_image_banner.html.erbindex 6943fb5ef2..4753b5d57a 100644--- a/admin/app/views/spree/admin/page_sections/forms/_image_banner.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_image_banner.html.erb@@ -3,7 +3,7 @@<% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_vertical_alignment, Spree.t('admin.page_builder.vertical_alignment') %>- <%= f.select :preferred_vertical_alignment, options_for_select([:top, :middle, :bottom], @page_section.preferred_vertical_alignment), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_vertical_alignment, options_for_select([:top, :middle, :bottom], @page_section.preferred_vertical_alignment), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/range_input',diff --git a/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb b/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erbindex eaed91d66a..9b7d1c77c4 100644--- a/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb@@ -3,26 +3,26 @@<%= f.fields_for :link do |lf| %><div class="form-group"><%= lf.label :linkable_type, 'Link' %>- <%= lf.select :linkable_type, @page_section.allowed_linkable_types, { include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>+ <%= lf.select :linkable_type, @page_section.allowed_linkable_types, { include_blank: false }, { class: 'form-select mb-4', data: { action: 'auto-submit#submit' } } %><div id="linkable_type_dropdown"><%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: lf.object, form_name: 'page_section[link_attributes]' %></div></div>- <div class="pb-2 custom-control custom-checkbox">+ <div class="pb-2 custom-control form-checkbox"><%= lf.check_box :open_in_new_tab, class: 'custom-control-input', data: { action: 'auto-submit#submit' } %><%= lf.label :open_in_new_tab, class: 'custom-control-label' %>- <span class="mt-2 text-muted form-text"><%= Spree.t('admin.page_builder.image_click_hint') %></span>+ <span class="mt-2 text-gray-600 form-text"><%= Spree.t('admin.page_builder.image_click_hint') %></span></div><% end %></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_desktop_image_alignment, Spree.t('admin.page_builder.desktop_image_alignment') %>- <%= f.select :preferred_desktop_image_alignment, options_for_select(['left', 'right'], @page_section.preferred_desktop_image_alignment), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_desktop_image_alignment, options_for_select(['left', 'right'], @page_section.preferred_desktop_image_alignment), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><div class="form-group"><%= f.label :preferred_vertical_alignment, Spree.t('admin.page_builder.vertical_alignment') %>- <%= f.select :preferred_vertical_alignment, options_for_select([:top, :middle, :bottom], @page_section.preferred_vertical_alignment), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_vertical_alignment, options_for_select([:top, :middle, :bottom], @page_section.preferred_vertical_alignment), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><hr /><% end %>diff --git a/admin/app/views/spree/admin/page_sections/forms/_main_password_footer.html.erb b/admin/app/views/spree/admin/page_sections/forms/_main_password_footer.html.erbindex 43dd26b946..817957821b 100644--- a/admin/app/views/spree/admin/page_sections/forms/_main_password_footer.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_main_password_footer.html.erb@@ -1,9 +1,9 @@-<div class="alert alert-info mb-3">+<div class="alert alert-info mb-6">If you don't upload a logo we'll use the one from the header.</div><%= render 'spree/admin/shared/page_section_logo', f: f %>-<p class="text-muted small mt-2">+<p class="text-gray-600 small mt-4">We recommend transparent images with a minimum size of 400x128 pixels.</p>diff --git a/admin/app/views/spree/admin/page_sections/forms/_main_password_header.erb b/admin/app/views/spree/admin/page_sections/forms/_main_password_header.erbindex a513cf3494..b4c8285dd6 100644--- a/admin/app/views/spree/admin/page_sections/forms/_main_password_header.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_main_password_header.erb@@ -1,7 +1,7 @@<label>Logo image</label><%= render 'spree/admin/shared/page_section_logo', f: f %>-<p class="text-muted small mt-2">+<p class="text-gray-600 small mt-2">We recommend transparent images with a minimum size of 400x128 pixels.</p>diff --git a/admin/app/views/spree/admin/page_sections/forms/_page_title.html.erb b/admin/app/views/spree/admin/page_sections/forms/_page_title.html.erbindex d79a399416..b578243408 100644--- a/admin/app/views/spree/admin/page_sections/forms/_page_title.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_page_title.html.erb@@ -1,4 +1,4 @@<div class="form-group"><%= f.label :preferred_title, Spree.t('admin.page_builder.title') %>- <%= f.text_field :preferred_title, data: { action: 'auto-submit#submit' }, class: "form-control" %>+ <%= f.text_field :preferred_title, data: { action: 'auto-submit#submit' }, class: "form-input" %></div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_related_products.html.erb b/admin/app/views/spree/admin/page_sections/forms/_related_products.html.erbindex f5d6eb32fc..f285dfe501 100644--- a/admin/app/views/spree/admin/page_sections/forms/_related_products.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_related_products.html.erb@@ -1,24 +1,24 @@<div class="form-group"><%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>- <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-input" %></div><div class="form-group"><%= f.label :preferred_heading_size, Spree.t('admin.page_builder.heading_size') %>- <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_size, options_for_select([ ["Small", 'small'], ["Medium", 'medium'], ["Large", 'large'] ], @page_section.preferred_heading_size ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.label :preferred_heading_alignment, Spree.t('admin.page_builder.heading_alignment') %>- <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_heading_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_heading_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><%= f.label :description, Spree.t('admin.page_builder.description') %><div class="trix-container">- <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-3 w-full' %>+ <%= f.rich_text_area :description, data: {action: 'trix-change->auto-submit#submit'}, class: 'mb-4 w-full' %></div></div><div class="form-group"><%= f.label :preferred_description_alignment, Spree.t('admin.page_builder.description_alignment') %>- <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "custom-select" %>+ <%= f.select :preferred_description_alignment, options_for_select([ ["Left", "left"], ["Center", "center"], ["Right", "right"] ], @page_section.preferred_description_alignment ), {}, data: { action: 'auto-submit#submit' }, class: "form-select" %></div><div class="form-group"><div data-controller="better-slider">diff --git a/admin/app/views/spree/admin/page_sections/forms/_taxon_grid.html.erb b/admin/app/views/spree/admin/page_sections/forms/_taxon_grid.html.erbindex 3ce54fb375..0dac07883a 100644--- a/admin/app/views/spree/admin/page_sections/forms/_taxon_grid.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_taxon_grid.html.erb@@ -1,5 +1,5 @@<div class="form-group"><%= f.label :preferred_heading, Spree.t('admin.page_builder.heading') %>- <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-control" %>+ <%= f.text_field :preferred_heading, data: { action: 'auto-submit#submit' }, class: "form-input" %></div>diff --git a/admin/app/views/spree/admin/page_sections/forms/_video.html.erb b/admin/app/views/spree/admin/page_sections/forms/_video.html.erbindex 9dfa3a9b02..b82795d38a 100644--- a/admin/app/views/spree/admin/page_sections/forms/_video.html.erb+++ b/admin/app/views/spree/admin/page_sections/forms/_video.html.erb@@ -1,12 +1,12 @@<div class="form-group"><%= f.label :preferred_youtube_video_url, Spree.t('admin.page_builder.youtube_video_url') %>- <%= f.url_field :preferred_youtube_video_url, data: { action: 'change->auto-submit#submit' }, class: 'form-control' %>+ <%= f.url_field :preferred_youtube_video_url, data: { action: 'change->auto-submit#submit' }, class: 'form-input' %></div><% content_for(:design_tab) do %><div class="form-group"><%= f.label :preferred_separated, Spree.t('admin.page_builder.separated') %>- <%= f.select :preferred_separated, options_for_select(['horizontally', 'vertically'], @page_section.preferred_separated), { }, { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :preferred_separated, options_for_select(['horizontally', 'vertically'], @page_section.preferred_separated), { }, { class: 'form-select', data: { action: 'auto-submit#submit' } } %></div><%= render 'spree/admin/page_builder/labeled_range_input',diff --git a/admin/app/views/spree/admin/page_sections/new.html.erb b/admin/app/views/spree/admin/page_sections/new.html.erbindex fb988ee522..09c0f27cf9 100644--- a/admin/app/views/spree/admin/page_sections/new.html.erb+++ b/admin/app/views/spree/admin/page_sections/new.html.erb@@ -1,28 +1,26 @@<%= turbo_frame_tag :page_sidebar do %><h6 class="sidebar-header">- <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %>+ <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover:bg-gray-100 shadow-none px-2' do %><%= icon 'chevron-left', class: 'mr-0 back' %><% end %><%= Spree.t(:add_section) %></h6>- <div class="pb-5 mb-5 edit-block">+ <div class="pb-12 mb-12 edit-block"><%= form_for @page_preview.sections.new, url: spree.admin_page_sections_path(@page_preview), data: { controller: 'section-form', section_form_target: :form } do |f| %><%= f.hidden_field :type, data: { section_form_target: 'type' } %><%= f.hidden_field :pageable_id %><%= f.hidden_field :pageable_type %>- <% cache spree_base_cache_scope.call('new-section-list'), expires_in: 1.hour do %>- <ul class="list-group list-group-flush m-2 mx-3 border p-1 rounded-lg bg-white">- <% @theme.available_page_sections.each do |section_class| %>- <li class="list-group-item p-2 list-group-item-action cursor-pointer d-flex align-items-center hover-action text-primary"- data-action="click->section-form#addSection"- data-section-form-type-param="<%= section_class %>"- >- <%= icon section_class.new.icon_name, class: 'mr-3' if section_class.new.icon_name.present? %>- <%= section_class.to_s.demodulize.titleize %>- </li>- <% end %>- </ul>- <% end %>+ <div class="flex flex-col gap-1 p-3">+ <% @theme.available_page_sections.each do |section_class| %>+ <button class="cursor-pointer flex items-center gap-4 hover:bg-gray-100 p-2 rounded-lg focus:outline focus:outline-2 focus:outline-offset-2 focus:outline-blue-500"+ data-action="click->section-form#addSection keydown.enter->section-form#addSection"+ data-section-form-type-param="<%= section_class %>"+ >+ <%= icon section_class.new.icon_name if section_class.new.icon_name.present? %>+ <%= section_class.to_s.demodulize.titleize %>+ </button>+ <% end %>+ </ul><% end %></div><% end %>diff --git a/admin/app/views/spree/admin/pages/_form.html.erb b/admin/app/views/spree/admin/pages/_form.html.erbindex fb5d487605..1fd75e5e3f 100644--- a/admin/app/views/spree/admin/pages/_form.html.erb+++ b/admin/app/views/spree/admin/pages/_form.html.erb@@ -1,5 +1,5 @@-<div class="card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">+<div class="card mb-6">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5>diff --git a/admin/app/views/spree/admin/pages/_table_row.html.erb b/admin/app/views/spree/admin/pages/_table_row.html.erbindex 749cbed962..43a394bdf5 100644--- a/admin/app/views/spree/admin/pages/_table_row.html.erb+++ b/admin/app/views/spree/admin/pages/_table_row.html.erb@@ -14,12 +14,12 @@<%= icon('dots-vertical', class: 'mr-0') %><% end %><%= dropdown_menu do %>- <ul class="list-unstyled mb-0">+ <ul class="list-none p-0 mb-0"><li><%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), class: 'dropdown-item', data: { turbo_frame: '_top', turbo_prefetch: false } %></li><li>- <%= link_to_delete(page, class: 'dropdown-item btn-danger', icon: 'trash') %>+ <%= link_to_delete(page, class: 'dropdown-item text-red-600 hover:bg-red-100', icon: 'trash') %></li></ul><% end %>diff --git a/admin/app/views/spree/admin/payment_methods/_available_payment_method.html.erb b/admin/app/views/spree/admin/payment_methods/_available_payment_method.html.erbindex b846287889..1bdf04617c 100644--- a/admin/app/views/spree/admin/payment_methods/_available_payment_method.html.erb+++ b/admin/app/views/spree/admin/payment_methods/_available_payment_method.html.erb@@ -1,6 +1,6 @@<tr data-controller="row-link"><td class="cursor-pointer w-30" data-action="click->row-link#openLink">- <div class="d-flex align-items-center">+ <div class="flex items-center"><% if payment_method_icon_tag(payment_method.payment_icon_name).present? %><%= payment_method_icon_tag(payment_method.payment_icon_name, height: 30, class: 'mr-2') %><% end %>@@ -8,13 +8,13 @@<%= payment_method.name %></div></td>- <td class="cursor-pointer w-40 text-wrap" data-action="click->row-link#openLink">+ <td class="cursor-pointer w-40 whitespace-normal" data-action="click->row-link#openLink"><% if payment_method.try(:description_partial_name) %><%= render "spree/admin/payment_methods/descriptions/#{payment_method.description_partial_name}", payment_method: payment_method %><% end %></td><td class="actions w-30">- <div class="d-flex justify-content-end">+ <div class="flex justify-end"><%= link_to_with_icon 'plus', Spree.t(:add), spree.new_admin_payment_method_path(payment_method: { type: payment_method.type }), class: 'btn btn-light btn-sm', data: { row_link_target: :link, turbo_frame: '_top' } %></div></td>diff --git a/admin/app/views/spree/admin/payment_methods/_form.html.erb b/admin/app/views/spree/admin/payment_methods/_form.html.erbindex 41a88622ab..a780bd3593 100644--- a/admin/app/views/spree/admin/payment_methods/_form.html.erb+++ b/admin/app/views/spree/admin/payment_methods/_form.html.erb@@ -3,7 +3,7 @@<% end %><% if !preference_fields(@object, f).empty? || @object.respond_to?(:custom_form_fields_partial_name) %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:payment_provider_settings) %></h5></div>@@ -17,7 +17,7 @@</div><% end %>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:display_settings) %></h5></div>@@ -28,7 +28,7 @@<div class="form-group"><%= label_tag :payment_method_stores, Spree.t(:stores) %><%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>- <div class="custom-control custom-checkbox mb-1">+ <div class="custom-control form-checkbox mb-1"><%= b.check_box(class: 'custom-control-input') %><%= b.label(class: 'custom-control-label') %></div>diff --git a/admin/app/views/spree/admin/payment_methods/_payment_method.html.erb b/admin/app/views/spree/admin/payment_methods/_payment_method.html.erbindex 8230758f67..68c2cc0a1a 100644--- a/admin/app/views/spree/admin/payment_methods/_payment_method.html.erb+++ b/admin/app/views/spree/admin/payment_methods/_payment_method.html.erb@@ -1,10 +1,10 @@<tr id="<%= spree_dom_id payment_method %>" data-controller="row-link" data-sortable-update-url="<%= spree.admin_payment_method_path(payment_method) %>">- <td class="w-10 move-handle text-center">- <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>+ <td class="w-5 move-handle text-center">+ <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2') %></td>- <td class="cursor-pointer w-55 text-wrap" data-action="click->row-link#openLink">- <div class="d-flex align-items-center">- <div class="bg-light rounded" style="width: 95px; height: 60px;">+ <td class="cursor-pointer w-50 whitespace-normal" data-action="click->row-link#openLink">+ <div class="flex items-center">+ <div class="bg-gray-25 rounded" style="width: 95px; height: 60px;"><% if payment_method_icon_tag(payment_method.payment_icon_name).present? %><span data-controller="tooltip"><%= payment_method_icon_tag(payment_method.payment_icon_name, height: 60, width: 95, title: payment_method.name) %>@@ -13,7 +13,7 @@<% end %></div>- <div class="mx-3">+ <div class="mx-6"><% if payment_method.try(:description_partial_name) %><%= render "spree/admin/payment_methods/descriptions/#{payment_method.description_partial_name}", payment_method: payment_method %><% else %>@@ -24,7 +24,7 @@</td><td class="w-20"><%= form_for payment_method, as: :payment_method, url: spree.admin_payment_method_path(payment_method), method: :patch, data: { controller: 'auto-submit' } do |f| %>- <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :display_on, display_on_options, {}, { class: 'form-select form-select-sm w-auto', data: { action: 'auto-submit#submit' } } %><% end %></td><td class="w-10 text-center">@@ -35,7 +35,7 @@</div><% end %></td>- <td class="actions w-5">+ <td class="actions w-10"><%= link_to_edit(payment_method, data: { row_link_target: :link, turbo_frame: '_top' }) %></td></tr>diff --git a/admin/app/views/spree/admin/payment_methods/edit.html.erb b/admin/app/views/spree/admin/payment_methods/edit.html.erbindex f63ee0963b..ece96dd0c9 100644--- a/admin/app/views/spree/admin/payment_methods/edit.html.erb+++ b/admin/app/views/spree/admin/payment_methods/edit.html.erb@@ -4,8 +4,8 @@<% end %><%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_method_path(@payment_method), html: { id: "edit_payment_method_#{@payment_method.id}" } do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %><%= render 'form', f: f %><%= render 'spree/admin/shared/edit_resource_links', f: f %>diff --git a/admin/app/views/spree/admin/payment_methods/index.html.erb b/admin/app/views/spree/admin/payment_methods/index.html.erbindex 0222935eb8..ec71d15456 100644--- a/admin/app/views/spree/admin/payment_methods/index.html.erb+++ b/admin/app/views/spree/admin/payment_methods/index.html.erb@@ -26,7 +26,7 @@</div><% if available_payment_methods.present? && can?(:create, Spree::PaymentMethod) %>- <h6 class="pb-2 pt-3">Available Payment Methods</h6>+ <h6 class="pb-2 pt-6">Available Payment Methods</h6><div class="card-lg"><div class="table-responsive"><table class="table">@@ -44,6 +44,6 @@</div><% end %>-<p class="text-muted text-center my-5">- Find more payment methods in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', class: 'text-decoration-none font-weight-bold', target: '_blank' %>+<p class="text-gray-600 text-center my-12">+ Find more payment methods in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', target: '_blank' %></p>\ No newline at end of filediff --git a/admin/app/views/spree/admin/payment_methods/new.html.erb b/admin/app/views/spree/admin/payment_methods/new.html.erbindex 9b5fcb0be9..c1d475b799 100644--- a/admin/app/views/spree/admin/payment_methods/new.html.erb+++ b/admin/app/views/spree/admin/payment_methods/new.html.erb@@ -5,8 +5,8 @@<%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_methods_path do |f| %><%= f.hidden_field :type %>- <div class="row">- <div class="col-lg-6 offset-lg-3">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %><%= render 'form', f: f %><%= render 'spree/admin/shared/new_resource_links' %>diff --git a/admin/app/views/spree/admin/payments/_payment.html.erb b/admin/app/views/spree/admin/payments/_payment.html.erbindex 004ce485c2..d098050896 100644--- a/admin/app/views/spree/admin/payments/_payment.html.erb+++ b/admin/app/views/spree/admin/payments/_payment.html.erb@@ -1,5 +1,5 @@<div class="card" id="<%= dom_id(payment) %>">- <div class="card-header d-flex align-items-center gap-2">+ <div class="card-header flex items-center gap-2"><span class="badge badge-<%= payment.state %> gap-1"><% if payment.completed? %><%= icon('check') %>@@ -14,7 +14,7 @@<%= payment_method_icon_tag(payment.payment_method.payment_icon_name) %><% end %><strong><%= payment.number.upcase %></strong>- <%= spree_time(payment.created_at, class: 'ml-auto text-muted font-size-sm') %>+ <%= spree_time(payment.created_at, class: 'ml-auto text-gray-600 text-sm') %><%= dropdown do %><%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>@@ -36,11 +36,11 @@<% end %><% if can?(:cancel, payment) && payment.pending? && payment.payment_method.present? %><div class="dropdown-divider"></div>- <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %>+ <%= link_to_with_icon 'cancel', Spree.t(:void), spree.void_admin_order_payment_path(@order, payment), class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :put, turbo_confirm: Spree.t(:are_you_sure) } %><% end %><% if can?(:destroy, payment) && payment.can_be_deleted? %><div class="dropdown-divider"></div>- <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_order_payment_path(@order, payment), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %>+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_order_payment_path(@order, payment), class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %><% end %><% end %><% end %>@@ -53,16 +53,16 @@</div><% end %>- <div class="d-flex">- <div class="w-50">- <p class="mb-1"><%= Spree.t(:amount) %>:</p>+ <div class="flex">+ <div class="w-1/2">+ <p class="mb-0.5"><%= Spree.t(:amount) %>:</p><strong><%= payment.display_amount %></strong>- <p class="mb-1 mt-2"><%= Spree.t(:payment_method) %>:</p>+ <p class="mb-0.5 mt-2"><%= Spree.t(:payment_method) %>:</p><strong><%= payment_method_name(payment) %></strong><% if payment.transaction_id.present? %>- <p class="mb-1 mt-2">+ <p class="mb-0.5 mt-2"><%= Spree.t(:transaction_id) %><%= help_bubble(Spree.t(:transaction_id_help)) %></p>@@ -70,9 +70,9 @@<% end %></div><% if payment.source.present? %>- <div class="w-50">+ <div class="w-1/2"><p class="mb-2"><%= Spree.t(:payment_source) %>:</p>- <div class="rounded-lg bg-light border shadow-xs p-3">+ <div class="rounded-xl bg-gray-25 border shadow-xs p-4"><%= render 'spree/shared/payment', payment: payment %></div></div>@@ -80,20 +80,20 @@</div></div><% if payment.transaction_id.present? && !payment.store_credit? %>- <div class="card-footer border-top border-top-dashed" data-controller="reveal">- <p class="mb-0 d-flex justify-content-between align-items-center">+ <div class="card-footer border-t border-dashed py-3" data-controller="reveal">+ <p class="mb-0 flex justify-between items-center"><span><%= Spree.t(:risk_analysis) %> <% if @order.is_risky? %><span class="badge badge-warning"><%= icon('shield-off') %> <%= Spree.t(:risky) %></span><% else %>- <span class="text-success"><%= icon('shield-check-filled') %> <%= Spree.t(:not_risky) %></span>+ <span class="text-green-700"><%= icon('shield-check-filled') %> <%= Spree.t(:not_risky) %></span><% end %></span>- <button type="button" class="btn btn-light btn-sm bg-transparent" data-action="click->reveal#toggle">+ <button type="button" class="btn btn-light btn-sm" data-action="click->reveal#toggle"><%= Spree.t(:show_details) %>- <%= icon('selector', class: 'mr-0 ml-1') %>+ <%= icon('selector', class: 'mr-0 ml-0.5') %></button></p><%= render 'spree/admin/orders/risk_analysis', payment: payment %>diff --git a/admin/app/views/spree/admin/payments/new.html.erb b/admin/app/views/spree/admin/payments/new.html.erbindex 0500a5bfdb..d5021055b4 100644--- a/admin/app/views/spree/admin/payments/new.html.erb+++ b/admin/app/views/spree/admin/payments/new.html.erb@@ -1,23 +1,23 @@<%= render 'spree/admin/orders/header' %>-<div class="row">- <div class="col-lg-6 offset-lg-3">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render 'spree/admin/shared/error_messages', target: @payment %><%= form_with url: spree.admin_order_payments_path(@order), model: @payment, method: :post do |f| %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:new_payment) %></h5></div><div class="card-body">- <div class="form-group mb-3">+ <div class="form-group mb-6"><%= f.label :amount, Spree.t(:amount) %><div class="input-group"><%= f.number_field :amount,value: @payment.max_amount,max: @payment.max_amount,step: '.01',- class: 'form-control',+ class: 'form-input',required: true %><div class="input-group-append"><span class="input-group-text"><%= currency_symbol(@order.currency) %></span>@@ -26,11 +26,11 @@</div><%= f.label :payment_method_id, Spree.t(:payment_method) %>- <ul class="list-group mb-3">+ <ul class="list-group mb-6"><% @payment_methods.each do |payment_method| %><li class="list-group-item p-0">- <%= link_to spree.new_admin_order_payment_path(@order, payment_method_id: payment_method.id), class: "form-check-label d-flex align-items-center gap-3 px-3 py-3 w-100 cursor-pointer hover-light text-dark" do %>- <div class="form-check flex align-items-center">+ <%= link_to spree.new_admin_order_payment_path(@order, payment_method_id: payment_method.id), class: "form-check-label flex items-center gap-4 px-6 py-6 w-full cursor-pointer hover:bg-gray-25 text-gray-900" do %>+ <div class="form-check flex items-center"><%= f.radio_button :payment_method_id, payment_method.id, class: "form-check-input" %></div>@@ -46,7 +46,7 @@<% if @payment.payment_method.present? && @payment.payment_method.source_required? %><%= f.label :source, Spree.t(:payment_source) %>- <div class="my-3">+ <div class="my-6"><%= render partial: "spree/admin/payments/source_forms/#{@payment.payment_method.method_type}",locals: {f: f,diff --git a/admin/app/views/spree/admin/payments/source_forms/_gateway.html.erb b/admin/app/views/spree/admin/payments/source_forms/_gateway.html.erbindex 24a5226d1c..3c7dfa8dd2 100644--- a/admin/app/views/spree/admin/payments/source_forms/_gateway.html.erb+++ b/admin/app/views/spree/admin/payments/source_forms/_gateway.html.erb@@ -1,5 +1,5 @@<% if previous_cards.any? %>- <div class="card my-3">+ <div class="card my-6"><div class="card-header"><h5 class="card-title mb-0 h6"><%= Spree.t(:previously_used_card) %></h5></div>@@ -23,13 +23,13 @@</div><% end %>-<div id="card_form<%= payment_method.id %>" class="mt-3 row">+<div id="card_form<%= payment_method.id %>" class="mt-6 grid grid-cols-12 gap-6"><% param_prefix = "payment_source[#{payment_method.id}]" %>- <div class="form-group col-12">+ <div class="form-group col-span-12"><%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %><%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %>- <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>+ <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-input cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %><span id="card_type" style="display:none;">( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span><span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>@@ -37,18 +37,18 @@</span></div>- <div class="form-group col-12">+ <div class="form-group col-span-12"><%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + required_span_tag) %>- <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required form-control', maxlength: 19 %>+ <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required form-input', maxlength: 19 %></div>- <div class="form-group col-6">+ <div class="form-group col-span-6"><%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + required_span_tag) %><br>- <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: Spree.t(:card_expiration_placeholder) %>+ <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-input", placeholder: Spree.t(:card_expiration_placeholder) %></div>- <div class="form-group col-6">+ <div class="form-group col-span-6"><%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + required_span_tag) %>- <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required form-control cardCode', size: 5 %>+ <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required form-input cardCode', size: 5 %></div></div>diff --git a/admin/app/views/spree/admin/payments/source_forms/_previous_cards.html.erb b/admin/app/views/spree/admin/payments/source_forms/_previous_cards.html.erbindex 1257019fe4..bad482ee54 100644--- a/admin/app/views/spree/admin/payments/source_forms/_previous_cards.html.erb+++ b/admin/app/views/spree/admin/payments/source_forms/_previous_cards.html.erb@@ -1,10 +1,10 @@<% if previous_cards.any? %>- <ul class="list-group mb-3">+ <ul class="list-group mb-6"><%= f.fields_for :source, @payment.source do |source_form| %><% previous_cards.each do |card| %><li class="list-group-item p-0">- <%= source_form.label :id, value: card.id, class: "form-check-label d-flex align-items-center gap-3 px-3 py-3 w-100 cursor-pointer hover-light" do %>- <div class="form-check flex align-items-center">+ <%= source_form.label :id, value: card.id, class: "form-check-label flex items-center gap-4 px-6 py-6 w-full cursor-pointer hover:bg-gray-25" do %>+ <div class="form-check flex items-center"><%= source_form.radio_button :id, card.id, class: "form-check-input" %></div><%= payment_method_icon_tag(card.brand, width: 32, height: 32) %>@@ -12,7 +12,7 @@<% if card.wallet_type.present? %><%= payment_method_icon_tag(card.wallet_type, width: 32, height: 32) %><% end %>- <span class="text-muted ms-auto">(<%= card.month %>/<%= card.year %>)</span>+ <span class="text-gray-600 ms-auto">(<%= card.month %>/<%= card.year %>)</span><% end %></li><% end %>diff --git a/admin/app/views/spree/admin/payments/source_forms/_spree_stripe.html.erb b/admin/app/views/spree/admin/payments/source_forms/_spree_stripe.html.erbindex 6f81f92f24..71a92cd549 100644--- a/admin/app/views/spree/admin/payments/source_forms/_spree_stripe.html.erb+++ b/admin/app/views/spree/admin/payments/source_forms/_spree_stripe.html.erb@@ -1,7 +1,7 @@<% if previous_cards.any? %><%= render 'spree/admin/payments/source_forms/previous_cards', previous_cards: previous_cards, f: f %><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:no_saved_cards) %></span><% end %>diff --git a/admin/app/views/spree/admin/payments/source_forms/_store_credit.html.erb b/admin/app/views/spree/admin/payments/source_forms/_store_credit.html.erbindex 46a1bf65b4..3b05b7b82e 100644--- a/admin/app/views/spree/admin/payments/source_forms/_store_credit.html.erb+++ b/admin/app/views/spree/admin/payments/source_forms/_store_credit.html.erb@@ -1,13 +1,13 @@<% if @order.could_use_store_credit? %>- <ul class="list-group mb-3">+ <ul class="list-group mb-6"><%= f.fields_for :source, @payment.source do |source_form| %><% @store_credits.each do |credit| %><li class="list-group-item p-0">- <%= source_form.label :id, value: credit.id, class: "form-check-label d-flex align-items-center gap-3 px-3 py-3 w-100 cursor-pointer hover-light" do %>- <div class="form-check flex align-items-center">+ <%= source_form.label :id, value: credit.id, class: "form-check-label flex items-center gap-4 px-6 py-6 w-full cursor-pointer hover:bg-gray-25" do %>+ <div class="form-check flex items-center"><%= source_form.radio_button :id, credit.id, class: "form-check-input", checked: @payment.source.id == credit.id || @store_credits.first.id == credit.id %></div>- <div class="font-weight-normal">+ <div class="font-normal"><%= Spree.t('admin.store_credit.amount_remaining_of_total', amount: credit.display_amount_remaining, total: credit.display_amount).html_safe %></div><% end %>@@ -16,7 +16,7 @@<% end %></ul><% else %>- <div class="alert alert-danger w-100">+ <div class="alert alert-danger w-full"><%= Spree.t('admin.user.no_store_credit') %></div><% end %>diff --git a/admin/app/views/spree/admin/payments/source_views/_gateway.html.erb b/admin/app/views/spree/admin/payments/source_views/_gateway.html.erbindex c153d44bc0..e1035ec0a7 100644--- a/admin/app/views/spree/admin/payments/source_views/_gateway.html.erb+++ b/admin/app/views/spree/admin/payments/source_views/_gateway.html.erb@@ -1,5 +1,5 @@<div>- <div class="table-responsive border rounded bg-white mb-3">+ <div class="table-responsive border rounded-lg bg-white mb-6"><table class="table table-condensed"><tr><th width="20%"><%= Spree.t(:name_on_card) %>:</th>diff --git a/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb b/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erbindex 6d621ac7d1..24f614e72c 100644--- a/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb+++ b/admin/app/views/spree/admin/payments/source_views/_storecredit.html.erb@@ -1,6 +1,6 @@<fieldset><legend><%= Spree.t(:store_credits) %></legend>- <div class="table-responsive border rounded bg-white">+ <div class="table-responsive border rounded-lg bg-white"><table class="table table-condensed border rounded"><tr><th width="20%"><%= Spree.t(:used) %>:</th>diff --git a/admin/app/views/spree/admin/policies/_filters.html.erb b/admin/app/views/spree/admin/policies/_filters.html.erbindex fa17120176..f92649a433 100644--- a/admin/app/views/spree/admin/policies/_filters.html.erb+++ b/admin/app/views/spree/admin/policies/_filters.html.erb@@ -1,5 +1,5 @@<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %></div>diff --git a/admin/app/views/spree/admin/policies/_form.html.erb b/admin/app/views/spree/admin/policies/_form.html.erbindex 34bf521469..5ba9cf3a9f 100644--- a/admin/app/views/spree/admin/policies/_form.html.erb+++ b/admin/app/views/spree/admin/policies/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body" data-controller="slug-form"><%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, data: { slug_form_target: 'name', action: 'slug-form#updateUrlFromName' } %><%= f.spree_text_field :slug, required: true, data: { slug_form_target: 'url' } %>diff --git a/admin/app/views/spree/admin/policies/_table_row.html.erb b/admin/app/views/spree/admin/policies/_table_row.html.erbindex ef3a8b9f5c..c695517205 100644--- a/admin/app/views/spree/admin/policies/_table_row.html.erb+++ b/admin/app/views/spree/admin/policies/_table_row.html.erb@@ -1,8 +1,8 @@<tr id="<%= spree_dom_id policy %>" data-controller="row-link"><td class="w-30 cursor-pointer" data-action="click->row-link#openLink">- <%= link_to policy.name, spree.edit_admin_policy_path(policy.id), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %>+ <%= link_to policy.name, spree.edit_admin_policy_path(policy.id), class: 'no-underline flex items-center font-bold text-gray-900', data: { row_link_target: :link, turbo_frame: '_top' } %></td>- <td class="w-25 cursor-pointer" data-action="click->row-link#openLink">+ <td class="w-1/4 cursor-pointer" data-action="click->row-link#openLink"><code><%= policy.slug %></code></td><td class="w-10 cursor-pointer" data-action="click->row-link#openLink">diff --git a/admin/app/views/spree/admin/post_categories/_form.html.erb b/admin/app/views/spree/admin/post_categories/_form.html.erbindex def26243bc..b9a8e7f094 100644--- a/admin/app/views/spree/admin/post_categories/_form.html.erb+++ b/admin/app/views/spree/admin/post_categories/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :title, required: true, autofocus: f.object.new_record? %><%= f.spree_rich_text_area :description %>diff --git a/admin/app/views/spree/admin/post_categories/_table_row.html.erb b/admin/app/views/spree/admin/post_categories/_table_row.html.erbindex b29645d176..de7d62b191 100644--- a/admin/app/views/spree/admin/post_categories/_table_row.html.erb+++ b/admin/app/views/spree/admin/post_categories/_table_row.html.erb@@ -1,6 +1,6 @@<tr data-controller="row-link" id="<%= dom_id(post_category) %>"><td class="w-60 p-0">- <%= link_to post_category.title, spree.edit_admin_post_category_path(post_category), class: 'd-block w-100 h-100 px-3 py-2', data: { row_link_target: :link, turbo_frame: '_top' } %>+ <%= link_to post_category.title, spree.edit_admin_post_category_path(post_category), class: 'block w-full h-full px-4 py-2', data: { row_link_target: :link, turbo_frame: '_top' } %></td><td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><%= post_category.posts.count %></td><td class="w-10 cursor-pointer text-right" data-action="click->row-link#openLink">diff --git a/admin/app/views/spree/admin/posts/_form.html.erb b/admin/app/views/spree/admin/posts/_form.html.erbindex 6cbf734205..54937a8297 100644--- a/admin/app/views/spree/admin/posts/_form.html.erb+++ b/admin/app/views/spree/admin/posts/_form.html.erb@@ -1,6 +1,6 @@-<div class="row" data-controller="slug-form seo-form">- <div class="col-lg-8">- <div class="card mb-4">+<div class="grid grid-cols-12 gap-6" data-controller="slug-form seo-form">+ <div class="col-span-12 lg:col-span-8">+ <div class="card mb-6"><div class="card-body"><%= f.spree_text_field :title,required: true,@@ -22,14 +22,14 @@</div></div>- <div class="col-lg-4">- <div class="card mb-4">+ <div class="col-span-12 lg:col-span-4">+ <div class="card mb-6"><div class="card-body"><%= f.spree_file_field :image, width: 1200, height: 600, crop: true, css: 'flex-col', label: Spree.t(:featured_image) %></div></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-body"><%= f.spree_select :author_id, options_for_select(post_authors_select_options, @post.author_id || try_spree_current_user.id), { label: Spree.t(:author), autocomplete: true } %><%= f.spree_select :post_category_id, options_for_select(@post_categories.pluck(:title, :id), @post.post_category_id), { label: Spree.t(:category), include_blank: true, autocomplete: true } %>@@ -37,7 +37,7 @@<div class="form-group mb-0"><%= f.label :tag_list, Spree.t(:tags) %>- <%= tom_select_tag 'post[tag_list]', multiple: true, class: 'w-100', options: post_tags_json_array, active_option: @post.tag_list, value_field: :name, create: true %>+ <%= tom_select_tag 'post[tag_list]', multiple: true, class: 'w-full', options: post_tags_json_array, active_option: @post.tag_list, value_field: :name, create: true %></div></div></div>diff --git a/admin/app/views/spree/admin/posts/_table_row.html.erb b/admin/app/views/spree/admin/posts/_table_row.html.erbindex 60b3edea0c..081a6bac21 100644--- a/admin/app/views/spree/admin/posts/_table_row.html.erb+++ b/admin/app/views/spree/admin/posts/_table_row.html.erb@@ -1,6 +1,6 @@<tr data-controller="row-link" id="<%= dom_id(post) %>"><td>- <%= link_to spree.edit_admin_post_path(post), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark gap-3', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>+ <%= link_to spree.edit_admin_post_path(post), class: 'no-underline flex items-center font-bold text-gray-900 gap-4', data: { row_link_target: :link, 'turbo-frame': '_top' } do %><% if post.image.attached? && post.image.variable? %><div class="admin-product-image-container"><%= spree_image_tag(post.image, width: 100, height: 65, class: 'img-fluid', loading: :lazy) %>diff --git a/admin/app/views/spree/admin/posts/edit.html.erb b/admin/app/views/spree/admin/posts/edit.html.erbindex 55cc0c7be3..6d43ba1463 100644--- a/admin/app/views/spree/admin/posts/edit.html.erb+++ b/admin/app/views/spree/admin/posts/edit.html.erb@@ -1,15 +1,5 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_posts_path, @post %>- <%= @post.title %>-<% end %>-<% content_for :page_actions_dropdown do %><%= external_page_preview_link(@post) %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post } %>--<%= form_for [:admin, @post] do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/edit_resource_links', f: f %>-<% end %>+<%= render 'spree/admin/shared/edit_resource', col_class: 'col-span-12' %>diff --git a/admin/app/views/spree/admin/posts/filters.html.erb b/admin/app/views/spree/admin/posts/filters.html.erbindex 0aa06cbf1c..5e0c7d7da3 100644--- a/admin/app/views/spree/admin/posts/filters.html.erb+++ b/admin/app/views/spree/admin/posts/filters.html.erb@@ -1,8 +1,8 @@<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :search_by_title, label: Spree.t(:title) %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>diff --git a/admin/app/views/spree/admin/posts/new.html.erb b/admin/app/views/spree/admin/posts/new.html.erbindex 013d734312..185062e4c7 100644--- a/admin/app/views/spree/admin/posts/new.html.erb+++ b/admin/app/views/spree/admin/posts/new.html.erb@@ -1,11 +1 @@-<% content_for :page_title do %>- <%= page_header_back_button spree.admin_posts_path, @post %>- <%= Spree.t(:new_post) %>-<% end %>--<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @post } %>--<%= form_for [:admin, @post] do |f| %>- <%= render 'form', f: f %>- <%= render 'spree/admin/shared/new_resource_links' %>-<% end %>+<%= render 'spree/admin/shared/new_resource', col_class: 'col-span-12' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/preferences/_password_field.html.erb b/admin/app/views/spree/admin/preferences/_password_field.html.erbindex 0e420bdb09..1106f5f3d8 100644--- a/admin/app/views/spree/admin/preferences/_password_field.html.erb+++ b/admin/app/views/spree/admin/preferences/_password_field.html.erb@@ -1,25 +1,25 @@<div class="form-group" data-controller="replace password-visibility"><% if form.object.persisted? %><div data-replace-target="from">- <div readonly class="form-control d-flex align-items-center justify-content-between pr-1">- <span class="text-muted">- ...<%= form.object.send(field)&.last(4) %>+ <div readonly class="input-group bg-gray-25 border border-gray-100">+ <span class="text-gray-600 py-2 grow pl-2">+ <%= form.object.send(field).length.times do %>• <% end %>+ <%= form.object.send(field)&.last(4) %></span>- <button class="btn btn-sm btn-light" type="button" data-action="click->replace#replace">- <%= icon 'edit', class: 'mr-2' %>+ <button class="btn btn-sm btn-light mr-1" type="button" data-action="click->replace#replace">+ <%= icon 'edit' %><%= Spree.t(:edit) %></button></div></div>- <div class="input-group <% if form.object.persisted? %>d-none<% end %>" data-replace-target="to">- <%= password_field form.object_name, field, class: 'form-control', required: form.object.new_record?, data: { 'enable-button-target': 'input', 'password-visibility-target': 'input' } %>- <div class="input-group-append">- <button type="button" class="btn btn-light" data-action="password-visibility#toggle">- <span data-password-visibility-target="icon"><%= icon 'eye', class: 'mr-0' %></span>- <span data-password-visibility-target="icon" class="hidden"><%= icon 'eye-off', class: 'mr-0' %></span>- </button>- </div>- </div>+ <div class="input-group <% if form.object.persisted? %>hidden<% end %>" data-replace-target="to">+ <%= password_field form.object_name, field, class: 'form-input', required: form.object.new_record?, data: { 'enable-button-target': 'input', 'password-visibility-target': 'input' } %>++ <button type="button" class="btn hover:bg-gray-100 p-1 mr-1 rounded" data-action="password-visibility#toggle">+ <span data-password-visibility-target="icon"><%= icon 'eye', class: 'mr-0' %></span>+ <span data-password-visibility-target="icon" class="hidden"><%= icon 'eye-off', class: 'mr-0' %></span>+ </button>+ </div><% else %><%= form.password_field(field, preference_field_options(options)) %><% end %>diff --git a/admin/app/views/spree/admin/products/_bulk_operations.html.erb b/admin/app/views/spree/admin/products/_bulk_operations.html.erbindex 716a30cea2..51ffa2cee3 100644--- a/admin/app/views/spree/admin/products/_bulk_operations.html.erb+++ b/admin/app/views/spree/admin/products/_bulk_operations.html.erb@@ -1,4 +1,4 @@-<div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">+<div id="bulk-panel" class="hidden" data-bulk-operation-target="panel"><div class="bulk-panel-container"><%= bulk_operations_counter %>diff --git a/admin/app/views/spree/admin/products/_filters.html.erb b/admin/app/views/spree/admin/products/_filters.html.erbindex 0072f28c2b..e8411ccef6 100644--- a/admin/app/views/spree/admin/products/_filters.html.erb+++ b/admin/app/views/spree/admin/products/_filters.html.erb@@ -9,10 +9,10 @@} do |f| %><%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %><%= render "spree/admin/products/table_filter_dropdown" %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>@@ -46,7 +46,7 @@options: tags_json_array,multiple: true,value_field: :name,- select_class: "w-100",+ select_class: "w-full",select_data: {filters_target: "input",} %>diff --git a/admin/app/views/spree/admin/products/_form.html.erb b/admin/app/views/spree/admin/products/_form.html.erbindex f3b2de54d7..2320919026 100644--- a/admin/app/views/spree/admin/products/_form.html.erb+++ b/admin/app/views/spree/admin/products/_form.html.erb@@ -1,5 +1,5 @@-<div class="row" data-controller="product-form slug-form seo-form" data-seo-form-editor-value="tinymce">- <div class="col-md-8">+<div class="grid grid-cols-12 gap-6" data-controller="product-form slug-form seo-form" data-seo-form-editor-value="tinymce">+ <div class="col-span-12 md:col-span-8"><%= render 'spree/admin/products/form/base', f: f %><%= render 'spree/admin/shared/media_form', viewable: @product.master, viewable_type: 'Spree::Variant' %><%= f.fields_for :master, @product.master do |vf| %>@@ -11,7 +11,7 @@<%= render_admin_partials(:product_form_partials, f: f, product: @product) %></div>- <div class="col-md-4">+ <div class="col-span-12 md:col-span-4"><%= render 'spree/admin/products/form/status', f: f %><%= render 'spree/admin/products/form/categorization', f: f %><%= render 'spree/admin/products/form/shipping', f: f %>diff --git a/admin/app/views/spree/admin/products/_product.html.erb b/admin/app/views/spree/admin/products/_product.html.erbindex e8fbc0a907..ece44d0d6f 100644--- a/admin/app/views/spree/admin/products/_product.html.erb+++ b/admin/app/views/spree/admin/products/_product.html.erb@@ -2,18 +2,18 @@<td class="pr-0 w-5"><%= bulk_operations_checkbox(product) %></td>- <td scope="row" class="w-40 py-0 text-wrap" data-action="click->row-link#openLink">- <%= link_to spree.edit_admin_product_path(product), class: 'd-flex align-items-center w-100 text-decoration-none h-100 py-2', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>- <div class="mr-3">+ <td scope="row" class="w-40 py-0 whitespace-normal" data-action="click->row-link#openLink">+ <%= link_to spree.edit_admin_product_path(product), class: 'flex items-center w-full no-underline h-full py-2', data: { row_link_target: :link, 'turbo-frame': '_top' } do %>+ <div class="mr-6"><%= render 'spree/admin/shared/product_image', object: product %></div>- <span class="text-dark font-weight-semibold">+ <span class="text-gray-900 font-medium"><%= product.name %></span><% end %></td><%= render 'spree/admin/products/product_status', product: product %>- <td class="w-20 cursor-pointer text-wrap" data-action="click->row-link#openLink">+ <td class="w-20 cursor-pointer whitespace-normal" data-action="click->row-link#openLink"><%= display_inventory(product) %></td><% if defined?(current_vendor) %>diff --git a/admin/app/views/spree/admin/products/_search_result.html.erb b/admin/app/views/spree/admin/products/_search_result.html.erbindex 14b151f4ee..c357e4bb09 100644--- a/admin/app/views/spree/admin/products/_search_result.html.erb+++ b/admin/app/views/spree/admin/products/_search_result.html.erb@@ -2,7 +2,7 @@<%= check_box_tag "product_ids[]", product.id, false, id: "ids_#{product.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" } %><label for="ids_<%= product.id %>"><%= render 'spree/admin/shared/product_image', object: product %>- <div class="ml-3">+ <div class="ml-6"><%= highlight(product.name, params.dig(:q)) %></div></label>diff --git a/admin/app/views/spree/admin/products/_search_results.html.erb b/admin/app/views/spree/admin/products/_search_results.html.erbindex e21866e9a9..8ffdfe8c56 100644--- a/admin/app/views/spree/admin/products/_search_results.html.erb+++ b/admin/app/views/spree/admin/products/_search_results.html.erb@@ -2,7 +2,7 @@<% if products.any? %><%= render collection: products, partial: 'spree/admin/products/search_result', as: :product, cached: spree_base_cache_scope %><% else %>- <p class="text-muted text-center py-5">+ <p class="text-gray-600 text-center py-12"><%= Spree.t('admin.products.search_results.no_products') %></p><% end %>diff --git a/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erbindex d0c263a6f6..2a0d0e1283 100644--- a/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/products/_table_filter_dropdown.html.erb@@ -1,6 +1,6 @@<%= dropdown do %><%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>- <span class="text-muted font-weight-normal mr-1">+ <span class="text-gray-600 font-normal mr-1"><%= Spree.t(:show) %></span><% if product_filter_status_dropdown_value == Spree.t('admin.products.all_statuses') && product_filter_stock_dropdown_value == Spree.t('admin.products.any_stock') %>diff --git a/admin/app/views/spree/admin/products/bulk_modal.html.erb b/admin/app/views/spree/admin/products/bulk_modal.html.erbindex 43fc112a10..5ba17b759e 100644--- a/admin/app/views/spree/admin/products/bulk_modal.html.erb+++ b/admin/app/views/spree/admin/products/bulk_modal.html.erb@@ -1,12 +1,12 @@<%= turbo_frame_tag :bulk_dialog do %><%= dialog_header(@title, 'bulk-dialog') %><div class="dialog-body overflow-visible">- <p><%= @body %></p>+ <p class="mb-3"><%= @body %></p><% if params[:kind] == 'add_to_taxons' || params[:kind] == 'remove_from_taxons' %>- <%= tom_select_tag 'taxon_ids', multiple: true, class: 'w-100', url: spree.admin_taxons_select_options_path(format: :json), required: true %>+ <%= tom_select_tag 'taxon_ids', multiple: true, class: 'w-full', url: spree.admin_taxons_select_options_path(format: :json), required: true %><% elsif params[:kind] == 'add_tags' || params[:kind] == 'remove_tags' %>- <%= tom_select_tag 'tags', multiple: true, class: 'w-100', options: tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %>+ <%= tom_select_tag 'tags', multiple: true, class: 'w-full', options: tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %><% end %></div><div class="dialog-footer">diff --git a/admin/app/views/spree/admin/products/form/_base.html.erb b/admin/app/views/spree/admin/products/form/_base.html.erbindex 997f70978e..ea20210960 100644--- a/admin/app/views/spree/admin/products/form/_base.html.erb+++ b/admin/app/views/spree/admin/products/form/_base.html.erb@@ -1,11 +1,11 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, data: { seo_form_target: 'sourceTitleInput', slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %><div class="form-group mb-0"><%= f.label :description, Spree.t(:description) %><div class="trix-container mb-0">- <%= f.text_area :description, { rows: 10, class: "form-control spree-rte", data: { seo_form_target: 'sourceDescriptionInput' } } %>+ <%= f.text_area :description, { rows: 10, class: "form-input spree-rte", data: { seo_form_target: 'sourceDescriptionInput' } } %></div></div></div>diff --git a/admin/app/views/spree/admin/products/form/_categorization.html.erb b/admin/app/views/spree/admin/products/form/_categorization.html.erbindex a9c77e06af..90cc57ca2d 100644--- a/admin/app/views/spree/admin/products/form/_categorization.html.erb+++ b/admin/app/views/spree/admin/products/form/_categorization.html.erb@@ -1,5 +1,5 @@<% if can?(:manage, Spree::Classification) || can?(:manage, ActsAsTaggableOn::Tag) %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:categorization) %>@@ -14,7 +14,7 @@multiple: true,active_option: @product.taxon_ids,url: spree.admin_taxons_select_options_path(format: :json),- class: 'w-100' %>+ class: 'w-full' %><% elsif @product.taxons.any? %><%= f.label :taxon_ids, Spree.t(:taxonomies) %>@@ -31,7 +31,7 @@<% if can?(:manage, ActsAsTaggableOn::Tag) %><div class="form-group"><%= f.label :tag_list, Spree.t(:tags) %>- <%= tom_select_tag 'product[tag_list]', multiple: true, class: 'w-100', options: tags_json_array, active_option: @product.tag_list, value_field: :name, create: true %>+ <%= tom_select_tag 'product[tag_list]', multiple: true, class: 'w-full', options: tags_json_array, active_option: @product.tag_list, value_field: :name, create: true %></div><% end %></div>diff --git a/admin/app/views/spree/admin/products/form/_inventory.html.erb b/admin/app/views/spree/admin/products/form/_inventory.html.erbindex accc8d7259..9809ec4e1b 100644--- a/admin/app/views/spree/admin/products/form/_inventory.html.erb+++ b/admin/app/views/spree/admin/products/form/_inventory.html.erb@@ -1,5 +1,5 @@-<div class="inventory-form card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">+<div class="inventory-form card mb-6">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:inventory) %></h5><% if can?(:manage, Spree::StockLocation) %>@@ -7,7 +7,7 @@<% end %></div><div class="card-body">- <div class="custom-control custom-checkbox mb-4">+ <div class="custom-control form-checkbox mb-6"><%= f.check_box :track_inventory,class: 'custom-control-input',data: {@@ -18,46 +18,31 @@<%= f.label :track_inventory, Spree.t(:track_quantity), class: 'custom-control-label' %></div><div- class="master-variant-quantity-form <%= @product.has_variants? || [email protected]_inventory ? 'd-none' : '' %>"+ class="master-variant-quantity-form <%= @product.has_variants? || [email protected]_inventory ? 'hidden' : '' %>"data-product-form-target="<%= @product.has_variants? ? '' : 'quantityForm' %>">- <h6 class="font-weight-bold"><%= Spree.t(:quantity) %></h6>- <hr class="mt-0">- <div class="mb-4">+ <h6 class="font-bold"><%= Spree.t(:quantity) %></h6>+ <hr class="my-6">+ <div><%= f.fields_for :master, @product.master do |vf| %><%= vf.fields_for :stock_items do |sif| %><%= sif.hidden_field :stock_location_id %>- <div class="row mb-2">- <div class="col-md-6 d-flex align-items-center">+ <div class="grid lg:grid-cols-3 gap-x-6 gap-y-2 items-center mb-6 border-b border-gray-200 pb-6">+ <% if can?(:manage, sif.object.stock_location) %>+ <%= link_to sif.object.stock_location.name, spree.edit_admin_stock_location_path(sif.object.stock_location) %>+ <% else %><%= sif.object.stock_location.name %>- </div>- <div class="col-md-2">- <%= sif.number_field :count_on_hand, class: 'form-control' %>- </div>- <div class="col-md-4">- <div class="custom-control custom-checkbox d-flex align-items-center h-100">- <%= sif.check_box :backorderable, class: 'custom-control-input' %>- <%= sif.label :backorderable, Spree.t(:continue_selling_when_out_of_stock), class: 'custom-control-label' %>- </div>- </div>+ <% end %>+ <%= sif.number_field :count_on_hand, class: 'form-input' %>+ <%= sif.spree_check_box :backorderable, label: Spree.t(:continue_selling_when_out_of_stock) %></div><% end %><% end %></div></div>- <div class="row">- <div class="col-md-6">- <div class="form-group">- <%= f.label :sku, Spree.t('admin.products.inventory.sku') %>- <%= f.text_field :sku, class: 'form-control' %>- </div>- </div>- <div class="col-md-6">- <div class="form-group">- <%= f.label :barcode, Spree.t('admin.products.inventory.barcode') %>- <%= f.text_field :barcode, class: 'form-control' %>- </div>- </div>+ <div class="grid lg:grid-cols-2 gap-x-6 gap-y-2">+ <%= f.spree_text_field :sku, label: Spree.t(:sku) %>+ <%= f.spree_text_field :barcode, label: Spree.t(:barcode) %></div></div></div>diff --git a/admin/app/views/spree/admin/products/form/_properties.html.erb b/admin/app/views/spree/admin/products/form/_properties.html.erbindex c018b8c5e8..08fc35349a 100644--- a/admin/app/views/spree/admin/products/form/_properties.html.erb+++ b/admin/app/views/spree/admin/products/form/_properties.html.erb@@ -1,5 +1,5 @@-<div class="card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">+<div class="card mb-6">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:properties) %></h5><% if can?(:manage, Spree::Property) %>@@ -20,21 +20,21 @@<%= product_property_form.hidden_field :id %><%= product_property_form.hidden_field :property_id %><tr>- <td class="align-top pt-3 w-25">+ <td class="align-top pt-4 w-1/4"><code><%= property.name %></code></td>- <td class="w-75">+ <td class="w-3/4"><div class="form-group"><% if property.long_text? %>- <%= product_property_form.text_area :value, { class: 'form-control', data: { controller: 'textarea-autogrow'} } %>+ <%= product_property_form.text_area :value, { class: 'form-input', data: { controller: 'textarea-autogrow'} } %><% elsif property.number? %>- <%= product_property_form.number_field :value, class: 'form-control' %>+ <%= product_property_form.number_field :value, class: 'form-input' %><% elsif property.rich_text? %><div class="trix-container"><%= product_property_form.rich_text_area :value %></div><% else %>- <%= product_property_form.text_field :value, class: 'form-control' %>+ <%= product_property_form.text_field :value, class: 'form-input' %><% end %></div></td>diff --git a/admin/app/views/spree/admin/products/form/_shipping.html.erb b/admin/app/views/spree/admin/products/form/_shipping.html.erbindex 2e9138aebf..4bb3ad34a3 100644--- a/admin/app/views/spree/admin/products/form/_shipping.html.erb+++ b/admin/app/views/spree/admin/products/form/_shipping.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:shipping) %></h5></div>diff --git a/admin/app/views/spree/admin/products/form/_status.html.erb b/admin/app/views/spree/admin/products/form/_status.html.erbindex c807016167..c9b7acf71c 100644--- a/admin/app/views/spree/admin/products/form/_status.html.erb+++ b/admin/app/views/spree/admin/products/form/_status.html.erb@@ -1,7 +1,7 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body">- <div class="row mb-3">- <div class="col-6">+ <div class="grid grid-cols-12 gap-6 mb-6">+ <div class="col-span-6"><%= f.spree_select :status,available_status_options(@product),{ selected: @product.status, help_bubble: show_product_status_help_bubble? ? Spree.t('admin.products.status_form.status') : nil },@@ -11,7 +11,7 @@}} %></div>- <div class="col-6 <%= 'd-none' if @product.active? %>" data-product-form-target="makeActiveAt">+ <div class="col-span-6 <%= 'hidden' if @product.active? %>" data-product-form-target="makeActiveAt"><% if can?(:activate, @product) %><%= f.spree_datetime_field :make_active_at,help_bubble: Spree.t('admin.products.status_form.make_active_at'),@@ -19,13 +19,13 @@<% end %></div></div>- <div class="row">- <div data-product-form-target="availableOn" class="col-6">+ <div class="grid grid-cols-12 gap-6">+ <div data-product-form-target="availableOn" class="col-span-6"><%= f.spree_datetime_field :available_on,help_bubble: Spree.t('admin.products.status_form.available_on'),max: @product.discontinue_on %></div>- <div data-product-form-target="discontinueOn" class="col-6">+ <div data-product-form-target="discontinueOn" class="col-span-6"><%= f.spree_datetime_field :discontinue_on,help_bubble: Spree.t('admin.products.status_form.discontinue_on'),min: @product.make_active_at %>diff --git a/admin/app/views/spree/admin/products/form/_stores.html.erb b/admin/app/views/spree/admin/products/form/_stores.html.erbindex d1aa3b5c27..68daf2b0cc 100644--- a/admin/app/views/spree/admin/products/form/_stores.html.erb+++ b/admin/app/views/spree/admin/products/form/_stores.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:stores) %>@@ -10,7 +10,7 @@<p class="form-text"><%= Spree.t('admin.products.stores.choose_stores') %>.</p><%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>- <div class="custom-control custom-checkbox mb-1">+ <div class="custom-control form-checkbox mb-1"><%= b.check_box(class: 'custom-control-input') %><%= b.label(class: 'custom-control-label') %></div>diff --git a/admin/app/views/spree/admin/products/form/_tax.html.erb b/admin/app/views/spree/admin/products/form/_tax.html.erbindex 3df1879f7b..1f2829539f 100644--- a/admin/app/views/spree/admin/products/form/_tax.html.erb+++ b/admin/app/views/spree/admin/products/form/_tax.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:tax) %></h5></div>diff --git a/admin/app/views/spree/admin/products/form/_variants.html.erb b/admin/app/views/spree/admin/products/form/_variants.html.erbindex 61c57eba68..fcc9f21dd8 100644--- a/admin/app/views/spree/admin/products/form/_variants.html.erb+++ b/admin/app/views/spree/admin/products/form/_variants.html.erb@@ -1,5 +1,5 @@<% if @product.has_variants? || can?(:manage_option_types, @product) %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:variants) %></h5></div>@@ -33,8 +33,8 @@<i class="ti ti-grip-vertical"></i></button><% end%>- <div class="w-100">- <div class="d-flex justify-content-between align-items-center">+ <div class="w-full">+ <div class="flex justify-between items-center"><h6 data-slot="optionName"><%= option_type.presentation %></h6><% if can?(:manage_option_types, @product) %><button class="btn btn-light btn-sm" type="button" data-action="variants-form#editOption" data-variants-form-option-id-param="<%= option_type.id %>"><%= Spree.t(:edit) %></button>@@ -49,8 +49,8 @@</div><% end %></div>- <div class="options-creator__option options-creator__option--new d-none" data-variants-form-target="newOptionForm">- <div class="w-100">+ <div class="options-creator__option options-creator__option--new hidden" data-variants-form-target="newOptionForm">+ <div class="w-full"><div class="form-group"><label class="label" for="new_option_name"><%= Spree.t(:option_name) %></label><%= tom_select_tag :new_option_name,@@ -97,15 +97,15 @@} %></div></div>- <div class="d-flex justify-content-between">- <button class="btn btn-light btn-sm" data-action="variants-form#hideNewOptionForm" type="button"><%= Spree.t('actions.discard') %></button>- <button class="btn btn-primary btn-sm" data-action="variants-form#handleNewOption" type="button"><%= Spree.t(:done) %></button>+ <div class="flex justify-between">+ <button class="btn btn-light" data-action="variants-form#hideNewOptionForm" type="button"><%= Spree.t('actions.discard') %></button>+ <button class="btn btn-primary" data-action="variants-form#handleNewOption" type="button"><%= Spree.t(:done) %></button></div></div></div><% if can?(:manage_option_types, @product) %><button- class="new_option_button"+ class="new_option_button btn btn-secondary justify-center"type="button"data-variants-form-target="newOptionButton" data-action="variants-form#showNewOptionForm">@@ -120,25 +120,25 @@</button><% end %></div>- <div class="variants-table <% unless @product.has_variants? %>d-none<% end %>" data-variants-form-target="variantsTable">- <div class="variants-table__actions gap-3">+ <div class="variants-table <% unless @product.has_variants? %>hidden<% end %>" data-variants-form-target="variantsTable">+ <div class="variants-table__actions gap-16"><% if supported_currencies.length > 1 %>- <div class="d-flex flex-row align-items-center gap-2">+ <div class="flex flex-row items-center gap-2"><label for="currency" class="mb-0"><%= Spree.t(:currency) %></label>- <%= select_tag 'currency', options_for_select(supported_currencies, current_store.default_currency), class: 'variants-table__actions__select custom-select', data: { action: 'variants-form#updateCurrency' } %>+ <%= select_tag 'currency', options_for_select(supported_currencies, current_store.default_currency), class: 'variants-table__actions__select form-select', data: { action: 'variants-form#updateCurrency' } %></div><% end %><% if available_stock_locations_for_product(@product).size > 1 %>- <div class="d-flex flex-row align-items-center gap-2">+ <div class="flex flex-row items-center gap-2"><label for="stock_location" class="mb-0"><%= Spree.t(:stock_location) %></label>- <%= select_tag 'stock_location', variant_form_stock_location_options, class: 'variants-table__actions__select custom-select', data: { action: 'variants-form#updateStockLocationId' } %>+ <%= select_tag 'stock_location', variant_form_stock_location_options, class: 'variants-table__actions__select form-select', data: { action: 'variants-form#updateStockLocationId' } %></div><% end %></div>- <div class="variants-table__header border-top border-bottom">+ <div class="variants-table__header border-t border-b"><% if can?(:destroy, @product.default_variant) %><div class="variants-table__body__cell column-checkbox">- <div class="custom-control custom-checkbox">+ <div class="custom-control form-checkbox"><%= check_box_tag "ids[]", nil, false, class: "custom-control-input", id: "ids", data: { variants_form_target: "checkboxAll" } %><label class="custom-control-label" for="ids"><span></span></label></div>@@ -146,9 +146,9 @@<% end%><div class="variants-table__header__cell column-variant"><%= Spree.t(:variant) %>- <button data-variants-form-target="deleteButton" data-action="variants-form#deleteSelected" type="button" class="delete-button d-none ml-3">- <i class="ti ti-trash"></i> <%= Spree.t(:delete_selected) %>- </button>+ <button data-variants-form-target="deleteButton" data-action="variants-form#deleteSelected" type="button" class="btn btn-danger btn-sm hidden ml-12">+ <%= icon('trash') %> <%= Spree.t(:delete_selected) %>+ </button></div><div class="variants-table__header__cell column-price"><%= Spree.t(:price) %>@@ -162,7 +162,7 @@<%= render 'spree/admin/products/form/variants/variant_template', default_stock_location: default_stock_location_for_product(@product) %><div class="variants-table__body" data-variants-form-target="variantsContainer" data-test-id="product-variants-table"></div>- <div class="variants-table__footer font-size-sm">+ <div class="variants-table__footer text-sm rounded-b-2xl"><%= Spree.t('admin.variants_form.total_inventory_html', stock_location: current_store.default_stock_location.name, count: raw("<span data-variants-form-target='stockItemsCount'>#{@product.total_on_hand}</span>") )%></div></div>diff --git a/admin/app/views/spree/admin/products/form/variants/_option_template.html.erb b/admin/app/views/spree/admin/products/form/variants/_option_template.html.erbindex a90899afef..5a48d81b85 100644--- a/admin/app/views/spree/admin/products/form/variants/_option_template.html.erb+++ b/admin/app/views/spree/admin/products/form/variants/_option_template.html.erb@@ -8,8 +8,8 @@<i class="ti ti-grip-vertical"></i></button><% end %>- <div class="w-100">- <div class="d-flex justify-content-between">+ <div class="w-full">+ <div class="flex justify-between"><h6 data-slot="optionName"></h6><% if can?(:manage_option_types, @product) %><button class="btn btn-light btn-sm" type="button" data-action="variants-form#editOption" data-variants-form-option-id-param=""><%= Spree.t(:edit) %></button>@@ -20,8 +20,8 @@</div></template><template data-variants-form-target="optionFormTemplate">- <div class="options-creator__option options-creator__option--form" data-slot="optionForm">- <div class="w-100">+ <div class="options-creator__option options-creator__option--form border-b border-gray-100 mb-4 pb-4" data-slot="optionForm">+ <div class="w-full"><div class="form-group"><label class="label" for="option_name"><%= Spree.t(:option_name) %></label><%= tom_select_tag :option_name,@@ -35,7 +35,7 @@</div><div class="form-group"><span class="label"><%= Spree.t(:option_values) %></span>- <div data-controller="multi-tom-select" class="values-inputs" data-variants-form-target="newOptionValuesSelectContainer" data-slot="optionValuesSelectContainer">+ <div data-controller="multi-tom-select" class="values-inputs flex flex-col gap-2" data-variants-form-target="newOptionValuesSelectContainer" data-slot="optionValuesSelectContainer"><%= tom_select_tag "new_option_values[]",template: true,multiple: false,@@ -50,9 +50,9 @@} %></div></div>- <div class="d-flex justify-content-between">- <button class="btn btn-danger btn-outline btn-sm" data-action="variants-form#discardOption" data-variants-form-option-id-param="" type="button"><%= Spree.t('actions.destroy') %></button>- <button class="btn btn-primary btn-sm" data-variants-form-option-id-param="" data-action="variants-form#saveOption" type="button"><%= Spree.t(:done) %></button>+ <div class="flex justify-between">+ <button class="btn btn-danger" data-action="variants-form#discardOption" data-variants-form-option-id-param="" type="button"><%= Spree.t('actions.destroy') %></button>+ <button class="btn btn-primary" data-variants-form-option-id-param="" data-action="variants-form#saveOption" type="button"><%= Spree.t(:done) %></button></div></div></div>diff --git a/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erb b/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erbindex 1ee0ae82af..650c4196e0 100644--- a/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erb+++ b/admin/app/views/spree/admin/products/form/variants/_variant_template.html.erb@@ -3,10 +3,10 @@<% can_manage_stock = @product.new_record? ? true : can?(:manage, test_stock_item) %><% can_manage_prices = @product.new_record? ? true : can?(:manage, test_price) %><template data-variants-form-target="variantTemplate">- <div class="variants-table__body__row hover-light" data-variants-form-target="variant">+ <div class="variants-table__body__row hover:bg-gray-25" data-variants-form-target="variant"><% if can?(:destroy, @product.default_variant) %><div class="variants-table__body__cell column-checkbox">- <div class="custom-control custom-checkbox">+ <div class="custom-control form-checkbox"><input type="checkbox" value="1" class="custom-control-input" data-variants-form-target="checkbox" id="checkbox_" data-action="change->variants-form#refresh"><label class="custom-control-label" for="checkbox_"><span></span></label></div>@@ -15,11 +15,11 @@<div class="variants-table__body__cell column-variant" data-slot="variantName">Medium</div>- <div class="variants-table__body__cell column-price">+ <div class="variants-table__body__cell column-price mr-2"><% supported_currencies.each_with_index do |currency, i| %>- <div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container <%= current_currency != currency ? 'd-none' : 'd-flex' %>" <%= !can_manage_prices ? 'readonly' : '' %>>- <%= text_field_tag "product[variants_attributes][prices_attributes][#{i}][amount]", '', class: 'form-control-plaintext px-0', data: { slot: "[prices_attributes][#{currency}][amount]_input", action: 'variants-form#updatePrice', currency: currency.to_s }, readonly: !can_manage_prices %>- <span><%= currency_symbol(currency) %></span>+ <div class="input-group price-input-container <%= current_currency != currency ? 'hidden' : 'flex' %>" <%= !can_manage_prices ? 'readonly' : '' %>>+ <%= text_field_tag "product[variants_attributes][prices_attributes][#{i}][amount]", '', class: 'border-0 focus:ring-0 focus:outline-none', data: { slot: "[prices_attributes][#{currency}][amount]_input", action: 'variants-form#updatePrice', currency: currency.to_s }, readonly: !can_manage_prices %>+ <span class="px-3"><%= currency_symbol(currency) %></span></div><%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][currency]", currency, data: {slot: "[prices_attributes][#{currency}][currency]_input"} %><%= hidden_field_tag "product[variants_attributes][prices_attributes][#{i}][id]", "", data: {slot: "[prices_attributes][#{currency}][id]_input"} %>@@ -27,14 +27,14 @@</div><div class="variants-table__body__cell column-quantity"><% available_stock_locations_for_product(@product).ids.each_with_index do |id, i| %>- <%= number_field_tag "product[variants_attributes][stock_items_attributes][#{i}][count_on_hand]", 0, class: class_names('form-control', default_stock_location.id == id ? 'd-block' : 'd-none'), data: {slot: "[stock_items_attributes][#{id}][count_on_hand]_input", stock_location_id: id, action: "variants-form#updateCountOnHand blur->variants-form#replaceBlankWithZero" }, readonly: !can_manage_stock %>+ <%= number_field_tag "product[variants_attributes][stock_items_attributes][#{i}][count_on_hand]", 0, class: class_names('form-input', default_stock_location.id == id ? 'block' : 'hidden'), data: {slot: "[stock_items_attributes][#{id}][count_on_hand]_input", stock_location_id: id, action: "variants-form#updateCountOnHand blur->variants-form#replaceBlankWithZero" }, readonly: !can_manage_stock %><%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][stock_location_id]", id, data: { slot: "[stock_items_attributes][#{id}][stock_location_id]_input" } %><%= hidden_field_tag "product[variants_attributes][stock_items_attributes][#{i}][id]", "", data: { slot: "[stock_items_attributes][#{id}][id]_input" } %><% end %></div><% if can?(:manage, @product.default_variant) %>- <div class="variants-table__body__cell column-actions d-flex align-items-center">- <a href="#" class="btn btn-sm btn-light invisible ml-2" data-slot="variantEditButton">+ <div class="variants-table__body__cell column-actions flex items-center">+ <a href="#" class="btn btn-light invisible ml-2" data-slot="variantEditButton"><%= icon('edit') %><%= Spree.t(:edit)%></a>diff --git a/admin/app/views/spree/admin/profile/edit.html.erb b/admin/app/views/spree/admin/profile/edit.html.erbindex 41c21555c5..312fb04038 100644--- a/admin/app/views/spree/admin/profile/edit.html.erb+++ b/admin/app/views/spree/admin/profile/edit.html.erb@@ -6,10 +6,10 @@<%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user', data: { admin_target: 'save' } %><% end %>-<div class="row">- <div class="col-lg-6 offset-lg-3">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t('admin.personal_details') %></h5></div>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 b7e26eadc8..c0c0d943c2 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@@ -1,7 +1,7 @@<%= turbo_frame_tag promotion_action do %><div class="card" id="<%= spree_dom_id(promotion_action) %>">- <div class="card-header d-flex justify-content-between align-items-center">- <h5 class="card-title"><%= promotion_action.human_name %></h5>+ <div class="card-header flex justify-between items-center py-3">+ <h5 class="card-title text-base"><%= promotion_action.human_name %></h5><% if can?(:update, promotion_action) || can?(:destroy, promotion_action) %><%= dropdown portal: false do %>@@ -10,13 +10,13 @@<% end %><%= dropdown_menu do %><%= 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) %>- <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_action) %>+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_action_path(promotion_action.promotion, promotion_action), class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_action) %><% end %><% end %><% end %></div><div class="card-body">- <p class="text-muted"><%= promotion_action.human_description %></p>+ <p class="text-gray-600"><%= promotion_action.human_description %></p><% if promotion_action.preferences.present? %><%= render 'spree/admin/shared/preferences', object: promotion_action %>@@ -31,7 +31,7 @@<h6><%= Spree.t(:line_items) %></h6><ul class="list-group"><% promotion_action.promotion_action_line_items.each do |line_item| %>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= link_to line_item.variant.descriptive_name, spree.edit_admin_product_variant_path(line_item.variant.product, line_item.variant) %><span><%= Spree.t(:quantity) %>: <%= line_item.quantity %>diff --git a/admin/app/views/spree/admin/promotion_actions/edit.html.erb b/admin/app/views/spree/admin/promotion_actions/edit.html.erbindex 9bc6334a13..d7a0ede4a1 100644--- a/admin/app/views/spree/admin/promotion_actions/edit.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/edit.html.erb@@ -1,14 +1,14 @@<%= turbo_frame_tag @promotion_action do %><%= form_with model: @promotion_action, url: spree.admin_promotion_action_path(@promotion, @promotion_action), method: :put, scope: :promotion_action do |f| %><div class="card" id="<%= spree_dom_id(@promotion_action) %>">- <div class="card-header d-flex justify-content-between align-items-center">+ <div class="card-header flex justify-between items-center"><h5 class="card-title"><%= @promotion_action.human_name %></h5></div><div class="card-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %><%= render "spree/admin/promotion_actions/forms/#{@promotion_action.key}", f: f %></div>- <div class="card-footer d-flex justify-content-between">+ <div class="card-footer flex justify-between"><%= turbo_save_button_tag Spree.t('actions.update') %><%= link_to Spree.t('actions.discard'), spree.admin_promotion_path(@promotion), class: 'btn btn-light' %></div>diff --git a/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items.html.erb b/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items.html.erbindex 12710a97a5..af2219b9a0 100644--- a/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items.html.erb@@ -7,7 +7,7 @@<% end %></template>- <div class="rounded-lg border">+ <div class="rounded-xl border"><table class="table"><thead><tr>diff --git a/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items_row.html.erb b/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items_row.html.erbindex 3bdf0d4474..9296868ff5 100644--- a/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items_row.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/forms/_create_line_items_row.html.erb@@ -6,7 +6,7 @@<%= tom_select_tag "#{line_item_fields.object_name}[variant_id]",url: spree.admin_variants_search_path,remote_search: true,- class: 'w-100',+ class: 'w-full',required: true %><% else %><%= link_to spree.edit_admin_product_variant_path(line_item_fields.object.variant.product, line_item_fields.object.variant), target: '_blank' do %>@@ -17,7 +17,7 @@<% end %></td><td class="w-20">- <%= line_item_fields.number_field :quantity, min: 1, max: line_item_fields.object.variant&.total_on_hand, class: 'form-control', required: true %>+ <%= line_item_fields.number_field :quantity, min: 1, max: line_item_fields.object.variant&.total_on_hand, class: 'form-input', required: true %></td><td class="w-10 text-right"><button type="button" class="btn btn-danger btn-sm" data-action="nested-form#remove">diff --git a/admin/app/views/spree/admin/promotion_actions/new.html.erb b/admin/app/views/spree/admin/promotion_actions/new.html.erbindex 644eec3f65..3288715f7c 100644--- a/admin/app/views/spree/admin/promotion_actions/new.html.erb+++ b/admin/app/views/spree/admin/promotion_actions/new.html.erb@@ -8,19 +8,18 @@<div class="dialog-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_action } %><% if @promotion_action.type.nil? %>- <%= render 'spree/admin/shared/spinner' %><% options_for_promotion_action_types(@promotion).each do |action_type| %><% key = action_type.to_s.demodulize.underscore %>- <%= link_to spree.new_admin_promotion_action_path(@promotion, promotion_action: { type: action_type }), class: 'd-flex align-items-top w-100 py-2 px-3 hover-gray rounded-lg mb-2', data: { turbo_prefetch: false } do %>+ <%= link_to spree.new_admin_promotion_action_path(@promotion, promotion_action: { type: action_type }), class: 'flex align-items-top w-full py-2 px-4 hover:bg-gray-100 rounded-xl mb-2', data: { turbo_prefetch: false } do %><%= radio_button_tag :type, action_type, checked: @promotion_action.type == action_type %>- <div class="ml-3">+ <div class="ml-4"><h6><%= Spree.t("promotion_action_types.#{key}.name") %></h6>- <p class="text-muted mb-0"><%= Spree.t("promotion_action_types.#{key}.description") %></p>+ <p class="text-gray-600 mb-0"><%= Spree.t("promotion_action_types.#{key}.description") %></p></div><% end %><% end %><% else %>- <p class="text-muted">+ <p class="text-gray-600"><%= @promotion_action.human_description %></p><%= f.hidden_field :type, value: @promotion_action.type %>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 f5b279c16f..5dd3fd382a 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@@ -1,7 +1,7 @@<%= turbo_frame_tag promotion_rule do %><div class="card" id="<%= spree_dom_id(promotion_rule) %>">- <div class="card-header d-flex justify-content-between align-items-center">- <h5 class="card-title"><%= promotion_rule.human_name %></h5>+ <div class="card-header flex justify-between items-center py-3">+ <h5 class="card-title text-base"><%= promotion_rule.human_name %></h5><% if can?(:update, promotion_rule) || can?(:destroy, promotion_rule) %><%= dropdown portal: false do %>@@ -10,22 +10,24 @@<% end %><%= dropdown_menu do %><%= 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) %>- <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_rule_path(promotion_rule.promotion, promotion_rule), class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_rule) %>+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), spree.admin_promotion_rule_path(promotion_rule.promotion, promotion_rule), class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top' } if can?(:destroy, promotion_rule) %><% end %><% end %><% end %></div><div class="card-body">- <p class="text-muted"><%= promotion_rule.human_description %></p>+ <p class="text-gray-600 mb-3">+ <%= promotion_rule.human_description %>+ </p><% if promotion_rule.preferences.present? %><%= render 'spree/admin/shared/preferences', object: promotion_rule %><% end %><% if promotion_rule.respond_to?(:preferred_eligible_values) %>- <div class="mt-3">+ <div class="mt-4"><span><%= Spree.t(:option_values) %>:</span>- <div class="d-flex flex-wrap gap-2">+ <div class="flex flex-wrap gap-2"><% promotion_rule_option_values(promotion_rule.preferred_eligible_values).each do |value| %><strong><%= value %></strong><% end %>@@ -34,9 +36,9 @@<% end %><% if promotion_rule.respond_to?(:products) %>- <div class="mt-3">+ <div class="mt-4"><span><%= Spree.t(:products) %>:</span>- <div class="d-flex flex-wrap gap-2">+ <div class="flex flex-wrap gap-2"><% promotion_rule.products.pluck(:name).each do |product_name| %><strong><%= product_name %></strong><% end %>@@ -45,9 +47,8 @@<% end %><% if promotion_rule.respond_to?(:taxons) %>- <div class="mt-3">- <span><%= Spree.t(:taxons) %>:</span>- <div class="d-flex flex-wrap gap-2">+ <div class="mt-4">+ <div class="flex flex-wrap gap-2"><% promotion_rule.taxons.pluck(:pretty_name).each do |taxon_name| %><strong><%= taxon_name %></strong><% end %>@@ -56,9 +57,8 @@<% end %><% if promotion_rule.respond_to?(:users) %>- <div class="mt-3">- <span><%= Spree.t(:users) %>:</span>- <div class="d-flex flex-wrap gap-2">+ <div class="mt-4">+ <div class="flex flex-wrap gap-2"><% promotion_rule.users.pluck(:email).each do |user_email| %><strong><%= user_email %></strong><% end %>diff --git a/admin/app/views/spree/admin/promotion_rules/edit.html.erb b/admin/app/views/spree/admin/promotion_rules/edit.html.erbindex 4d495dbfaf..8aad1bf7b6 100644--- a/admin/app/views/spree/admin/promotion_rules/edit.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/edit.html.erb@@ -1,14 +1,17 @@<%= turbo_frame_tag @promotion_rule do %><%= form_with model: @promotion_rule, url: spree.admin_promotion_rule_path(@promotion, @promotion_rule), method: :put, scope: :promotion_rule do |f| %><div class="card" id="<%= spree_dom_id(@promotion_rule) %>">- <div class="card-header d-flex justify-content-between align-items-center">+ <div class="card-header flex justify-between items-center"><h5 class="card-title"><%= @promotion_rule.human_name %></h5></div><div class="card-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %>+ <p class="text-gray-600 mb-3">+ <%= @promotion_rule.human_description %>+ </p><%= render "spree/admin/promotion_rules/forms/#{@promotion_rule.key}", f: f %></div>- <div class="card-footer d-flex justify-content-between">+ <div class="card-footer flex justify-between"><%= turbo_save_button_tag Spree.t('actions.update') %><%= link_to Spree.t('actions.discard'), spree.admin_promotion_path(@promotion), class: 'btn btn-light' %></div>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 a303961335..f95bb3ef80 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@@ -1,23 +1,23 @@-<div class="row mb-3">- <div class="col-6">- <%= f.select :preferred_operator_min,+<div class="grid grid-cols-12 gap-6 mb-6">+ <div class="col-span-6">+ <%= f.select :preferred_operator_min,options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MIN.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, f.object.preferred_operator_min),- {},- { class: 'custom-select' } %>+ {},+ { class: 'form-select' } %></div>- <div class="col-6">- <%= f.number_field :preferred_amount_min, class: 'form-control', required: true %>+ <div class="col-span-6">+ <%= f.number_field :preferred_amount_min, class: 'form-input', required: true %></div></div>-<div class="row">- <div class="col-6">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-6"><%= f.select :preferred_operator_max,options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS_MAX.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, f.object.preferred_operator_max),{},- { class: 'custom-select' } %>+ { class: 'form-select' } %></div>- <div class="col-6">- <%= f.number_field :preferred_amount_max, class: 'form-control' %>+ <div class="col-span-6">+ <%= f.number_field :preferred_amount_max, class: 'form-input' %><span class="form-text mt-2">Leave this field blank to not limit the maximum amount.diff --git a/admin/app/views/spree/admin/promotion_rules/forms/_option_value.html.erb b/admin/app/views/spree/admin/promotion_rules/forms/_option_value.html.erbindex 0c52682802..fa0817f994 100644--- a/admin/app/views/spree/admin/promotion_rules/forms/_option_value.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/forms/_option_value.html.erb@@ -5,5 +5,5 @@remote_search: true,remote_search_active_option: active_options_for_option_value_promotion_rule(f.object),multiple: true,- class: 'w-100 mr-2' %>+ class: 'w-full mr-2' %></div>diff --git a/admin/app/views/spree/admin/promotion_rules/new.html.erb b/admin/app/views/spree/admin/promotion_rules/new.html.erbindex ef46593fc3..7350926e35 100644--- a/admin/app/views/spree/admin/promotion_rules/new.html.erb+++ b/admin/app/views/spree/admin/promotion_rules/new.html.erb@@ -8,19 +8,18 @@<div class="dialog-body"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_rule } %><% if @promotion_rule.type.nil? %>- <%= render 'spree/admin/shared/spinner' %><% options_for_promotion_rule_types(@promotion).each do |rule_type| %><% key = rule_type.demodulize.underscore %>- <%= link_to spree.new_admin_promotion_rule_path(@promotion, promotion_rule: { type: rule_type }), class: 'd-flex align-items-top w-100 py-2 px-3 hover-gray rounded-lg mb-2', data: { turbo_prefetch: false } do %>- <%= radio_button_tag :type, rule_type %>- <div class="ml-3">- <h6 class="font-weight-bold mb-1"><%= Spree.t("promotion_rule_types.#{key}.name") %></h6>- <p class="text-muted mb-0"><%= Spree.t("promotion_rule_types.#{key}.description") %></p>+ <%= link_to spree.new_admin_promotion_rule_path(@promotion, promotion_rule: { type: rule_type }), class: 'flex align-items-top w-full py-2 px-4 hover:bg-gray-100 rounded-xl mb-2 no-underline', data: { turbo_prefetch: false } do %>+ <%= radio_button_tag :type, rule_type, class: 'hidden' %>+ <div class="">+ <h6 class="font-bold mb-1"><%= Spree.t("promotion_rule_types.#{key}.name") %></h6>+ <p class="text-gray-600 mb-0"><%= Spree.t("promotion_rule_types.#{key}.description") %></p></div><% end %><% end %><% else %>- <p class="text-muted">+ <p class="text-gray-600 mb-3"><%= @promotion_rule.human_description %></p><%= f.hidden_field :type, value: @promotion_rule.type %>diff --git a/admin/app/views/spree/admin/promotions/_actions.html.erb b/admin/app/views/spree/admin/promotions/_actions.html.erbindex b929831fd3..ac602cb886 100644--- a/admin/app/views/spree/admin/promotions/_actions.html.erb+++ b/admin/app/views/spree/admin/promotions/_actions.html.erb@@ -1,19 +1,19 @@-<div class="card mb-4">- <div class="card-header d-flex justify-content-between px-3 border-0">+<div class="card mb-6">+ <div class="card-header flex justify-between border-0"><h5 class="card-title"><%= icon('bolt', class: 'mr-2') %><%= Spree.t(:promotion_actions) %></h5><% if can?(:create, Spree::PromotionAction.new(promotion: @promotion)) %>- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% end %></div>- <div class="card-body d-flex flex-column gap-2 px-2 pt-0 pb-2">+ <div class="card-body flex flex-col gap-2 px-2 pt-0 pb-2"><% if @promotion.promotion_actions.empty? %>- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">+ <div class="text-gray-600 p-12 flex items-center w-full justify-center"><%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PromotionAction)) %><% if can?(:create, Spree::PromotionAction.new(promotion: @promotion)) %>- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-light btn-sm ml-3', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_action_path(@promotion), class: 'btn btn-light btn-sm ml-6', data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% end %></div><% else %>diff --git a/admin/app/views/spree/admin/promotions/_filters.html.erb b/admin/app/views/spree/admin/promotions/_filters.html.erbindex 65e6472ab4..162386a689 100644--- a/admin/app/views/spree/admin/promotions/_filters.html.erb+++ b/admin/app/views/spree/admin/promotions/_filters.html.erb@@ -1,8 +1,8 @@<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %><%= render "spree/admin/promotions/table_filter_dropdown" %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>@@ -13,7 +13,7 @@<div class="drawer-body"><div class="form-group"><%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>- <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>+ <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-input", data: { filters_target: :input } %></div><%= render_admin_partials(:promotions_filters_partials, f: f) %></div>diff --git a/admin/app/views/spree/admin/promotions/_form.html.erb b/admin/app/views/spree/admin/promotions/_form.html.erbindex c3b82ec2bb..046ffab15a 100644--- a/admin/app/views/spree/admin/promotions/_form.html.erb+++ b/admin/app/views/spree/admin/promotions/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:details) %>@@ -9,7 +9,7 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:kind) %>@@ -20,7 +20,7 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:settings) %>diff --git a/admin/app/views/spree/admin/promotions/_rules.html.erb b/admin/app/views/spree/admin/promotions/_rules.html.erbindex 7cb5926db7..a6eaaff504 100644--- a/admin/app/views/spree/admin/promotions/_rules.html.erb+++ b/admin/app/views/spree/admin/promotions/_rules.html.erb@@ -1,33 +1,26 @@-<div class="card mb-4">- <div class="card-header d-flex justify-content-between px-3">+<div class="card mb-6">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= icon('checklist', class: 'mr-2') %><%= Spree.t(:rules) %></h5><% if can?(:create, Spree::PromotionRule.new(promotion: @promotion)) %>- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-primary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% end %></div>- <div class="card-body">- <div class="form-group mb-0">- <div class="d-block d-lg-flex gap-3">- <%= form_with model: @promotion, url: spree.admin_promotion_path(@promotion), method: :put, data: { controller: 'auto-submit' } do |f| %>- <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>- <div class="custom-control custom-radio custom-control-inline">- <%= f.radio_button :match_policy, policy, class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>- <%= f.label "match_policy_#{policy}", class: 'custom-control-label' %>- </div>- <% end %>- <% end %>- </div>- </div>+ <div class="card-body pb-0">+ <%= form_with model: @promotion, url: spree.admin_promotion_path(@promotion), method: :put, data: { controller: 'auto-submit' }, html: { class: 'flex gap-x-6' } do |f| %>+ <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>+ <%= f.spree_radio_button :match_policy, policy, { data: { action: 'click->auto-submit#submit' }, label: Spree.t("promotion_form.match_policies.#{policy}") } %>+ <% end %>+ <% end %></div>- <div class="card-body p-2 d-flex flex-column gap-2">+ <div class="card-body p-2 flex flex-col gap-2"><% if @promotion.promotion_rules.empty? %>- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">+ <div class="text-gray-600 p-12 flex items-center w-full justify-center"><%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::PromotionRule)) %><% if can?(:create, Spree::PromotionRule.new(promotion: @promotion)) %>- <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-light btn-sm ml-3', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>+ <%= link_to_with_icon 'plus', Spree.t(:add_one), spree.new_admin_promotion_rule_path(@promotion), class: 'btn btn-light btn-sm ml-6', data: { turbo_frame: 'dialog', action: 'dialog#open' } %><% end %></div><% else %>diff --git a/admin/app/views/spree/admin/promotions/_sidebar.html.erb b/admin/app/views/spree/admin/promotions/_sidebar.html.erbindex f95a03840e..719cc87cfa 100644--- a/admin/app/views/spree/admin/promotions/_sidebar.html.erb+++ b/admin/app/views/spree/admin/promotions/_sidebar.html.erb@@ -3,8 +3,8 @@<% if coupon_codes_count.positive? %><% used_coupon_codes_count = @promotion.coupon_codes.used.count %>- <div class="card mb-4">- <div class="card-header d-flex justify-content-between">+ <div class="card mb-6">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:coupon_codes) %></h5>@@ -13,7 +13,7 @@<div class="card-body"><%= progress_bar_component(used_coupon_codes_count, max: coupon_codes_count) %></div>- <div class="card-footer d-flex justify-content-between">+ <div class="card-footer flex justify-between"><span class="badge badge-light"><%= Spree.t(:used) %>: <%= used_coupon_codes_count %> / <%= coupon_codes_count %></span>@@ -26,8 +26,8 @@<% end %><%= turbo_frame_tag :promotion_edit_details do %>- <div class="card mb-4">- <div class="card-header d-flex justify-content-between">+ <div class="card mb-6">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5>@@ -35,8 +35,8 @@</div><div class="card-body p-0"><ul class="list-group list-group-flush">- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:name) %></span><span>@@ -44,8 +44,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:created_at) %></span><span>@@ -53,8 +53,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:updated_at) %></span><span>@@ -62,8 +62,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:kind) %></span><span class="badge badge-light">@@ -72,9 +72,9 @@</li><% if @promotion.code.present? %>- <li class="list-group-item d-flex justify-content-between align-items-center py-2">- <span class="text-muted"><%= Spree.t(:coupon_code) %></span>- <div class="d-flex align-items-center gap-1">+ <li class="list-group-item flex justify-between items-center py-2">+ <span class="text-gray-600"><%= Spree.t(:coupon_code) %></span>+ <div class="flex items-center gap-1"><code><%= @promotion.code.upcase %></code><%= clipboard_component(@promotion.code.upcase) %></div>@@ -87,7 +87,7 @@<%= turbo_frame_tag :promotion_edit_settings do %><div class="card">- <div class="card-header d-flex justify-content-between">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:settings) %></h5>@@ -96,29 +96,29 @@<div class="card-body p-0"><ul class="list-group list-group-flush"><% unless @promotion.multi_codes? %>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted"><%= Spree.t(:usage_limit) %></span>+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:usage_limit) %></span><%= render 'spree/admin/promotions/usage_limit', promotion: @promotion %></li><% end %>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= I18n.t('activerecord.attributes.spree/promotion.starts_at') %></span><% if @promotion.starts_at %><span><%= spree_time(@promotion.starts_at) %></span><% else %>- <span class="text-muted"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:expires_at) %></span><% if @promotion.expires_at %><span><%= spree_time(@promotion.expires_at) %></span><% else %>- <span class="text-muted"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></li></ul>diff --git a/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb b/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erbindex a499e739e2..de1c7af7bc 100644--- a/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb+++ b/admin/app/views/spree/admin/promotions/_table_filter_dropdown.html.erb@@ -1,6 +1,6 @@<%= dropdown do %><%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>- <span class="text-muted font-weight-normal mr-1">+ <span class="text-gray-600 font-normal mr-1"><%= Spree.t(:status) %></span><%= promotion_filter_dropdown_value %>diff --git a/admin/app/views/spree/admin/promotions/_table_row.html.erb b/admin/app/views/spree/admin/promotions/_table_row.html.erbindex a3a6d0ecba..8737e09766 100644--- a/admin/app/views/spree/admin/promotions/_table_row.html.erb+++ b/admin/app/views/spree/admin/promotions/_table_row.html.erb@@ -1,6 +1,6 @@<tr id="<%= spree_dom_id promotion %>" data-controller="row-link"><td class="w-30 p-0">- <%= link_to promotion.name, spree.admin_promotion_path(promotion), class: 'font-weight-bold d-block py-2 px-3 w-100 h-100', data: { row_link_target: :link, turbo_frame: '_top' } %>+ <%= link_to promotion.name, spree.admin_promotion_path(promotion), class: 'font-bold block py-2 px-4 w-full h-full', data: { row_link_target: :link, turbo_frame: '_top' } %></td><td class="w-20 cursor-pointer" data-action="click->row-link#openLink"><% if promotion.coupon_code? && promotion.code.present? %>@@ -8,16 +8,16 @@<% elsif promotion.multi_codes? && promotion.code_prefix.present? %><code><%= promotion.code_prefix %>-<%= '*' * 6 %></code><% else %>- <span class="text-muted small"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600 small"><%= Spree.t(:not_available) %></span><% end %></td></td><td class="w-10 cursor-pointer" data-action="click->row-link#openLink"><span class="badge badge-<% if promotion.automatic? %>info<% else %>light<% end %>"><% if promotion.automatic? %>- <%= icon('automation', class: 'mr-1') %>+ <%= icon('automation', class: 'mr-2') %><% else %>- <%= icon('ticket', class: 'mr-1') %>+ <%= icon('ticket', class: 'mr-2') %><% end %><%= promotion.kind.humanize %></span>diff --git a/admin/app/views/spree/admin/promotions/edit.html.erb b/admin/app/views/spree/admin/promotions/edit.html.erbindex 8b8c66dda4..b6313b861a 100644--- a/admin/app/views/spree/admin/promotions/edit.html.erb+++ b/admin/app/views/spree/admin/promotions/edit.html.erb@@ -2,8 +2,8 @@<%= turbo_frame_tag :promotion_edit_details do %><%= form_for @promotion, url: object_url, method: :put, data: { turbo_frame: '_top' } do |f| %>- <div class="card mb-4">- <div class="card-header d-flex justify-content-between">+ <div class="card mb-6">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5>@@ -12,7 +12,7 @@<%= render 'spree/admin/shared/error_messages', target: @promotion %><div class="form-group"><%= f.label :name %>- <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>+ <%= f.text_field :name, class: 'form-input', required: true, autofocus: true %><%= f.error_message_on :name %><span class="form-text mt-2">Customers will see this in their cart and at checkout.@@ -22,11 +22,11 @@<% if @promotion.coupon_code? && [email protected]_codes? %><div class="form-group"><%= f.label :code %>- <%= f.text_field :code, class: 'form-control text-uppercase', placeholder: 'Your coupon code' %>+ <%= f.text_field :code, class: 'form-input uppercase', placeholder: 'Your coupon code' %></div><% end %></div>- <div class="card-footer d-flex justify-content-between">+ <div class="card-footer flex justify-between"><%= turbo_save_button_tag Spree.t('actions.update') %><%= link_to spree.admin_promotion_path(@promotion), class: 'btn btn-light' do %><%= Spree.t('actions.discard') %>@@ -48,7 +48,7 @@<%= render 'spree/admin/shared/error_messages', target: @promotion %><%= render 'spree/admin/promotions/form/settings', f: f %></div>- <div class="card-footer d-flex justify-content-between">+ <div class="card-footer flex justify-between"><%= turbo_save_button_tag Spree.t('actions.update') %><%= link_to spree.admin_promotion_path(@promotion), class: 'btn btn-light' do %><%= Spree.t('actions.discard') %>diff --git a/admin/app/views/spree/admin/promotions/form/_kind.html.erb b/admin/app/views/spree/admin/promotions/form/_kind.html.erbindex f546694c51..8ec12ff80f 100644--- a/admin/app/views/spree/admin/promotions/form/_kind.html.erb+++ b/admin/app/views/spree/admin/promotions/form/_kind.html.erb@@ -3,41 +3,41 @@<%= f.radio_button :kind, :coupon_code, data: { action: 'change->reveal#show' }, class: 'custom-control-input' %><%= f.label :kind_coupon_code, Spree.t(:coupon_code), class: 'custom-control-label' %>- <div data-reveal-target="item" class="rounded p-3 bg-light mt-3 <% if @promotion.automatic? %>hidden<% end %>">+ <div data-reveal-target="item" class="rounded-md p-6 bg-gray-25 mt-6 <% if @promotion.automatic? %>hidden<% end %>"><div data-controller="reveal" data-reveal-hidden-class="hidden">- <div class="d-flex align-items-start custom-control custom-radio">+ <div class="flex items-start custom-control custom-radio"><%= f.radio_button :multi_codes, false, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %><%= f.label :multi_codes_false, class: 'custom-control-label' do %>One code for all customers- <span class="form-text font-weight-normal mr-1 mt-2">+ <span class="form-text font-normal mr-1 mt-2">You can limit the number of times this code can be used.</span><% end %></div>- <div data-reveal-target="item" class="mb-4 mt-2 ml-4 <% if @promotion.multi_codes? %>hidden<% end %>">- <%= f.text_field :code, class: 'form-control text-uppercase', placeholder: 'Your coupon code' %>+ <div data-reveal-target="item" class="mb-6 mt-2 ml-6 <% if @promotion.multi_codes? %>hidden<% end %>">+ <%= f.text_field :code, class: 'form-input uppercase', placeholder: 'Your coupon code' %></div>- <div class="mt-2 d-flex align-items-start custom-control custom-radio">+ <div class="mt-2 flex items-start custom-control custom-radio"><%= f.radio_button :multi_codes, true, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %><%= f.label :multi_codes_true, class: 'custom-control-label' do %>Generate unique codes- <span class="form-text font-weight-normal mr-1 mt-2">+ <span class="form-text font-normal mr-1 mt-2">These codes are generated automatically and can be downloaded as a CSV file. Codes are unique and can only be used once.</span><% end %></div>- <div data-reveal-target="item" class="ml-3 mt-2 row <% unless @promotion.multi_codes? %>hidden<% end %>">- <div class="col-6">- <%= f.text_field :code_prefix, class: 'form-control text-uppercase', placeholder: 'Coupon Prefix (optional)' %>+ <div data-reveal-target="item" class="ml-6 mt-2 grid grid-cols-12 gap-6 <% unless @promotion.multi_codes? %>hidden<% end %>">+ <div class="col-span-6">+ <%= f.text_field :code_prefix, class: 'form-input uppercase', placeholder: 'Coupon Prefix (optional)' %><span class="form-text mt-2">eg. <strong>ABC</strong></span></div>- <div class="col-6">+ <div class="col-span-6"><% 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 %>+ <%= f.number_field :number_of_codes, class: 'form-input', placeholder: 'Number of codes', min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %><span class="form-text mt-2">How many codes you want to generate.<% if @promotion.persisted? %>@@ -50,7 +50,7 @@</div></div>- <div class="mt-4 custom-control custom-radio">+ <div class="mt-6 custom-control custom-radio"><%= f.radio_button :kind, :automatic, data: { action: 'change->reveal#hide' }, class: 'custom-control-input' %><%= f.label :kind_automatic, Spree.t(:automatic_promotion), class: 'custom-control-label' %>diff --git a/admin/app/views/spree/admin/promotions/show.html.erb b/admin/app/views/spree/admin/promotions/show.html.erbindex 41a1eaa28a..3d7ebf4cdb 100644--- a/admin/app/views/spree/admin/promotions/show.html.erb+++ b/admin/app/views/spree/admin/promotions/show.html.erb@@ -1,12 +1,12 @@<%= render 'spree/admin/promotions/header' %>-<div class="row">- <div class="col-12 col-lg-8">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-8"><%= render 'rules' %><%= render 'actions' %></div>- <div class="col-12 col-lg-4">+ <div class="col-span-12 lg:col-span-4"><%= render 'sidebar' %></div></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/properties/_form.html.erb b/admin/app/views/spree/admin/properties/_form.html.erbindex 3cd934ac42..86755b2ec7 100644--- a/admin/app/views/spree/admin/properties/_form.html.erb+++ b/admin/app/views/spree/admin/properties/_form.html.erb@@ -1,4 +1,4 @@-<div data-controller="slug-form" class="card mb-4">+<div data-controller="slug-form" class="card mb-6"><div class="card-body"><%= f.spree_text_field :presentation, data: { slug_form_target: :name, action: 'input->slug-form#updateUrlFromName' }, required: true, autofocus: f.object.new_record? %><%= f.spree_text_field :name, label: Spree.t(:internal_name), data: { slug_form_target: :url }, required: true %>diff --git a/admin/app/views/spree/admin/properties/_table_row.html.erb b/admin/app/views/spree/admin/properties/_table_row.html.erbindex 0aee19b73d..e9aa55eaca 100644--- a/admin/app/views/spree/admin/properties/_table_row.html.erb+++ b/admin/app/views/spree/admin/properties/_table_row.html.erb@@ -1,12 +1,12 @@<tr id="<%= spree_dom_id property %>" data-controller="row-link" data-sortable-update-url="<%= spree.admin_property_path(property) %>"><td class="w-5 move-handle text-center">- <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>+ <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2') %></td><td class="w-20 cursor-pointer py-0" data-action="click->row-link#openLink"><code><%= property.name %></code></td><td class="w-20 cursor-pointer" data-action="click->row-link#openLink">- <%= link_to property.presentation, spree.edit_admin_property_path(property), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %>+ <%= link_to property.presentation, spree.edit_admin_property_path(property), class: 'no-underline flex items-center font-bold text-gray-900', data: { row_link_target: :link, turbo_frame: '_top' } %></td><td class="w-20 cursor-pointer" data-action="click->row-link#openLink"><span class="badge badge-light"><%= property.kind.humanize %></span>@@ -16,7 +16,7 @@</td><td><%= form_with model: property, url: admin_property_path(property), method: :patch, data: { controller: 'auto-submit' } do |f| %>- <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :display_on, display_on_options, {}, { class: 'form-select form-select-sm w-auto', data: { action: 'auto-submit#submit' } } %><% end %></td><td class="w-10 actions">diff --git a/admin/app/views/spree/admin/refunds/new.html.erb b/admin/app/views/spree/admin/refunds/new.html.erbindex bfb18df978..a607270ecd 100644--- a/admin/app/views/spree/admin/refunds/new.html.erb+++ b/admin/app/views/spree/admin/refunds/new.html.erb@@ -3,16 +3,16 @@<%= Spree.t(:new_refund) %><% end %>-<div class="row">- <div class="col-lg-6 offset-lg-3">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render 'spree/admin/shared/error_messages', target: @refund %><%= form_for [:admin, @refund.payment.order, @refund.payment, @refund] do |f| %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header">- <h6 class="card-title">+ <h5 class="card-title"><%= Spree.t(:new_refund) %>- </h6>+ </h5></div><div class="card-body"><div class="form-group">diff --git a/admin/app/views/spree/admin/reimbursement_types/_form.html.erb b/admin/app/views/spree/admin/reimbursement_types/_form.html.erbindex 4b16821cc8..3ad04d620e 100644--- a/admin/app/views/spree/admin/reimbursement_types/_form.html.erb+++ b/admin/app/views/spree/admin/reimbursement_types/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, autofocus: f.object.new_record?, required: true %>diff --git a/admin/app/views/spree/admin/reimbursements/edit.html.erb b/admin/app/views/spree/admin/reimbursements/edit.html.erbindex 20964d9cb8..5ba760eb7a 100644--- a/admin/app/views/spree/admin/reimbursements/edit.html.erb+++ b/admin/app/views/spree/admin/reimbursements/edit.html.erb@@ -1,6 +1,6 @@<% content_for :page_title do %><%= page_header_back_button spree.edit_admin_order_path(@reimbursement.order) %>- <div class="d-flex gap-3 align-items-center">+ <div class="flex gap-6 items-center"><span><%= Spree.t(:reimbursement) %></span><span><%= @reimbursement.number %></span>@@ -16,7 +16,7 @@ locals: {} %><%= form_for [:admin, @order, @reimbursement] do |f| %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5><%= Spree.t(:items_to_be_reimbursed) %></h5></div>@@ -53,7 +53,7 @@ locals: {</td><td><%= item_fields.text_field :pre_tax_amount,- { class: "refund-amount-input form-control" } %>+ { class: "refund-amount-input form-input" } %></td><td><%= return_item.display_total %>@@ -69,7 +69,7 @@ locals: {{ include_blank: true },{class:- "custom-select return-item-exchange-selection",+ "form-select return-item-exchange-selection",} %><% end %></td>@@ -80,12 +80,12 @@ locals: {</div></div>- <div class="form-actions filter-actions actions mb-4">+ <div class="form-actions filter-actions actions mb-6"><%= turbo_save_button_tag Spree.t("actions.update"), class: "btn btn-primary" %></div><% end %>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5><%= Spree.t(:calculated_reimbursements) %></h5></div>@@ -112,7 +112,7 @@ locals: {</div><% if @order.has_non_reimbursement_related_refunds? %>- <div class="alert alert-danger mb-2">+ <div class="alert alert-danger mb-6"><%= "#{Spree.t("note")}: #{Spree.t("this_order_has_already_received_a_refund")}. #{Spree.t("make_sure_the_above_reimbursement_amount_is_correct")}." %></div><% end %>diff --git a/admin/app/views/spree/admin/reimbursements/show.html.erb b/admin/app/views/spree/admin/reimbursements/show.html.erbindex f2a7f4245c..fb8a19acb0 100644--- a/admin/app/views/spree/admin/reimbursements/show.html.erb+++ b/admin/app/views/spree/admin/reimbursements/show.html.erb@@ -1,6 +1,6 @@<% content_for :page_title do %><%= page_header_back_button spree.edit_admin_order_path(@reimbursement.order) %>- <div class="d-flex gap-3 align-items-center">+ <div class="flex gap-6 items-center"><span><%= Spree.t(:reimbursement) %></span><span><%= @reimbursement.number %></span>@@ -15,7 +15,7 @@ locals: {target: @reimbursement,} %>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:items_reimbursed) %></h5></div>@@ -60,7 +60,7 @@ locals: {</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:refunds) %></h5></div>diff --git a/admin/app/views/spree/admin/reports/new.html.erb b/admin/app/views/spree/admin/reports/new.html.erbindex 483d70214b..0b77c90f04 100644--- a/admin/app/views/spree/admin/reports/new.html.erb+++ b/admin/app/views/spree/admin/reports/new.html.erb@@ -4,7 +4,7 @@<% end %><%= content_for :page_actions do %>- <%= form_for @report, url: spree.admin_reports_path, as: :report, html: { class: 'd-inline-block' } do |f| %>+ <%= form_for @report, url: spree.admin_reports_path, as: :report, html: { class: 'inline-block' } do |f| %><%= f.hidden_field :type %><%= f.hidden_field :date_from %><%= f.hidden_field :date_to %>@@ -26,16 +26,15 @@<%= form_tag spree.new_admin_report_path, method: :get, data: { controller: 'auto-submit' } do %><%= hidden_field_tag :type, params[:type] %>- <div class="d-flex gap-2">+ <div class="flex gap-2"><%= render 'spree/admin/shared/calendar_range_picker',date_from_value: @report.date_from,- date_to_value: @report.date_to,- css_classes: 'custom-select d-flex cursor-default bg-transparent' %>+ date_to_value: @report.date_to %><div class="form-group"><%= select_tag :currency,options_for_select(current_store.supported_currencies_list, @report.currency),- class: 'custom-select bg-transparent',+ class: 'form-select bg-transparent pr-8!',data: { action: 'change->auto-submit#submit' } %></div>diff --git a/admin/app/views/spree/admin/return_authorizations/_table_row.html.erb b/admin/app/views/spree/admin/return_authorizations/_table_row.html.erbindex e230d44cc4..f81bff01f0 100644--- a/admin/app/views/spree/admin/return_authorizations/_table_row.html.erb+++ b/admin/app/views/spree/admin/return_authorizations/_table_row.html.erb@@ -21,7 +21,7 @@<td data-action="click->row-link#openLink"><%= link_to return_authorization.number,return_url,- class: "font-weight-bold",+ class: "font-bold",data: {row_link_target: :link,} %>@@ -29,7 +29,7 @@<td data-action="click->row-link#openLink"><%= link_to spree_time_ago(return_authorization.created_at),return_url,- class: "text-dark" %>+ class: "text-gray-900" %></td><td data-action="click->row-link#openLink"><%= render "spree/admin/orders/customer_summary", order: return_authorization.order %>diff --git a/admin/app/views/spree/admin/return_authorizations/filters.html.erb b/admin/app/views/spree/admin/return_authorizations/filters.html.erbindex b01d426ee4..69d5c9fd84 100644--- a/admin/app/views/spree/admin/return_authorizations/filters.html.erb+++ b/admin/app/views/spree/admin/return_authorizations/filters.html.erb@@ -1,10 +1,10 @@<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path, class: "filter-wrap", data: {controller: "filters"} do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render "spree/admin/shared/filters_search_bar", param: :number_cont %><%= dropdown do %><%= dropdown_toggle class: 'btn-light dropdown-toggle' do %>- <span class="text-muted font-weight-normal mr-1">+ <span class="text-gray-600 font-normal mr-1"><%= Spree.t(:show) %>:</span><% if params.dig(:q, :state_eq).present? %>diff --git a/admin/app/views/spree/admin/roles/_form.html.erb b/admin/app/views/spree/admin/roles/_form.html.erbindex e5258b5ada..cc1e13ebf7 100644--- a/admin/app/views/spree/admin/roles/_form.html.erb+++ b/admin/app/views/spree/admin/roles/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, required: true %></div>diff --git a/admin/app/views/spree/admin/shared/_alerts.html.erb b/admin/app/views/spree/admin/shared/_alerts.html.erbindex 8bda95605f..86db0b88cf 100644--- a/admin/app/views/spree/admin/shared/_alerts.html.erb+++ b/admin/app/views/spree/admin/shared/_alerts.html.erb@@ -3,16 +3,16 @@<%= turbo_frame_tag frame_name do %><% flash.to_h.each do |msg_type, text| %><div class="alerts-container" style="pointer-events: none;">- <div class="d-flex justify-content-center px-2">+ <div class="flex justify-center px-2"><divdata-controller="notification"data-notification-delay-value="5000"- 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">+ class="animate-fade-in-down-fast hidden alert pr-2 flex items-center <%= admin_flash_class_for(msg_type) %> items-center" style="min-width: 300px; pointer-events: all;">+ <div class="flex items-center justify-between w-full">+ <div class="flex items-center justify-between"><span><%= text %></span></div>- <button type="button" class="btn ml-3 p-1" data-action="notification#hide" aria-label="<%= Spree.t(:close) %>">+ <button type="button" class="btn ml-4 p-1" data-action="notification#hide" aria-label="<%= Spree.t(:close) %>"><%= icon('x', height: 20, class: 'mr-0') %></button></div>diff --git a/admin/app/views/spree/admin/shared/_analytics_loader_skeleton.html.erb b/admin/app/views/spree/admin/shared/_analytics_loader_skeleton.html.erbindex d0c1b0bfd4..9e8db439f0 100644--- a/admin/app/views/spree/admin/shared/_analytics_loader_skeleton.html.erb+++ b/admin/app/views/spree/admin/shared/_analytics_loader_skeleton.html.erb@@ -1,11 +1,11 @@- <div class="card mb-4">- <div class="card-header d-block border-0 h-auto p-2">- <div class="row">- <div class="col-6 col-lg-4 pr-1">+ <div class="card mb-6 animate-pulse">+ <div class="card-header block border-0 h-auto p-2">+ <div class="grid grid-cols-12">+ <div class="col-span-6 lg:col-span-4 gap-2"><div class="analytics-card-tab active" style="min-height: 82px;">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">- <span class="font-size-sm text-muted">Total Sales</span>- <span class="font-size-lg text-dark font-weight-bold mt-1">+ <div class="flex justify-center flex-col mb-6 lg:mb-0">+ <span class="text-sm text-gray-600">Total Sales</span>+ <span class="text-lg text-gray-900 font-bold mt-1"><%= @sales_total %></span><div>@@ -15,11 +15,11 @@</div></div>- <div class="col-6 col-lg-2 pl-0 pr-2">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" >- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">- <span class="font-size-sm text-muted">Avg. Order Value</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @orders_average %></span>+ <div class="flex justify-center flex-col mb-6 lg:mb-0">+ <span class="text-sm text-gray-600">Avg. Order Value</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_average %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %></div>@@ -27,11 +27,11 @@</div></div>- <div class="col-6 col-lg-2 pl-0 pr-2">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" >- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">- <span class="font-size-sm text-muted">Total Orders</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @orders_total %></span>+ <div class="flex justify-center flex-col mb-6 lg:mb-0">+ <span class="text-sm text-gray-600">Total Orders</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @orders_total %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %></div>@@ -39,11 +39,11 @@</div></div><% if defined?(Ahoy) %>- <div class="col-6 col-lg-2 pl-0 pr-2">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" >- <div class="d-flex justify-content-center flex-column">- <span class="font-size-sm text-muted">Visits</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @visits_total %></span>+ <div class="flex justify-center flex-col">+ <span class="text-sm text-gray-600">Visits</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @visits_total %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %></div>@@ -52,11 +52,11 @@</div><% end %>- <div class="col-6 col-lg-2 pl-0">+ <div class="col-span-6 lg:col-span-2"><div class="analytics-card-tab" >- <div class="d-flex justify-content-center flex-column">- <span class="font-size-sm text-muted">Sign-ups</span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3"><%= @audience_total %></span>+ <div class="flex justify-center flex-col">+ <span class="text-sm text-gray-600">Sign-ups</span>+ <span class="text-lg text-gray-900 font-bold mt-1 mr-3"><%= @audience_total %></span><div><%= render 'spree/admin/shared/growth_rate_badge', growth_rate: 0 %></div>@@ -66,11 +66,7 @@</div></div><div class="card-body p-2">- <div class="tab-content d-flex align-items-center justify-content-center" id="pills-tabContent" style="height: 300px">- <div class="spinner-border text-muted align-middle opacity-50" role="status">- <span class="sr-only"><%= Spree.t(:loading) %>...</span>- </div>- </div>+ <%= render 'spree/admin/shared/spinner' %></div><!-- End Body --></div>diff --git a/admin/app/views/spree/admin/shared/_back_to_dashboard.html.erb b/admin/app/views/spree/admin/shared/_back_to_dashboard.html.erbindex ff7086a9ac..fd6ccb3519 100644--- a/admin/app/views/spree/admin/shared/_back_to_dashboard.html.erb+++ b/admin/app/views/spree/admin/shared/_back_to_dashboard.html.erb@@ -1 +1 @@-<%= link_to_with_icon 'arrow-back', Spree.t('admin.back_to_dashboard'), spree.admin_path, class: 'store-dropdown hover-gray justify-content-start gap-2 px-4' %>\ No newline at end of file+<%= link_to_with_icon 'arrow-back', Spree.t('admin.back_to_dashboard'), spree.admin_path, class: 'store-dropdown hover:bg-gray-100 justify-start gap-2 px-4 no-underline' %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_breadcrumbs.html.erb b/admin/app/views/spree/admin/shared/_breadcrumbs.html.erbindex 42289a11c5..954a51ead1 100644--- a/admin/app/views/spree/admin/shared/_breadcrumbs.html.erb+++ b/admin/app/views/spree/admin/shared/_breadcrumbs.html.erb@@ -5,9 +5,9 @@<li><%= active_link_to Spree.t(:settings), spree.edit_admin_store_path %></li>- <%= icon('slash', class: 'text-muted font-size-sm') %>+ <%= icon('slash', class: 'text-gray-600 text-sm') %><% end %>- <%= render_breadcrumbs tag: :li, separator: icon('slash', class: 'text-muted font-size-sm') %>+ <%= render_breadcrumbs tag: :li, separator: icon('slash', class: 'text-gray-600 text-sm') %></ol></nav>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_bulk_modal.html.erb b/admin/app/views/spree/admin/shared/_bulk_modal.html.erbindex 310daa6afb..c8078a8778 100644--- a/admin/app/views/spree/admin/shared/_bulk_modal.html.erb+++ b/admin/app/views/spree/admin/shared/_bulk_modal.html.erb@@ -2,9 +2,7 @@<%= turbo_frame_tag :bulk_dialog do %><%= dialog_header(Spree.t(:loading), 'bulk-dialog') %><div class="dialog-body text-center overflow-visible">- <div class="spinner-border text-muted" role="status">- <span class="sr-only"><%= Spree.t(:loading) %>...</span>- </div>+ <%= render 'spree/admin/shared/spinner' %></div><div class="dialog-footer"><%= dialog_discard_button('bulk-dialog') %>diff --git a/admin/app/views/spree/admin/shared/_calculator_fields.html.erb b/admin/app/views/spree/admin/shared/_calculator_fields.html.erbindex b8dd63522f..43089e046b 100644--- a/admin/app/views/spree/admin/shared/_calculator_fields.html.erb+++ b/admin/app/views/spree/admin/shared/_calculator_fields.html.erb@@ -10,7 +10,7 @@</template><% end %>- <div id="calculator_fields" class="card mb-4">+ <div id="calculator_fields" class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:calculator) %>@@ -19,7 +19,7 @@<div id="preference-settings" class="card-body"><div class="form-group"><%= f.label(:calculator_type, Spree.t(:calculator), for: 'calculator_type') %>- <%= select_tag(:calculator_type, options_for_select(calculators.map { |c| [c.description, c.name] }, @object.calculator_type), {id: 'calculator_type', class: 'custom-select', data: { action: 'calculator-fields#replaceFields' }}) %>+ <%= select_tag(:calculator_type, options_for_select(calculators.map { |c| [c.description, c.name] }, @object.calculator_type), {id: 'calculator_type', class: 'form-select', data: { action: 'calculator-fields#replaceFields' }}) %></div><div class="form-group" data-calculator-fields-target="container"><div class="calculator-settings">diff --git a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erbindex 0c62151b6d..2eb5c194c1 100644--- a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb+++ b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb@@ -1,15 +1,15 @@<% date_from_input_name ||= :date_from %><% date_to_input_name ||= :date_to %>-<% css_classes ||= "btn btn-light d-inline-flex align-items-center dropdown-toggle" %>+<% css_classes ||= "btn btn-light inline-flex items-center dropdown-toggle" %><% date_from_value ||= params[date_from_input_name] %><% date_to_value ||= params[date_to_input_name] %><% dropdown_direction ||= 'left' %>-<%= dropdown direction: dropdown_direction, data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-100', portal: false do %>+<%= dropdown direction: dropdown_direction, data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-full', portal: false do %><%= dropdown_toggle class: css_classes do %>- <%= icon('calendar', class: 'mr-2') %>+ <%= icon('calendar') %><div data-calendar-range-target="label"><% if date_from_value.present? && date_to_value.present? %><%= date_from_value.to_date %> - <%= date_to_value.to_date %>@@ -19,7 +19,7 @@</div><% end %><%= dropdown_menu class: "pt-2 px-2 pb-1", style: 'min-width: 29rem' do %>- <div data-calendar-range-target="picker" class="d-none"></div>+ <div data-calendar-range-target="picker" class="hidden"></div><% end %><%= hidden_field_tag date_from_input_name, date_from_value&.to_date, data: { 'calendar-range-target': 'dateFrom' } %>diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erbindex 57ab1c1c54..1196016faa 100644--- a/admin/app/views/spree/admin/shared/_content_header.html.erb+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb@@ -9,11 +9,11 @@<% end if show_record_subtitle && !content_for(:page_subtitle) %><% if content_for?(:page_title) %>- <header id="page-header" class="container" data-controller="sticky">- <h3 class="page-header-title mb-0 d-flex align-items-center gap-3">+ <header id="page-header" class="container mx-auto px-4 max-w-screen-xl" data-controller="sticky">+ <h3 class="page-header-title mb-0 flex items-center gap-4"><%= yield :page_title %></h3>- <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-2">+ <div id="page_actions" class="ml-auto page-actions flex items-center gap-2"><%= yield :page_actions if content_for?(:page_actions) %><% if action_name == 'edit' && @object %>@@ -22,8 +22,8 @@<% end %><% if show_record_subtitle || content_for(:page_actions_dropdown) %>- <%= dropdown id: 'page_actions_dropdown', class: 'h-100', portal: false do %>- <%= dropdown_toggle id: 'more-actions-link', class: 'btn-light h-100 p-2' do %>+ <%= dropdown id: 'page_actions_dropdown', portal: false do %>+ <%= dropdown_toggle id: 'more-actions-link', class: 'btn-light h-[35px] px-2' do %><%= icon 'dots-vertical', class: 'mr-0' %><% end %><%= dropdown_menu id: 'page_actions_dropdown_menu' do %>@@ -61,7 +61,7 @@<% if defined?(object_url) && %w[show edit].include?(action_name) && record.respond_to?(:can_be_deleted?) && record.can_be_deleted? && can?(:destroy, record) %><div class="dropdown-divider"></div>- <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), object_url, class: 'dropdown-item btn-danger', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %>+ <%= link_to_with_icon 'trash', Spree.t('actions.destroy'), object_url, class: 'dropdown-item text-red-600 hover:bg-red-100', data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure) } %><% end %><% end %><% end %>diff --git a/admin/app/views/spree/admin/shared/_edit_resource.html.erb b/admin/app/views/spree/admin/shared/_edit_resource.html.erbindex 94e9f90cd8..d67da53c52 100644--- a/admin/app/views/spree/admin/shared/_edit_resource.html.erb+++ b/admin/app/views/spree/admin/shared/_edit_resource.html.erb@@ -1,4 +1,4 @@-<% col_class ||= 'col-lg-6 offset-lg-3' %>+<% col_class ||= 'col-span-12 lg:col-span-6 lg:col-start-4' %><% page_header_back_button_url ||= collection_url %><%= content_for :page_title do %>@@ -7,7 +7,7 @@<% end %><%= form_with model: [:admin, @object], url: object_url, scope: @resource.object_name, id: "edit_#{controller_name.singularize}_#{@object.id}", data: local_assigns[:data] || {} do |f| %>- <div class="row">+ <div class="grid grid-cols-12 gap-6"><div class="<%= col_class %>"><%= render 'spree/admin/shared/error_messages', target: @object %><%= render 'form', f: f %>diff --git a/admin/app/views/spree/admin/shared/_error_messages.html.erb b/admin/app/views/spree/admin/shared/_error_messages.html.erbindex fc32e29d12..9d613af335 100644--- a/admin/app/views/spree/admin/shared/_error_messages.html.erb+++ b/admin/app/views/spree/admin/shared/_error_messages.html.erb@@ -5,7 +5,7 @@<p><strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, count: target.errors.size) %>:</strong><br></p>- <ul class="list-unstyled mb-0">+ <ul class="list-none p-0 mb-0"><% if only_for.any? %><% only_for.each do |attribute_name| %><% target.errors.full_messages_for(attribute_name).each do |msg| %>diff --git a/admin/app/views/spree/admin/shared/_filter_badge_template.erb b/admin/app/views/spree/admin/shared/_filter_badge_template.erbindex 1055c46541..3b2b274123 100644--- a/admin/app/views/spree/admin/shared/_filter_badge_template.erb+++ b/admin/app/views/spree/admin/shared/_filter_badge_template.erb@@ -1,3 +1,3 @@<template data-filters-target="badgeTemplate">- <span class="badge py-0 pl-2 pr-0 bg-light text-dark d-flex-inline align-items-center mb-0">LABEL<a href="DELETE_URL" class="btn-close ml-2" title="<%= Spree.t('actions.remove') %>"></a></span>+ <span class="badge py-0 pl-2 pr-0 bg-gray-25 text-gray-900 flex-inline items-center mb-0">LABEL<a href="DELETE_URL" class="btn-close ml-2" title="<%= Spree.t('actions.remove') %>"></a></span></template>diff --git a/admin/app/views/spree/admin/shared/_filters_button.html.erb b/admin/app/views/spree/admin/shared/_filters_button.html.erbindex 47a97324ee..53c651f42d 100644--- a/admin/app/views/spree/admin/shared/_filters_button.html.erb+++ b/admin/app/views/spree/admin/shared/_filters_button.html.erb@@ -1,5 +1,5 @@<button- class="btn btn-light d-flex align-items-center"+ class="btn btn-light flex items-center"type="button"data-action="dropdown#toggle click@window->dropdown#hide">diff --git a/admin/app/views/spree/admin/shared/_filters_search_bar.html.erb b/admin/app/views/spree/admin/shared/_filters_search_bar.html.erbindex 625c0c28f5..8cd8886996 100644--- a/admin/app/views/spree/admin/shared/_filters_search_bar.html.erb+++ b/admin/app/views/spree/admin/shared/_filters_search_bar.html.erb@@ -2,14 +2,7 @@<% badge_name ||= label %><% placeholder ||= [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>-<div class="form-control d-flex align-items-center py-0 focus-shadow focus-border flex-grow-1 mb-3 mb-lg-0" id="filters-search-bar">- <%= icon "search", class: "mr-3 text-muted" %>- <%= search_field_tag "q[#{param}]",- params.dig(:q, param),- class: "form-control-plaintext px-0",- placeholder: placeholder,- data: {- filters_target: :input,- badge_name: badge_name,- } %>+<div class="form-input flex items-center py-0 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 grow max-lg:max-w-[300px] mr-auto h-[2.125rem] max-lg:mb-4 transition-all duration-100 ease-in-out" id="filters-search-bar">+ <%= icon "search", class: "mr-4 text-gray-600" %>+ <%= search_field_tag "q[#{param}]", params.dig(:q, param), class: "outline-none border-0 h-full focus:border-0 focus:ring-0 p-0 text-base w-full", placeholder: placeholder, data: { filters_target: :input, badge_name: badge_name } %></div>diff --git a/admin/app/views/spree/admin/shared/_footer.html.erb b/admin/app/views/spree/admin/shared/_footer.html.erbindex 6210b52691..2703e15746 100644--- a/admin/app/views/spree/admin/shared/_footer.html.erb+++ b/admin/app/views/spree/admin/shared/_footer.html.erb@@ -1,2 +1,2 @@-<footer class="text-muted py-3 text-center">+<footer class="text-gray-600 py-4 text-center"></footer>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/_growth_rate_badge.html.erb b/admin/app/views/spree/admin/shared/_growth_rate_badge.html.erbindex 2ae49a8dcd..f7c328f613 100644--- a/admin/app/views/spree/admin/shared/_growth_rate_badge.html.erb+++ b/admin/app/views/spree/admin/shared/_growth_rate_badge.html.erb@@ -1,16 +1,16 @@<% growth_rate ||= 0 %>-<div class="d-flex">+<div class="flex"><% if growth_rate == 0 %><svg viewBox="0 0 11 16" height="16" width="11" role="img" class="_SVG_1ou8g_150" tabindex="-1"><title>No change</title><path d="M0.519531 1.79395H12.0039V0.249023H0.519531V1.79395Z" fill="var(--p-icon-subdued, #8c9196)" transform="translate(0, 7)"></path></svg><% elsif growth_rate > 0 %>- <span class="text-success">- <%= icon 'arrow-up', class: 'mr-1 font-size-base' %>+ <span class="text-green-700">+ <%= icon 'arrow-up', class: 'mr-1 text-base' %><%= number_to_percentage(growth_rate, strip_insignificant_zeros: true) %></span><% else %><span class="text-danger">- <%= icon 'arrow-down', class: 'mr-1 font-size-base' %>+ <%= icon 'arrow-down', class: 'mr-1 text-base' %><%= number_to_percentage(growth_rate.abs, strip_insignificant_zeros: true) %></span><% end %>diff --git a/admin/app/views/spree/admin/shared/_head.html.erb b/admin/app/views/spree/admin/shared/_head.html.erbindex 4f3fe3c5f2..1901bddcfc 100644--- a/admin/app/views/spree/admin/shared/_head.html.erb+++ b/admin/app/views/spree/admin/shared/_head.html.erb@@ -1,6 +1,6 @@<meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge">-<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">+<meta name="viewport" content="width=device-width, initial-scale=1.0" /><%= csrf_meta_tags %>@@ -22,20 +22,12 @@<link href="https://fonts.googleapis.com/css2?family=Inter:[email protected]&display=swap" rel="stylesheet"><%= stylesheet_link_tag 'spree/admin/application', media: :all, data: { turbo_track: "reload" } %>-<%= stylesheet_link_tag 'spree/admin/actiontext', media: :all, data: { turbo_track: "reload" } %>-<%= action_cable_meta_tag %>--<%= favicon_link_tag 'favicon_256x256.png' %>--<link- rel="stylesheet"- href="https://cdn.jsdelivr.net/npm/@tabler/[email protected]/dist/tabler-icons.min.css"-/>+<%= tinymce_assets %>+<%= action_cable_meta_tag %><%= tag.meta name: "direct-upload-url", content: main_app.rails_direct_uploads_path %>-<%= tinymce_assets %>-<link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/dist/trix.css">+<%= favicon_link_tag 'favicon_256x256.png' %><% if Rails.application.importmap.packages["application"].present? && Spree::Admin::RuntimeConfig.include_application_importmap %><%= javascript_importmap_tags "application" %>@@ -49,7 +41,7 @@<% if Rails.env.test? %><style>- .text-uppercase {+ .uppercase {text-transform: none !important;}</style>diff --git a/admin/app/views/spree/admin/shared/_header.html.erb b/admin/app/views/spree/admin/shared/_header.html.erbindex d3613b7d10..80959fdb1c 100644--- a/admin/app/views/spree/admin/shared/_header.html.erb+++ b/admin/app/views/spree/admin/shared/_header.html.erb@@ -1,33 +1,21 @@<div id="scroll-header"></div>-<header id="header" class="sticky-top py-0">- <nav class="navbar navbar-expand-lg p-0 d-flex align-items-center pr-3">- <div class="d-lg-none pr-3 border-right">- <button type="button" class="btn btn-light px-2 ml-3 text-decoration-none" data-action="click->sidebar#openMobile">+<header id="header" class="sticky top-0 z-[1020] py-0">+ <nav class="py-0 flex items-center px-3 h-full">+ <div class="lg:hidden">+ <button type="button" class="btn btn-light px-2 no-underline" data-action="click->sidebar#openMobile"><%= icon('menu-2', class: 'mr-0') %></button></div>+ <button type="button" class="sidebar-toggle-btn hidden lg:flex mr-3" data-action="click->sidebar#toggle" aria-label="<%= Spree.t('admin.expand_sidebar') %>">+ <%= icon('layout-sidebar-left-collapse') %>+ </button>+<% if settings_area? %><%= render 'spree/admin/shared/back_to_dashboard' %>- <% else %>- <% if defined?(current_vendor) && current_vendor.present? %>- <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>- <% else %>- <%= render 'spree/admin/shared/sidebar/store_dropdown' %>- <% end %><% end %>- <button type="button" class="sidebar-toggle-btn ml-3 mr-3 d-none d-lg-block" data-action="click->sidebar#toggle" aria-label="<%= Spree.t('admin.expand_sidebar') %>">- <%= icon('layout-sidebar-left-collapse') %>- </button>-- <div class="d-none d-lg-block">- <%= render 'spree/admin/shared/breadcrumbs' %>- </div>+ <%= render 'spree/admin/shared/breadcrumbs' %></nav>-</header>--<div class="d-lg-none py-3 border-bottom">- <%= render 'spree/admin/shared/breadcrumbs' %>-</div>\ No newline at end of file+</header>\ No newline at end of filediff --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 a95f8c33d3..0fdd68ee9d 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@@ -7,9 +7,9 @@<% if collection.any? && collection.respond_to?(:current_page) %><div class="pagination-container">- <div class="index-pagination-row d-flex align-items-center justify-content-between px-2">+ <div class="index-pagination-row flex items-center justify-between p-2"><%= per_page_dropdown %>- <div class="d-none d-lg-block text-center text-muted">+ <div class="hidden lg:block text-center text-gray-600 text-sm"><%= page_entries_info(collection, entry_name: entry_name) %></div><div class="text-right">diff --git a/admin/app/views/spree/admin/shared/_map.html.erb b/admin/app/views/spree/admin/shared/_map.html.erbindex ecb20fd1e7..8addd7a98b 100644--- a/admin/app/views/spree/admin/shared/_map.html.erb+++ b/admin/app/views/spree/admin/shared/_map.html.erb@@ -1,5 +1,5 @@<% if Mapkick.options[:access_token] && map_object.latitude.present? && map_object.longitude.present? %>- <div class="rounded overflow-hidden">+ <div class="rounded-md overflow-hidden"><%= js_map [{latitude: map_object.latitude,longitude: map_object.longitude,diff --git a/admin/app/views/spree/admin/shared/_media_asset.html.erb b/admin/app/views/spree/admin/shared/_media_asset.html.erbindex 2938f5bbca..bd0817083c 100644--- a/admin/app/views/spree/admin/shared/_media_asset.html.erb+++ b/admin/app/views/spree/admin/shared/_media_asset.html.erb@@ -1,13 +1,13 @@<div id="<%= spree_dom_id(asset) %>" class="media-form__image" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">- <div class="custom-control custom-checkbox d-none">+ <div class="custom-control form-checkbox hidden"><%= check_box_tag "ids[]", asset.id, false, class: "custom-control-input", id: "#{asset.id}-checkbox", data: { media_form_target: "checkbox", action: 'media-form#showDeleteButton' } %><label class="custom-control-label" for="<%= asset.id %>-checkbox"><span></span></label></div>- <div class="move-handle text-center d-none ml-auto">+ <div class="move-handle text-center hidden ml-auto"><button class="btn btn-light btn-sm px-1"><%= icon('grip-vertical', class: 'mr-0') %></button></div><%= link_to spree.edit_admin_asset_path(asset), data: { turbo_frame: 'dialog', action: 'dialog#open' } do %>- <%= spree_image_tag(asset.attachment, width: 200, height: 200, alt: asset.alt, class: 'w-100 d-block h-100 position-absolute') %>+ <%= spree_image_tag(asset.attachment, width: 200, height: 200, alt: asset.alt, class: 'w-full block h-full absolute') %><% end %></div>diff --git a/admin/app/views/spree/admin/shared/_media_form.html.erb b/admin/app/views/spree/admin/shared/_media_form.html.erbindex a894bb45a2..87b9c47b80 100644--- a/admin/app/views/spree/admin/shared/_media_form.html.erb+++ b/admin/app/views/spree/admin/shared/_media_form.html.erb@@ -1,7 +1,7 @@-<%= turbo_frame_tag 'media-form', class: 'card mb-4', data: { controller: 'media-form', media_form_delete_url_value: spree.bulk_destroy_admin_assets_path(viewable_id: viewable&.id) } do %>+<%= turbo_frame_tag 'media-form', class: 'card mb-6', data: { controller: 'media-form', media_form_delete_url_value: spree.bulk_destroy_admin_assets_path(viewable_id: viewable&.id) } do %><div class="card-header"><h5 class="card-title mr-2"><%= Spree.t(:media) %></h5>- <button type="button" data-media-form-target="deleteButton" class="btn btn-sm btn-danger btn-outline d-none ml-auto" data-action="media-form#deleteSelected">+ <button type="button" data-media-form-target="deleteButton" class="btn btn-sm btn-danger btn-outline hidden ml-auto" data-action="media-form#deleteSelected"><%= icon('trash') %><%= Spree.t(:delete_selected) %></button>@@ -23,8 +23,8 @@action: 'asset-uploader#open',media_form_target: 'addButton'} do %>- <%= icon('upload', class: 'mt-5', style: 'font-size: 2rem;') %>- <p class="form-text mt-2 mb-5">+ <%= icon('upload', class: 'mt-12 text-4xl') %>+ <p class="text-sm mt-2 mb-12"><%= Spree.t('admin.upload_new_asset') %></p><% end %>diff --git a/admin/app/views/spree/admin/shared/_modal.html.erb b/admin/app/views/spree/admin/shared/_modal.html.erbindex 0bc5836c6b..b4757387ca 100644--- a/admin/app/views/spree/admin/shared/_modal.html.erb+++ b/admin/app/views/spree/admin/shared/_modal.html.erb@@ -3,10 +3,8 @@<%= turbo_frame_tag :dialog_modal do %><div class="modal-content"><%= modal_header(Spree.t(:loading)) %>- <div class="modal-body text-center">- <div class="spinner-border text-light mx-auto my-5" role="status">- <span class="sr-only"><%= Spree.t(:loading) %>...</span>- </div>+ <div class="modal-body text-center min-h-[300px]">+ <%= render 'spree/admin/shared/spinner' %></div></div><% end %>@@ -18,10 +16,8 @@<%= turbo_frame_tag :dialog_modal_lg do %><div class="modal-content"><%= modal_header(Spree.t(:loading)) %>- <div class="modal-body text-center" style="min-height: 200px">- <div class="spinner-border text-light" role="status">- <span class="sr-only"><%= Spree.t(:loading) %>...</span>- </div>+ <div class="modal-body text-center min-h-[300px]">+ <%= render 'spree/admin/shared/spinner' %></div></div><% end %>diff --git a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erbindex 977d6dceef..f948fa3447 100644--- a/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb+++ b/admin/app/views/spree/admin/shared/_multi_product_picker.html.erb@@ -1,16 +1,16 @@<%= turbo_frame_tag :dialog do %><div data-controller="search-picker"><%= dialog_header(Spree.t(:add_products)) %>- <div class="dialog-body border-bottom">+ <div class="dialog-body border-b"><%= form_with url: spree.search_admin_products_path, method: :post, data: { controller: 'auto-submit'} do |form| %><%= form.hidden_field :omit_ids, value: parent.product_ids.join(',') %>- <%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>+ <%= form.search_field :q, value: params[:q], class: 'form-input', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %><% end %></div><%= form_with url: url do |form| %><div class="dialog-body"><div id="products_search_results" class="search-results">- <p class="text-muted text-center py-5">+ <p class="text-gray-600 text-center py-12"><%= Spree.t(:start_typing_to_search_for_products) %></p></div>diff --git a/admin/app/views/spree/admin/shared/_navigation.html.erb b/admin/app/views/spree/admin/shared/_navigation.html.erbindex d73f1c1e01..735785b0f7 100644--- a/admin/app/views/spree/admin/shared/_navigation.html.erb+++ b/admin/app/views/spree/admin/shared/_navigation.html.erb@@ -1,4 +1,4 @@-<ul class="nav flex-column">+<ul class="nav flex-col"><% items.each do |item| %><%= render 'spree/admin/shared/navigation_item', item: item, context: context %><% end %>diff --git a/admin/app/views/spree/admin/shared/_navigation_item.html.erb b/admin/app/views/spree/admin/shared/_navigation_item.html.erbindex 5004fd69e6..bc2d3fb4bf 100644--- a/admin/app/views/spree/admin/shared/_navigation_item.html.erb+++ b/admin/app/views/spree/admin/shared/_navigation_item.html.erb@@ -33,8 +33,8 @@<% if item.section? %><%# Section header %>- <li class="nav-item nav-section-header mt-3 border-top pt-3 pl-2">- <span class="text-muted text-uppercase font-weight-light font-size-sm"><%= item.section_label %></span>+ <li class="nav-item nav-section-header mt-4 border-t pt-4 pl-2">+ <span class="text-gray-600 uppercase font-light text-sm"><%= item.section_label %></span></li><% else %><% if has_children %>@@ -42,14 +42,14 @@<%= nav_item(complete_label, item_url, icon: item.icon, active: is_active, data: data_attrs, **html_options) %><%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless is_active %>d-none<% end %>" id="nav-submenu-<%= item.key %>">+ <ul class="nav-submenu <% unless is_active %>hidden<% end %>" id="nav-submenu-<%= item.key %>"><% item.children.select { |child| child.visible?(self) }.each do |child_item| %><%= render 'spree/admin/shared/navigation_item', item: child_item, context: context %><% end %></ul><%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown d-none dropdown-container" id="nav-submenu-dropdown-<%= item.key %>">+ <ul class="nav-submenu-dropdown hidden dropdown-container" id="nav-submenu-dropdown-<%= item.key %>"><%# Add parent item as first item in dropdown %><%= nav_item(item_label, item_url, icon: nil) %>diff --git a/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb b/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erbindex c738e1b62e..7b3f8c9195 100644--- a/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/_new_item_dropdown.html.erb@@ -1,5 +1,5 @@<%= dropdown id: 'new-item-dropdown' do %>- <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>+ <%= dropdown_toggle class: 'btn-light btn-sm px-1 rounded-lg' do %><%= icon 'plus', class: 'mr-0' %><% end %><%= dropdown_menu do %>diff --git a/admin/app/views/spree/admin/shared/_new_resource.html.erb b/admin/app/views/spree/admin/shared/_new_resource.html.erbindex 7e26c66163..ef51e9fc12 100644--- a/admin/app/views/spree/admin/shared/_new_resource.html.erb+++ b/admin/app/views/spree/admin/shared/_new_resource.html.erb@@ -1,4 +1,4 @@-<% col_class ||= 'col-lg-6 offset-lg-3' %>+<% col_class ||= 'col-span-12 lg:col-span-6 lg:col-start-4' %><% page_header_back_button_url ||= collection_url %><% form_url ||= collection_url %>@@ -8,7 +8,7 @@<% end %><%= form_with model: [:admin, @object], url: form_url, id: "new_#{controller_name.singularize}", data: local_assigns[:data] || {} do |f| %>- <div class="row">+ <div class="grid grid-cols-12 gap-4"><div class="<%= col_class %>"><%= render 'spree/admin/shared/error_messages', target: @object %><%= render 'form', f: f %>diff --git a/admin/app/views/spree/admin/shared/_no_image.html.erb b/admin/app/views/spree/admin/shared/_no_image.html.erbindex 6eec28d4c3..88ef2161bb 100644--- a/admin/app/views/spree/admin/shared/_no_image.html.erb+++ b/admin/app/views/spree/admin/shared/_no_image.html.erb@@ -1,6 +1,6 @@<% width ||= 50 %><% height ||= 50 %>-<div class="rounded bg-light text-muted d-flex align-items-center justify-content-center border" style="width: <%= width %>px; height: <%= height %>px">- <%= icon('camera-off', class: 'text-muted opacity-50') %>+<div class="rounded-md bg-gray-25 text-gray-600 flex items-center justify-center border" style="width: <%= width %>px; height: <%= height %>px">+ <%= icon('camera-off', class: 'text-gray-600 opacity-50') %></div>\ No newline at end of filediff --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 16628c1c4a..cfc2f74ca4 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@@ -1,9 +1,9 @@<% resource_name ||= model_class.name.demodulize.underscore.humanize %>-<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">- <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>+<div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col gap-4">+ <%= icon 'map-search', class: 'opacity-50 text-4xl' %><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-primary 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', 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 fba65eb367..28c1eb36fb 100644--- a/admin/app/views/spree/admin/shared/_page_alerts.html.erb+++ b/admin/app/views/spree/admin/shared/_page_alerts.html.erb@@ -1,5 +1,5 @@<% if content_for(:page_alerts) %>- <div class="container mb-2" id="page-alerts">+ <div class="container mx-auto px-4 max-w-screen-xl 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 f9967f6115..480633ffaf 100644--- a/admin/app/views/spree/admin/shared/_page_tabs.html.erb+++ b/admin/app/views/spree/admin/shared/_page_tabs.html.erb@@ -1,6 +1,6 @@<% if content_for?(:page_tabs) %><div id="page-tabs">- <div class="container mb-2">+ <div class="container mx-auto px-4 max-w-screen-xl mb-2"><ul class="nav"><%= yield :page_tabs %></ul>diff --git a/admin/app/views/spree/admin/shared/_product_image.html.erb b/admin/app/views/spree/admin/shared/_product_image.html.erbindex f7fadee154..91d4e150ed 100644--- a/admin/app/views/spree/admin/shared/_product_image.html.erb+++ b/admin/app/views/spree/admin/shared/_product_image.html.erb@@ -5,8 +5,8 @@<% if image.present? && image.attached? && image.variable? %><% alt ||= image.alt || object.name %>- <div class="admin-product-image-container">- <%= spree_image_tag(image, variant: variant, alt: alt, width: width, height: height) %>+ <div class="overflow-hidden rounded-md border border-gray-300" style="width: <%= width %>px; height: <%= height %>px;">+ <%= spree_image_tag(image, variant: variant, width: width, height: height, alt: alt, class: 'object-cover transition-transform duration-300 ease-out hover:scale-120') %></div><% else %><%= render 'spree/admin/shared/no_image', width: width, height: height %>diff --git a/admin/app/views/spree/admin/shared/_refunds.html.erb b/admin/app/views/spree/admin/shared/_refunds.html.erbindex d755531bdf..2afd7a7cae 100644--- a/admin/app/views/spree/admin/shared/_refunds.html.erb+++ b/admin/app/views/spree/admin/shared/_refunds.html.erb@@ -1,7 +1,7 @@<div class="table-responsive card-lg"><table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'><thead>- <tr data-hook="refunds_header" class="border-bottom">+ <tr data-hook="refunds_header" class="border-b"><th scope="col"><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th><th scope="col"><%= Spree.t(:amount) %></th><th scope="col"><%= Spree.t(:reason) %></th>diff --git a/admin/app/views/spree/admin/shared/_seo.html.erb b/admin/app/views/spree/admin/shared/_seo.html.erbindex c76b8a6558..f391be13b1 100644--- a/admin/app/views/spree/admin/shared/_seo.html.erb+++ b/admin/app/views/spree/admin/shared/_seo.html.erb@@ -1,32 +1,32 @@-<div class="card mb-4 seo-form">- <div class="card-header d-flex justify-content-between">+<div class="card mb-6 seo-form">+ <div class="card-header flex justify-between"><h5 class="card-title"><%= Spree.t(:search_engine_listing) %></h5><button class="btn btn-light btn-sm ml-auto" data-action="click->seo-form#toggleInputs" type="button">Edit</button></div>- <div class="card-body d-flex flex-column">- <div class="seo__preview <% if title.blank? && description.blank? %>d-none<% else %>d-flex flex-column<% end %>" data-seo-form-target="preview">- <div class="seo__preview__title h4 font-weight-normal mb-0 text-break" data-seo-form-target="titlePreview">+ <div class="card-body flex flex-col">+ <div class="seo__preview <% if title.blank? && description.blank? %>hidden<% else %>flex flex-col<% end %>" data-seo-form-target="preview">+ <div class="seo__preview__title text-xl font-normal mb-0 break-words" data-seo-form-target="titlePreview"><%= meta_title.presence || title %></div><div class="seo__preview__link"><%= current_store.formatted_url_or_custom_domain %>/<%= slug_path %>/<span data-seo-form-target="slugPreview"><%= slug %></span></div>- <div class="seo__preview__description text-break" data-seo-form-target="descriptionPreview"></div>+ <div class="seo__preview__description break-words" data-seo-form-target="descriptionPreview"></div></div>- <div class="seo__add-info <% if title.present? || description.present? %>d-none<% end %>" data-seo-form-target="placeholder">+ <div class="seo__add-info <% if title.present? || description.present? %>hidden<% end %>" data-seo-form-target="placeholder"><%= placeholder %></div>- <div class="seo__inputs d-none" data-seo-form-target="inputsContainer">+ <div class="seo__inputs hidden" data-seo-form-target="inputsContainer"><%= f.spree_text_field :meta_title, data: { seo_form_target: 'titleInput', action: 'input->seo-form#updatePreviews' } %><%= f.spree_text_area :meta_description, rows: 4, data: { seo_form_target: 'descriptionInput', action: 'input->seo-form#updatePreviews' } %><div class="form-group"><% if defined?(slug_attribute_name) %><%= label_tag slug_attribute_name, Spree.t(:slug) %>- <%= text_field_tag slug_attribute_name, slug, class: 'form-control', data: { seo_form_target: 'slugInput', action: 'input->seo-form#updatePreviews', slug_form_target: 'url' } %>+ <%= text_field_tag slug_attribute_name, slug, class: 'form-input', data: { seo_form_target: 'slugInput', action: 'input->seo-form#updatePreviews', slug_form_target: 'url' } %><% else %><%= f.label :slug, Spree.t(:slug) %>- <%= f.text_field :slug, class: 'form-control', data: { seo_form_target: 'slugInput', action: 'input->seo-form#updatePreviews', slug_form_target: 'url' } %>+ <%= f.text_field :slug, class: 'form-input', data: { seo_form_target: 'slugInput', action: 'input->seo-form#updatePreviews', slug_form_target: 'url' } %><% end %></div></div>diff --git a/admin/app/views/spree/admin/shared/_sidebar.html.erb b/admin/app/views/spree/admin/shared/_sidebar.html.erbindex 37c3e30aac..a344474c55 100644--- a/admin/app/views/spree/admin/shared/_sidebar.html.erb+++ b/admin/app/views/spree/admin/shared/_sidebar.html.erb@@ -1,5 +1,15 @@<%# Desktop Sidebar %>-<aside id="main-sidebar" class="overflow-y-auto" data-sidebar-target="desktop">+<aside id="main-sidebar" class="overflow-y-auto scrollbar-thin" data-sidebar-target="desktop">+ <% if settings_area? %>+ <%= render 'spree/admin/shared/back_to_dashboard' %>+ <% else %>+ <% if defined?(current_vendor) && current_vendor.present? %>+ <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>+ <% else %>+ <%= render 'spree/admin/shared/sidebar/store_dropdown' %>+ <% end %>+ <% end %>+<div class="sidebar-content"><% if defined?(current_vendor) && current_vendor.present? %><%= render 'spree/admin/shared/sidebar/vendor_nav' %>@@ -12,11 +22,18 @@</aside><%# Mobile Sidebar Overlay %>-<div class="sidebar-mobile d-lg-none" data-sidebar-target="mobile">+<div class="sidebar-mobile lg:hidden" data-sidebar-target="mobile"><div class="sidebar-backdrop" data-action="click->sidebar#closeMobile"></div><div class="sidebar-panel"><div class="sidebar-mobile-header">- <button type="button" class="btn btn-sm" data-action="click->sidebar#closeMobile" aria-label="<%= Spree.t('admin.close_sidebar') %>">+ <% unless settings_area? %>+ <% if defined?(current_vendor) && current_vendor.present? %>+ <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>+ <% else %>+ <%= render 'spree/admin/shared/sidebar/store_dropdown' %>+ <% end %>+ <% end %>+ <button type="button" class="btn btn-sm ml-auto" data-action="click->sidebar#closeMobile" aria-label="<%= Spree.t('admin.close_sidebar') %>"><%= icon('x') %></button></div>diff --git a/admin/app/views/spree/admin/shared/_spinner.html.erb b/admin/app/views/spree/admin/shared/_spinner.html.erbindex e6502cc4de..f5588ff619 100644--- a/admin/app/views/spree/admin/shared/_spinner.html.erb+++ b/admin/app/views/spree/admin/shared/_spinner.html.erb@@ -1,7 +1,8 @@<% spinner_id = defined?(id) ? id : 'turbo-spinner' %>-<div class="d-flex w-100 align-items-center justify-content-center" id="<%= spinner_id %>">- <div class="spinner-border text-muted align-middle" role="status">+<div class="flex flex-col w-full h-full min-h-[300px] items-center justify-center" id="<%= spinner_id %>">+ <div class="inline-block w-8 h-8 border-4 border-current border-r-transparent rounded-full animate-spin text-gray-300 align-middle opacity-50 mb-3" role="status"><span class="sr-only"><%= Spree.t(:loading) %>...</span></div>+ <span class="text-gray-300"><%= Spree.t(:loading) %>...</span></div>diff --git a/admin/app/views/spree/admin/shared/_user.html.erb b/admin/app/views/spree/admin/shared/_user.html.erbindex c629f9cfa3..3ae3a8f4f0 100644--- a/admin/app/views/spree/admin/shared/_user.html.erb+++ b/admin/app/views/spree/admin/shared/_user.html.erb@@ -1,16 +1,16 @@-<%= link_to spree.admin_user_path(user), class: 'rounded p-2 d-flex justify-content-start align-items-center text-decoration-none hover-light', data: {turbo_frame: :_top, row_link_target: :link} do %>+<%= link_to spree.admin_user_path(user), class: 'rounded-md p-2 flex justify-start items-center no-underline hover:bg-gray-25 gap-4', data: {turbo_frame: :_top, row_link_target: :link} do %><% if user.name.present? %>- <%= render_avatar(user, width: 48, height: 48, class: 'mr-3 avatar') %>+ <%= render_avatar(user, width: 48, height: 48) %><% else %>- <div style="width: 48px; height: 48px" class="mr-3 avatar bg-light"></div>+ <div class="flex items-center justify-center bg-gray-200 rounded-full text-gray-600 w-12 h-12"></div><% end %><div class="text-left"><% if customer_full_name(user) %>- <span class="font-weight-bold text-dark"><%= customer_full_name(user) %></span>+ <span class="font-bold text-gray-900"><%= customer_full_name(user) %></span><br /><% end %><% unless defined?(current_vendor) && current_vendor %>- <span class="text-muted" data-controller="tooltip">+ <span class="text-gray-600" data-controller="tooltip"><%= user.email %><%= tooltip(user.email) %></span>diff --git a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb b/admin/app/views/spree/admin/shared/_user_dropdown.html.erbindex 5aaa96f10f..9703b5b732 100644--- a/admin/app/views/spree/admin/shared/_user_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/_user_dropdown.html.erb@@ -3,7 +3,7 @@<%= dropdown do %><%= dropdown_toggle class: 'user-dropdown-button dropdown-toggle' do %><%= render_avatar(try_spree_current_user, width: 32, height: 32) %>- <span class="user-name d-none d-lg-block">+ <span class="user-name hidden lg:block"><% if try_spree_current_user.name.present? %><%= try_spree_current_user.name&.full %><% else %>@@ -12,12 +12,12 @@</span><% end %><%= dropdown_menu class: 'ml-2', style: 'min-width: 250px;' do %>- <div class="d-flex align-items-center p-2 bg-light rounded-lg">+ <div class="flex items-center p-2 bg-gray-25 rounded-xl"><%= render_avatar(try_spree_current_user, width: 34, height: 34) %>- <span class="d-flex flex-column ml-2">+ <span class="flex flex-col ml-2"><% if try_spree_current_user.name.present? %><%= try_spree_current_user.name&.full %>- <small class="text-muted"><%= try_spree_current_user.email %></small>+ <small class="text-gray-600"><%= try_spree_current_user.email %></small><% else %><%= try_spree_current_user.email %><% end %>@@ -44,7 +44,7 @@<div class="dropdown-divider"></div>- <%= button_to spree_admin_logout_path, class: 'dropdown-item mb-0 btn-danger', method: :delete do %>+ <%= button_to spree_admin_logout_path, class: 'dropdown-item text-danger hover:bg-red-100 mb-0', method: :delete do %><%= icon('logout', class: "icon icon-logout") %><%= Spree.t(:logout) %><% end if defined?(spree_admin_logout_path) %>diff --git a/admin/app/views/spree/admin/shared/devise/_links.html.erb b/admin/app/views/spree/admin/shared/devise/_links.html.erbindex be25724814..3358f2dcc7 100644--- a/admin/app/views/spree/admin/shared/devise/_links.html.erb+++ b/admin/app/views/spree/admin/shared/devise/_links.html.erb@@ -1,13 +1,13 @@-<div class="mb-2 d-flex justify-content-between">+<div class="mb-2 flex justify-between"><div><% if defined?(devise_mapping) && devise_mapping.rememberable? && controller_name == 'user_sessions' %>- <div class="custom-control custom-checkbox">+ <div class="custom-control form-checkbox"><%= f.check_box :remember_me, class: "custom-control-input" %><%= f.label :remember_me, Spree.t(:remember_me), class: "custom-control-label" %></div><% end %></div>- <div class="d-flex align-items-center gap-2">+ <div class="flex items-center gap-2"><% if controller_name != 'user_sessions' %><p><%= link_to Spree.t(:log_in), new_session_path(resource_name) %></p><% end %>diff --git a/admin/app/views/spree/admin/shared/named_types/_form.html.erb b/admin/app/views/spree/admin/shared/named_types/_form.html.erbindex 6f79d9d723..c85234be78 100644--- a/admin/app/views/spree/admin/shared/named_types/_form.html.erb+++ b/admin/app/views/spree/admin/shared/named_types/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %><%= f.spree_check_box :active %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erbindex 531f0456a4..4f7360c5c2 100644--- a/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_customers_nav.html.erb@@ -3,12 +3,12 @@<%= nav_item(Spree.t(:customers), spree.admin_users_path, icon: 'users', active: customers_active) %><%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless customers_active %>d-none<% end %>">+ <ul class="nav-submenu <% unless customers_active %>hidden<% end %>"><%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %></ul><%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown d-none dropdown-container">+ <ul class="nav-submenu-dropdown hidden dropdown-container"><%= nav_item(Spree.t(:customers), spree.admin_users_path) %><%= nav_item(Spree.t(:newsletter_subscribers), spree.admin_newsletter_subscribers_path) %></ul>diff --git a/admin/app/views/spree/admin/shared/sidebar/_enterprise_edition_notice.html.erb b/admin/app/views/spree/admin/shared/sidebar/_enterprise_edition_notice.html.erbindex 607fbdb35f..6aab8a6ab8 100644--- a/admin/app/views/spree/admin/shared/sidebar/_enterprise_edition_notice.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_enterprise_edition_notice.html.erb@@ -1,9 +1,9 @@<% if can?(:manage, current_store) && !enterprise_edition? %><% unless session[:spree_enterprise_edition_notice_dismissed] %>- <section class="d-none d-lg-block">+ <section class="hidden lg:block"><div id="enterprise-edition-notice"><%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, data: { turbo_method: :patch }, class: 'btn-close' %>- <p>You're using Spree Community Edition. To get access to all features, please upgrade to Enterprise Edition.</p>+ <p>Thank you for using Spree Community Edition! Please consider upgrading to Enterprise Edition for access to all features and support.</p><%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-secondary btn-sm shadow-xs' %></div>diff --git a/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erbindex 355dfdd71e..a53373e90e 100644--- a/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb@@ -26,7 +26,7 @@<%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %><% if ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts) %>- <ul class="nav-submenu-dropdown d-none dropdown-container">+ <ul class="nav-submenu-dropdown hidden dropdown-container"><%= nav_item(Spree.t(:orders), spree.admin_orders_path) %><% if ready_to_ship_orders_count&.positive? %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erbindex 6abc41c248..e150a4b137 100644--- a/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_products_nav.html.erb@@ -3,7 +3,7 @@<%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'package', active: products_active) %><%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless products_active %>d-none<% end %>">+ <ul class="nav-submenu <% unless products_active %>hidden<% end %>"><% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %><%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %><% end %>@@ -21,7 +21,7 @@</ul><%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown d-none dropdown-container">+ <ul class="nav-submenu-dropdown hidden dropdown-container"><%= nav_item(Spree.t(:products), spree.admin_products_path) %><% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erbindex 997c603b1a..90922802c4 100644--- a/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_promotions_nav.html.erb@@ -3,12 +3,12 @@<%= nav_item(Spree.t(:promotions), spree.admin_promotions_path, icon: 'discount', active: discounts_active) %><%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless discounts_active %>d-none<% end %>">+ <ul class="nav-submenu <% unless discounts_active %>hidden<% end %>"><%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path, active: %w[gift_cards gift_card_batches].include?(controller_name)) %></ul><%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown d-none dropdown-container">+ <ul class="nav-submenu-dropdown hidden dropdown-container"><%= nav_item(Spree.t(:promotions), spree.admin_promotions_path) %><%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path) %></ul>diff --git a/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erbindex f68f2102f9..78a0c1daac 100644--- a/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb@@ -15,7 +15,7 @@<%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %><% if can?(:manage, Spree::ReturnAuthorization) %>- <ul class="nav-submenu-dropdown d-none dropdown-container">+ <ul class="nav-submenu-dropdown hidden dropdown-container"><%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path) %><%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erbindex f1e59f8145..e47bb513ee 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb@@ -2,11 +2,11 @@<%= dropdown do %><%= dropdown_toggle class: 'store-dropdown-button dropdown-toggle' do %><%= store_admin_icon(current_store, height: 32, width: 32) %>- <span class="store-name d-none d-lg-block">+ <span class="store-name hidden lg:block"><%= truncate(current_store.name, length: 10) %></span><% end %>- <%= dropdown_menu class: 'ml-2' do %>+ <%= dropdown_menu do %><%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %><%= icon 'eye' %><%= Spree.t(:view_store) %>@@ -26,9 +26,9 @@<% if store.id == current_store.id %><div class="store-chooser-item active"><%= store_admin_icon(store, height: 32, width: 32) %>- <span class="d-flex flex-column mr-2">+ <span class="flex flex-col mr-2"><%= store.name %>- <small class="text-muted">+ <small class="text-gray-600"><%= store.url_or_custom_domain %></small></span>@@ -37,9 +37,9 @@<% else %><%= link_to spree.admin_dashboard_url(host: store.url), class: 'store-chooser-item' do %><%= store_admin_icon(store, height: 32, width: 32) %>- <span class="d-flex flex-column">+ <span class="flex flex-col"><%= store.name %>- <small class="text-muted">+ <small class="text-gray-600"><%= store.url_or_custom_domain %></small></span>diff --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 e8aaf54955..88dc4fab3d 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@@ -1,7 +1,7 @@<% if Spree::Admin::RuntimeConfig.legacy_sidebar_navigation %><%# Legacy navigation system %><% if settings_area? %>- <ul class="nav flex-column">+ <ul class="nav flex-col"><% if can?(:manage, current_store) %><%= nav_item(Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), icon: 'building-store', active: params[:section] == 'general-settings') %><% end %>@@ -52,11 +52,11 @@<%= nav_item(Spree.t('admin.audit_log'), spree.admin_audits_path, icon: 'history', active: %w[audits exports imports].include?(controller_name)) %><% else %><li class="nav-item">- <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>+ <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link flex items-center w-full' do %><%= icon 'history' %><%= Spree.t('admin.audit_log') %>- <span class="badge ml-auto rounded-pill" data-controller="tooltip">+ <span class="badge ml-auto rounded-full" data-controller="tooltip">Enterprise<%= tooltip("This feature is part of the Enterprise Edition.") %></span>@@ -74,7 +74,7 @@<%= render_admin_partials(:settings_nav_partials) %></ul><% else %>- <ul class="nav flex-column">+ <ul class="nav flex-col"><% if can?(:manage, current_store) %><% unless current_store.setup_completed? %><%= nav_item(nil, spree.admin_getting_started_path, icon: 'map') do %>@@ -106,10 +106,10 @@<%= render 'spree/admin/shared/sidebar/integrations_nav' %></ul>- <div class="mt-auto d-flex flex-column">+ <div class="mt-auto flex flex-col"><%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>- <ul class="nav flex-column mb-2">+ <ul class="nav flex-col mb-2"><% if can?(:manage, current_store) %><%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %><%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users') %>@@ -124,7 +124,7 @@<% else %><%= render_navigation(:sidebar) %>- <div class="mt-auto d-flex flex-column">+ <div class="mt-auto flex flex-col"><%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %></div><% end %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erbindex 990b8c7a54..fea4722c31 100644--- a/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb@@ -3,7 +3,7 @@<%= nav_item(Spree.t('admin.storefront'), spree.admin_themes_path, icon: 'building-store', active: storefront_active) %><%# Submenu for expanded sidebar (only shown when active) %>- <ul class="nav-submenu <% unless storefront_active %>d-none<% end %>">+ <ul class="nav-submenu <% unless storefront_active %>hidden<% end %>"><% if can?(:manage, Spree::Theme) %><%= nav_item(Spree.t(:themes), spree.admin_themes_path) %><% end %>@@ -24,7 +24,7 @@</ul><%# Submenu dropdown for collapsed sidebar (always rendered, shown on hover) %>- <ul class="nav-submenu-dropdown d-none dropdown-container">+ <ul class="nav-submenu-dropdown hidden dropdown-container"><% if can?(:manage, Spree::Theme) %><%= nav_item(Spree.t(:themes), spree.admin_themes_path) %><% end %>diff --git a/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erbindex 9d95a93cbc..e0c98de894 100644--- a/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_vendors_nav.html.erb@@ -3,11 +3,11 @@<%= render_admin_partials(:vendors_nav_partials) %><% else %><li class="nav-item">- <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100', data: { controller: 'tooltip' } do %>+ <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link flex items-center w-full', data: { controller: 'tooltip' } do %><%= icon 'heart-handshake' %><%= Spree.t(:vendors) %>- <span class="badge ml-auto rounded-pill">+ <span class="badge ml-auto rounded-full">Enterprise</span><%= tooltip('This feature is part of the Enterprise Edition.') %>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 c1c1c17979..971a67faf0 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@@ -2,17 +2,17 @@<% taxon = child_resource %>-<div class="sortable-tree-item-row d-flex align-items-center w-100 rounded-lg hover-light border" data-controller="row-link">+<div class="sortable-tree-item-row flex items-center w-full rounded-xl hover:bg-gray-25 border" data-controller="row-link"><div class="move-handle mr-3 ml-2">- <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>+ <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2 cursor-grab') %></div>- <div class="flex-grow-1 cursor-pointer" data-action="click->row-link#openLink">- <div class="d-flex align-items-center overflow-hidden w-100 <% if taxon.square_image&.attached? || taxon.image&.attached? %>py-2<% else %>py-3<% end %>">+ <div class="grow cursor-pointer" data-action="click->row-link#openLink">+ <div class="flex items-center overflow-hidden w-full <% if taxon.square_image&.attached? || taxon.image&.attached? %>py-2<% else %>py-3<% end %>"><% if taxon.square_image&.attached? && taxon.square_image.variable? %>- <%= spree_image_tag(taxon.square_image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>+ <%= spree_image_tag(taxon.square_image, class: 'rounded-md mr-4', width: 48, height: 48, loading: :lazy) %><% elsif taxon.image&.attached? && taxon.image.variable? %>- <%= spree_image_tag(taxon.image, class: 'rounded mr-3', width: 48, height: 48, loading: :lazy) %>+ <%= spree_image_tag(taxon.image, class: 'rounded-md mr-4', width: 48, height: 48, loading: :lazy) %><% end %><div class="overflow-hidden"><%= taxon.name %>@@ -20,17 +20,17 @@</div></div>- <div class="overflow-hidden text-muted font-size-sm ml-auto">+ <div class="overflow-hidden text-gray-600 text-sm ml-auto"><% if taxon.classifications.count > 0 %><%= pluralize(taxon.classifications.count, Spree.t(:product)) %><% end %></div>- <div class="d-flex align-items-center px-3 ml-3 gap-2">+ <div class="flex items-center px-3 ml-3 gap-2"><%= link_to_edit(taxon, url: spree.edit_admin_taxonomy_taxon_path(taxonomy, taxon.id), data: { row_link_target: :link, turbo_frame: '_top' }) if can?(:edit, taxon) %>- <%= dropdown class: 'h-100' do %>- <%= dropdown_toggle class: 'btn-sm px-1 h-100' do %>+ <%= dropdown class: 'h-full' do %>+ <%= dropdown_toggle class: 'btn-sm btn-light px-1 h-full' do %><%= icon('dots-vertical', class: 'mr-0') %><% end %><%= dropdown_menu do %>@@ -38,7 +38,7 @@<%= link_to_with_icon 'plus', Spree.t(:new_nested_taxon), spree.new_admin_taxonomy_taxon_path(taxonomy, taxon: { parent_id: taxon.id }), class: 'dropdown-item' %><div class="dropdown-divider"></div><% end %>- <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item btn-danger') if can?(:destroy, taxon) %>+ <%= link_to_delete(taxon, icon: 'trash', url: spree.admin_taxonomy_taxon_path(taxonomy, taxon.id), class: 'dropdown-item text-red-600 hover:bg-red-100') if can?(:destroy, taxon) %><% end %><% end %></div>diff --git a/admin/app/views/spree/admin/shipments/edit.html.erb b/admin/app/views/spree/admin/shipments/edit.html.erbindex ad03fddbc1..1807d48778 100644--- a/admin/app/views/spree/admin/shipments/edit.html.erb+++ b/admin/app/views/spree/admin/shipments/edit.html.erb@@ -1,27 +1,27 @@<%= turbo_frame_tag dom_id(@shipment, :shipping_method) do %>- <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 d-flex justify-content-between align-items-center" do |f| %>+ <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-full flex justify-between items-center" do |f| %><div><%= f.select :selected_shipping_rate_id, options_for_select(@shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, @shipment.selected_shipping_rate_id),- {}, class: 'custom-select', autofocus: true %>+ {}, class: 'form-select', autofocus: true %></div>- <div class="d-flex h-100 align-items-center">+ <div class="flex h-full items-center gap-2"><% if can? :update, @shipment %>- <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>- <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>+ <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: :_top }, type: :submit, class: 'btn btn-primary' %>+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light" %><% end %></div><% end %><% end %><%= turbo_frame_tag dom_id(@shipment, :tracking) do %>- <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-100 py-1 d-flex justify-content-between align-items-center" do |f| %>- <div class="form-inline">- <%= f.label :tracking, Spree.t(:tracking_number) %>- <%= f.text_field :tracking, class: 'form-control ml-3', required: true, autofocus: true %>+ <%= form_with model: @shipment, url: spree.admin_order_shipment_path(@order, @shipment), class: "w-full py-1 flex justify-between items-center" do |f| %>+ <div class="flex items-center text-nowrap gap-x-3 items-center grow mr-3">+ <%= f.label :tracking, Spree.t(:tracking_number), class: 'mb-0' %>+ <%= f.text_field :tracking, class: 'form-input', required: true, autofocus: true %></div>- <div class="d-flex h-100 align-items-center">+ <div class="flex h-full items-center gap-2"><% if can? :update, @shipment %>- <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary text-center mr-2 btn-sm' %>- <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light btn-sm" %>+ <%= turbo_save_button_tag Spree.t('actions.save'), data: { turbo_frame: dom_id(@shipment) }, type: :submit, class: 'btn btn-primary' %>+ <%= link_to Spree.t('actions.discard'), spree.edit_admin_order_path(@order), class: "btn btn-light" %><% end %></div><% end %>diff --git a/admin/app/views/spree/admin/shipments/split.html.erb b/admin/app/views/spree/admin/shipments/split.html.erbindex 6f7561a20b..9db03c80ec 100644--- a/admin/app/views/spree/admin/shipments/split.html.erb+++ b/admin/app/views/spree/admin/shipments/split.html.erb@@ -1,12 +1,12 @@-<%= turbo_frame_tag dom_id(@variant, :shipment_item), class: "border-bottom py-2 px-3 shipment-line-items__row" do %>+<%= turbo_frame_tag dom_id(@variant, :shipment_item), class: "border-b py-2 px-4 shipment-line-items__row" do %><%= form_with url: transfer_admin_order_shipment_path(@order, @shipment), class: "shipment-line-items__form" do |f| %><%= hidden_field_tag :variant_id, @variant.id %>- <div class="d-flex flex-row gap-2 align-items-center w-full form-group mb-0">- <%= label_tag :destination, Spree.t(:move_variant_to), class: 'mb-0 text-muted font-size-sm font-weight-bold' %>- <%= tom_select_tag :destination, grouped_options: { Spree.t('existing_shipments') => shipments_for_transfer(@shipment), Spree.t('new_shipment_at_location') => stock_locations_for_split(@variant) }, class: "flex-grow-1" %>+ <div class="flex flex-row gap-2 items-center w-full form-group mb-0">+ <%= label_tag :destination, Spree.t(:move_variant_to), class: 'mb-0 text-gray-600 text-sm font-bold' %>+ <%= tom_select_tag :destination, grouped_options: { Spree.t('existing_shipments') => shipments_for_transfer(@shipment), Spree.t('new_shipment_at_location') => stock_locations_for_split(@variant) }, class: "grow" %></div>- <%= number_field_tag :quantity, 1, max: @max_quantity, class: "form-control", style: "grid-column-start: quantity", min: 0, data: { test_id: :move_quantity} %>- <span class="d-flex justify-content-end align-items-center gap-2 w-100" style="grid-column: quantity/-1">+ <%= number_field_tag :quantity, 1, max: @max_quantity, class: "form-input", style: "grid-column-start: quantity", min: 0, data: { test_id: :move_quantity} %>+ <span class="flex justify-end items-center gap-2 w-full" style="grid-column: quantity/-1"><% if can?(:split, @shipment) %><%= turbo_save_button_tag Spree.t(:move), data: { turbo_frame: '_top' }, type: :submit, class: 'btn btn-primary text-center btn-sm' %><% end %>diff --git a/admin/app/views/spree/admin/shipping_categories/_form.html.erb b/admin/app/views/spree/admin/shipping_categories/_form.html.erbindex 408b0139e9..3cf8c71b9a 100644--- a/admin/app/views/spree/admin/shipping_categories/_form.html.erb+++ b/admin/app/views/spree/admin/shipping_categories/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, autofocus: f.object.new_record?, required: true %></div>diff --git a/admin/app/views/spree/admin/shipping_categories/_table_row.html.erb b/admin/app/views/spree/admin/shipping_categories/_table_row.html.erbindex c8a7d9b7dd..e333dc68ab 100644--- a/admin/app/views/spree/admin/shipping_categories/_table_row.html.erb+++ b/admin/app/views/spree/admin/shipping_categories/_table_row.html.erb@@ -1,7 +1,7 @@<tr id="<%= spree_dom_id shipping_category %>" class="cursor-pointer" data-controller="row-link"><td data-action="click->row-link#openLink"><%= shipping_category.name %></td><td class="actions">- <span class="d-flex justify-content-end">+ <span class="flex justify-end"><%= link_to_edit(shipping_category, data: { row_link_target: :link, turbo_frame: '_top' }) if can? :edit, shipping_category %></span></td>diff --git a/admin/app/views/spree/admin/shipping_methods/_form.html.erb b/admin/app/views/spree/admin/shipping_methods/_form.html.erbindex e98fc76d14..464a5d2833 100644--- a/admin/app/views/spree/admin/shipping_methods/_form.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/_form.html.erb@@ -1,12 +1,12 @@-<div class="row">- <div class="col-lg-6">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6"><%= render 'spree/admin/shipping_methods/form/display', f: f %><%= render 'spree/admin/shipping_methods/form/tracking_url', f: f %><%= render 'spree/admin/shipping_methods/form/zones', f: f %><%= render 'spree/admin/shipping_methods/form/shipping_categories', f: f %><%= render 'spree/admin/shipping_methods/form/tax_category', f: f %></div>- <div class="col-lg-6">+ <div class="col-span-12 lg:col-span-6"><%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, calculators: @calculators } %><%= render 'spree/admin/shipping_methods/form/estimated_transit_business_days', f: f %><%= render_admin_partials(:shipping_method_form_partials, f: f, shipping_method: @shipping_method) %>diff --git a/admin/app/views/spree/admin/shipping_methods/_table_row.html.erb b/admin/app/views/spree/admin/shipping_methods/_table_row.html.erbindex 21a98c562a..0144ddc142 100644--- a/admin/app/views/spree/admin/shipping_methods/_table_row.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/_table_row.html.erb@@ -7,7 +7,7 @@</span><% end %></td>- <td data-action="click->row-link#openLink" class="w-25 text-wrap">+ <td data-action="click->row-link#openLink" class="w-1/4 whitespace-normal"><% shipping_method.zones.each do |zone| %><% if can?(:manage, zone) %><%= link_to zone.name, spree.edit_admin_zone_path(zone), class: 'badge badge-light border mb-2' %>@@ -24,7 +24,7 @@</td><td class="w-10"><%= form_with model: shipping_method, url: spree.admin_shipping_method_path(shipping_method), method: :patch, data: { controller: 'auto-submit' } do |f| %>- <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select-sm w-auto', data: { action: 'auto-submit#submit' } } %>+ <%= f.select :display_on, display_on_options, {}, { class: 'form-select form-select-sm w-auto', data: { action: 'auto-submit#submit' } } %><% end %></td><td class="actions w-10">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 140cff76fc..348531d0a0 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@@ -1,47 +1,10 @@-<div class="card mb-4">- <div class="card-body">- <div class="row">- <div class="col-lg-6">- <div class="form-group">- <%= f.label :name, Spree.t(:name) %>- <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>- <%= f.error_message_on :name %>- </div>-- <p class="form-text small mt-2">- This will be displayed to customers.- </p>- </div>-- <div class="col-lg-6">- <div class="form-group">- <%= f.label :display_on %>- <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select' } %>- <%= f.error_message_on :display_on %>- </div>- </div>- </div>-- <div class="row">- <div class="col-lg-6">- <div class="form-group">- <%= f.label :admin_name, Spree.t(:internal_name) %>- <%= f.text_field :admin_name, class: 'form-control' %>- <%= f.error_message_on :admin_name %>- </div>-- <p class="form-text small mt-2">- This will be displayed to admins.- </p>- </div>-- <div class="col-lg-6">- <div class="form-group">- <%= f.label :code, Spree.t(:code) %>- <%= f.text_field :code, class: 'form-control' %>- <%= f.error_message_on :code %>- </div>- </div>+<div class="card mb-6">+ <div class="card-body pb-0">+ <div class="grid grid-cols-1 md:grid-cols-2 gap-x-6 gap-y-3">+ <%= f.spree_text_field :name, required: true, autofocus: f.object.new_record?, help: 'This will be displayed to customers' %>+ <%= f.spree_select :display_on, display_on_options, { label: Spree.t(:display_on) }, { required: true } %>+ <%= f.spree_text_field :admin_name, label: Spree.t(:internal_name), help: 'This will be displayed to admins' %>+ <%= f.spree_text_field :code, label: Spree.t(:code)%></div></div></div>diff --git a/admin/app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erb b/admin/app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erbindex 23849aabc5..852612709a 100644--- a/admin/app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:estimated_transit_business_days) %>@@ -9,15 +9,9 @@This is the estimated number of business days it will take for the package to arrive at the customer's address.It will be displayed on the checkout page.</div>- <div class="row">- <div class="col">- <%= f.label :estimated_transit_business_days_min, Spree.t(:min) %>- <%= f.number_field :estimated_transit_business_days_min, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:min), min: 1 %>- </div>- <div class="col">- <%= f.label :estimated_transit_business_days_max, Spree.t(:max) %>- <%= f.number_field :estimated_transit_business_days_max, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:max), min: 1 %>- </div>+ <div class="grid grid-cols-1 md:grid-cols-2 gap-6">+ <%= f.spree_number_field :estimated_transit_business_days_min, size: 2, placeholder: Spree.t(:min), min: 1, label: Spree.t(:min) %>+ <%= f.spree_number_field :estimated_transit_business_days_max, size: 2, placeholder: Spree.t(:max), min: 1, label: Spree.t(:max) %></div></div></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shipping_methods/form/_shipping_categories.html.erb b/admin/app/views/spree/admin/shipping_methods/form/_shipping_categories.html.erbindex 668692c213..8278e24d26 100644--- a/admin/app/views/spree/admin/shipping_methods/form/_shipping_categories.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/form/_shipping_categories.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:shipping_categories) %>@@ -8,7 +8,7 @@<div class="card-body"><div class="form-group"><% @shipping_categories.each do |category| %>- <div class="custom-control custom-checkbox mb-2">+ <div class="custom-control form-checkbox mb-2"><%= check_box_tag('shipping_method[shipping_category_ids][]', category.id, @shipping_method.shipping_categories.include?(category), id: "shipping_method_categories_#{category.id}", class: 'custom-control-input') %><%= label_tag "shipping_method_categories_#{category.id}", class: 'custom-control-label' do %><%= category.name.gsub('_', ' ') %>diff --git a/admin/app/views/spree/admin/shipping_methods/form/_tax_category.html.erb b/admin/app/views/spree/admin/shipping_methods/form/_tax_category.html.erbindex a3c88b8ca7..5645f5896f 100644--- a/admin/app/views/spree/admin/shipping_methods/form/_tax_category.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/form/_tax_category.html.erb@@ -1,5 +1,5 @@<% if can?(:manage, Spree::TaxCategory) %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:tax_category) %>@@ -7,7 +7,7 @@</div><div class="card-body">- <%= f.spree_collection_select :tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none'), label: Spree.t(:tax_category) } %>+ <%= f.spree_collection_select :tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none'), label: Spree.t(:tax_category), autocomplete: true } %></div></div><% end %>\ No newline at end of filediff --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 d7f96d6a25..33bb976e1f 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@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:tracking_url) %>@@ -6,7 +6,7 @@</div><div class="card-body"><div class="form-group">- <%= f.url_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>+ <%= f.url_field :tracking_url, class: 'form-input', placeholder: Spree.t(:tracking_url_placeholder) %><%= f.error_message_on :tracking_url %></div>diff --git a/admin/app/views/spree/admin/shipping_methods/form/_zones.html.erb b/admin/app/views/spree/admin/shipping_methods/form/_zones.html.erbindex 4673889930..920b5dff50 100644--- a/admin/app/views/spree/admin/shipping_methods/form/_zones.html.erb+++ b/admin/app/views/spree/admin/shipping_methods/form/_zones.html.erb@@ -1,20 +1,20 @@-<div class="card mb-4">- <div class="card-header d-flex align-items-center">+<div class="card mb-6">+ <div class="card-header flex items-center"><h5 class="card-title"><%= Spree.t(:zones) %></h5>- <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>+ <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto') if can?(:manage, Spree::Zone) %></div><div class="card-body">- <div class="form-group">+ <div class="form-group flex flex-col gap-2"><% @available_zones.each do |zone| %>- <div class="custom-control custom-checkbox mb-2">+ <div class="custom-control form-checkbox rounded-lg hover:bg-gray-100 p-2 transition-colors duration-100 ease-linear"><%= check_box_tag('shipping_method[zone_ids][]', zone.id, @shipping_method.zone_ids.include?(zone.id), id: "shipping_method_zones_#{zone.id}", class: 'custom-control-input') %>- <%= label_tag "shipping_method_zones_#{zone.id}", class: 'custom-control-label' do %>+ <%= label_tag "shipping_method_zones_#{zone.id}", class: 'custom-control-label flex flex-col items-start' do %><span ><%= zone.name.gsub('_', ' ') %></span>- <p class="text-muted small mb-0">+ <p class="text-gray-600 small mb-0"><%= zone.zone_members.map {|zone_member| zone_member.zoneable.name }.join(', ') %></p><% end %>diff --git a/admin/app/views/spree/admin/stock_items/_filters.html.erb b/admin/app/views/spree/admin/stock_items/_filters.html.erbindex dee53b8b5b..96f59c063b 100644--- a/admin/app/views/spree/admin/stock_items/_filters.html.erb+++ b/admin/app/views/spree/admin/stock_items/_filters.html.erb@@ -1,8 +1,8 @@<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dialog" } do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :variant_product_name_cont, label: Spree.t(:product_name) %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>@@ -13,7 +13,7 @@<div class="drawer-body"><div class="form-group"><%= f.label :variant_sku_cont, Spree.t(:sku) %>- <%= f.text_field :variant_sku_cont, size: 15, class: "form-control", data: {filters_target: :input} %>+ <%= f.text_field :variant_sku_cont, size: 15, class: "form-input", data: {filters_target: :input} %></div><div class="form-group"><%= f.label :stock_location_id_eq, Spree.t(:stock_location) %>diff --git a/admin/app/views/spree/admin/stock_items/_table_row.html.erb b/admin/app/views/spree/admin/stock_items/_table_row.html.erbindex c68497c799..62ace91486 100644--- a/admin/app/views/spree/admin/stock_items/_table_row.html.erb+++ b/admin/app/views/spree/admin/stock_items/_table_row.html.erb@@ -1,5 +1,5 @@<tr>- <td scope="row p-0" class="w-50">+ <td scope="row p-0" class="w-1/2"><%= render 'spree/admin/variants/variant', variant: stock_item.variant %></td><td class="w-20">@@ -14,8 +14,8 @@<%= form_for stock_item,url: spree.admin_stock_item_path(stock_item),method: :put,- html: { data: { controller: 'auto-submit'}, class: 'd-flex align-items-center justify-content-center' } do |f| %>- <div class="custom-control custom-checkbox">+ html: { data: { controller: 'auto-submit'}, class: 'flex items-center justify-center' } do |f| %>+ <div class="custom-control form-checkbox"><%= f.check_box :backorderable, class: 'custom-control-input', id: "stock_item_backorderable_#{stock_item.id}", data: { action: 'auto-submit#submit' } %><label class="custom-control-label" for="stock_item_backorderable_<%= stock_item.id %>"><span></span></label></div>@@ -30,9 +30,9 @@<%= form_for stock_item,url: spree.admin_stock_item_path(stock_item),method: :put,- html: { class: 'd-flex' } do |f| %>+ html: { class: 'flex' } do |f| %>- <%= f.number_field :count_on_hand, class: 'form-control mr-2', required: true, min: 0 %>+ <%= f.number_field :count_on_hand, class: 'form-input mr-2', required: true, min: 0 %><%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary' %><% end %><% end %>diff --git a/admin/app/views/spree/admin/stock_locations/_form.html.erb b/admin/app/views/spree/admin/stock_locations/_form.html.erbindex 6ae5ddc3a8..7b6f52d077 100644--- a/admin/app/views/spree/admin/stock_locations/_form.html.erb+++ b/admin/app/views/spree/admin/stock_locations/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_settings) %>@@ -12,7 +12,7 @@<% end %></div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:address) %>diff --git a/admin/app/views/spree/admin/stock_locations/_table_row.html.erb b/admin/app/views/spree/admin/stock_locations/_table_row.html.erbindex 5e3c1e7bb4..c6ec887572 100644--- a/admin/app/views/spree/admin/stock_locations/_table_row.html.erb+++ b/admin/app/views/spree/admin/stock_locations/_table_row.html.erb@@ -12,12 +12,12 @@<% end %><td class="actions"><% if can? :edit, stock_location %>- <div class="d-flex justify-content-end align-items-center">+ <div class="flex justify-end items-center"><div><%= link_to_edit stock_location, data: { row_link_target: 'link', turbo_frame: '_top' } %></div><% if !stock_location.default? && can?(:mark_as_default, Spree::StockLocation) %><%= dropdown do %>- <%= dropdown_toggle class: 'btn-sm h-100' do %>+ <%= dropdown_toggle class: 'btn-sm h-full' do %><%= icon('dots-vertical', class: 'mr-0') %><% end %><%= dropdown_menu do %>diff --git a/admin/app/views/spree/admin/stock_transfers/_destination_movement_form.html.erb b/admin/app/views/spree/admin/stock_transfers/_destination_movement_form.html.erbindex 55422ab4d8..559184bb7f 100644--- a/admin/app/views/spree/admin/stock_transfers/_destination_movement_form.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_destination_movement_form.html.erb@@ -1,24 +1,24 @@<% variant_id = f.object.variant&.id || 'VARIANT_ID' %><% location_id ||= 'DESTINATION_ID' %>-<div class="d-flex align-items-center justify-content-between nested-form-wrapper" data-new-record="true">+<div class="flex items-center justify-between nested-form-wrapper" data-new-record="true"><%= f.hidden_field :variant_id, value: variant_id %><%= f.hidden_field :stock_item_id %><%= f.hidden_field :location_id, data: { stock_transfer_target: "destinationInput" }, value: location_id %>- <div class="d-flex align-items-center gap-2">+ <div class="flex items-center gap-2"><% if f.object.variant.present? %><%= render 'spree/admin/shared/product_image', object: f.object.variant %><% else %>VARIANT_IMAGE<% end %>- <div class="d-flex flex-column align-items-start justify-content-center">+ <div class="flex flex-col items-start justify-center"><% if f.object.variant.present? %><%= f.object.variant.name %><% if f.object.variant.sku.present? %>- <span class="text-muted"><strong><%= Spree.t(:sku) %>:</strong> <%= f.object.variant.sku %></span>+ <span class="text-gray-600"><strong><%= Spree.t(:sku) %>:</strong> <%= f.object.variant.sku %></span><% end %>- <span class="text-muted">+ <span class="text-gray-600"><%= "(#{f.object.variant.options_text})" if f.object.variant.options_text.present? %></span><% else %>@@ -26,8 +26,8 @@<% end %></div></div>- <div class="d-flex align-items-center gap-2">- <%= f.number_field :quantity, class: 'form-control w-auto', value: f.object.quantity.zero? ? 1 : f.object.quantity, required: true, min: 1, data: { action: "stock-transfer#updateQuantity", variant_id: variant_id } %>+ <div class="flex items-center gap-2">+ <%= f.number_field :quantity, class: 'form-input w-auto', value: f.object.quantity.zero? ? 1 : f.object.quantity, required: true, min: 1, data: { action: "stock-transfer#updateQuantity", variant_id: variant_id } %><%= button_tag class: 'btn btn-sm btn-danger', type: :button, data: { action: 'stock-transfer#remove', variant_id: variant_id } do %><%= icon('trash', class: 'icon icon-trash') %><%= Spree.t(:remove) %>diff --git a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb b/admin/app/views/spree/admin/stock_transfers/_filters.html.erbindex feac01afe2..1784d741c8 100644--- a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb@@ -1,7 +1,7 @@<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>@@ -12,7 +12,7 @@<div class="drawer-body"><div class="form-group"><%= f.label :reference_cont, Spree.t(:reference) %>- <%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-control", data: { filters_target: :input } %>+ <%= f.text_field :reference_cont, include_blank: true, size: 15, class: "form-input", data: { filters_target: :input } %></div><div class="form-group"><%= f.label :source_location_id_eq, Spree.t(:source) %>diff --git a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erbindex b4c5577263..afcb071fe1 100644--- a/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb@@ -2,7 +2,7 @@<%= dialog_header(Spree.t(:add_variant)) %><div class="dialog-body"><%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %>- <%= form.search_field :q, value: params[:q], class: 'form-control', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %>+ <%= form.search_field :q, value: params[:q], class: 'form-input', data: { search_picker_target: :search, action: 'auto-submit#submit' }, autofocus: true %><%= form.hidden_field :param_name, value: 'stock_transfer' %><%= form.hidden_field :all, value: true %><%= form.hidden_field :eligible, value: true %>@@ -12,7 +12,7 @@</div><div class="dialog-body"><div id="variants_search_results" class="search-results" data-search-picker-target="results">- <p class="text-muted text-center py-5">+ <p class="text-gray-600 text-center py-12"><%= Spree.t(:start_typing_to_search_for_variants) %></p></div>diff --git a/admin/app/views/spree/admin/stock_transfers/_table_row.html.erb b/admin/app/views/spree/admin/stock_transfers/_table_row.html.erbindex 8320ba4970..0481267ec0 100644--- a/admin/app/views/spree/admin/stock_transfers/_table_row.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_table_row.html.erb@@ -1,11 +1,11 @@<tr id="<%= spree_dom_id stock_transfer %>" data-controller="row-link" class="cursor-pointer"><td scope="row" data-action="click->row-link#openLink"><%= stock_transfer.number %></td>- <td class="text-truncate" data-action="click->row-link#openLink"><%= stock_transfer.reference.presence %></td>+ <td class="truncate" data-action="click->row-link#openLink"><%= stock_transfer.reference.presence %></td><td data-action="click->row-link#openLink"><%= stock_transfer.source_location&.display_name.presence || Spree.t(:none) %></td><td data-action="click->row-link#openLink"><%= stock_transfer.destination_location.display_name %></td><td data-action="click->row-link#openLink"><%= stock_transfer.destination_movements.size %></td><td data-action="click->row-link#openLink"><%= spree_time_ago(stock_transfer.created_at) %></td><td class="actions" data-action="click->row-link#openLink">- <%= link_to '', admin_stock_transfer_path(stock_transfer), data: { row_link_target: 'link' }, class: 'd-none' %>+ <%= link_to '', admin_stock_transfer_path(stock_transfer), data: { row_link_target: 'link' }, class: 'hidden' %></td></tr>\ No newline at end of filediff --git a/admin/app/views/spree/admin/stock_transfers/new.html.erb b/admin/app/views/spree/admin/stock_transfers/new.html.erbindex 3ba1ba15bf..d2ac2a1746 100644--- a/admin/app/views/spree/admin/stock_transfers/new.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/new.html.erb@@ -14,10 +14,10 @@<%= form_with model: [:admin, @stock_transfer] do |f| %><%= render 'spree/admin/stock_transfers/new_variant_template', f: f %><% stock_locations = available_stock_locations.to_tom_select_json %>- <div class="card mb-4">+ <div class="card mb-12"><div class="card-body" >- <div class="row">- <div class="form-group col-12 col-lg-6">+ <div class="grid grid-cols-12 gap-6">+ <div class="form-group col-span-12 lg:col-span-6"><%= f.label :source_location_id, Spree.t(:origin), class: 'form-label' %><%= tom_select_tag "stock_transfer[source_location_id]",empty_option: Spree.t(:none),@@ -28,7 +28,7 @@action: 'stock-transfer#updateSourceLocation'} %></div>- <div class="form-group col-12 col-lg-6">+ <div class="form-group col-span-12 lg:col-span-6"><%= f.label :destination_location_id, Spree.t(:destination), class: 'form-label' %><%= tom_select_tag "stock_transfer[destination_location_id]",options: stock_locations,@@ -42,12 +42,12 @@</div><div class="form-group"><%= f.label :reference, class: 'form-label' %>- <%= f.text_field :reference, class: 'form-control' %>+ <%= f.text_field :reference, class: 'form-input' %></div></div></div>- <div class="card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="card mb-12">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:products) %></h5>@@ -60,10 +60,10 @@</span></div><div class="card-body p-0" style="min-height: 300px">- <div class="d-flex flex-column gap-3 overflow-y-auto overflow-x-hidden p-3" style="max-height: 300px">+ <div class="flex flex-col gap-6 overflow-y-auto overflow-x-hidden p-6" style="max-height: 300px"><%= f.fields_for :stock_movements do |smf| %><% if smf.object.errors[:quantity].present? %>- <div class="alert alert-danger w-100 mb-0">+ <div class="alert alert-danger w-full mb-0"><% details = smf.object.errors.details[:quantity].first %><% error_message = smf.object.errors.generate_message(:quantity, :less_than_or_equal_to, {count: -details[:count], value: details[:value]}) %><%= smf.object.errors.full_message(:quantity, error_message) %>diff --git a/admin/app/views/spree/admin/stock_transfers/show.html.erb b/admin/app/views/spree/admin/stock_transfers/show.html.erbindex 8d2850b972..0616043487 100644--- a/admin/app/views/spree/admin/stock_transfers/show.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/show.html.erb@@ -5,17 +5,17 @@<% content_for :title do %><%= @stock_transfer.number %><% end %>-<div class="row">- <div class="col-lg-8">- <div class="card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">+<div class="grid grid-cols-12 gap-4">+ <div class="col-span-12 lg:col-span-8">+ <div class="card mb-12">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:products) %></h5></div><div class="card-body p-0" style="min-height: 300px">- <div class="d-block overflow-y-auto overflow-x-hidden" style="max-height: 300px">- <div class="table-responsive rounded bg-white">+ <div class="block overflow-y-auto overflow-x-hidden" style="max-height: 300px">+ <div class="table-responsive rounded-lg bg-white"><table class="table sortable"><thead><tr>@@ -33,22 +33,22 @@</div></div></div>- <div class="col-lg-4">- <div class="card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="col-span-12 lg:col-span-4">+ <div class="card mb-12">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5></div><div class="card-body"><ul class="list-group">- <li class="list-group-item d-flex justify-content-between">+ <li class="list-group-item flex justify-between"><%= Spree.t(:origin) %> <span><%= @stock_transfer.source_location&.display_name.presence || Spree.t(:none) %></span></li>- <li class="list-group-item d-flex justify-content-between">+ <li class="list-group-item flex justify-between"><%= Spree.t(:destination) %> <span><%= @stock_transfer.destination_location.display_name %></span></li>- <li class="list-group-item d-flex justify-content-between">+ <li class="list-group-item flex justify-between"><%= Spree.t(:reference) %> <span><%= @stock_transfer.reference %></span></li></ul>diff --git a/admin/app/views/spree/admin/store_credit_categories/edit.html.erb b/admin/app/views/spree/admin/store_credit_categories/edit.html.erbindex 436972f4b8..cbe9cbf454 100644--- a/admin/app/views/spree/admin/store_credit_categories/edit.html.erb+++ b/admin/app/views/spree/admin/store_credit_categories/edit.html.erb@@ -6,7 +6,7 @@<%= render 'spree/admin/shared/error_messages', target: @store_credit_category %><%= form_for [:admin, @store_credit_category] do |f| %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-body"><%= render 'form', f: f %></div>diff --git a/admin/app/views/spree/admin/store_credit_categories/new.html.erb b/admin/app/views/spree/admin/store_credit_categories/new.html.erbindex bd04d8a4fe..b00b0db534 100644--- a/admin/app/views/spree/admin/store_credit_categories/new.html.erb+++ b/admin/app/views/spree/admin/store_credit_categories/new.html.erb@@ -6,7 +6,7 @@<%= render 'spree/admin/shared/error_messages', target: @store_credit_category %><%= form_for [:admin, @store_credit_category] do |f| %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-body"><%= render 'form', f: f %></div>diff --git a/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erb b/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erbindex 440e8bfdc6..736a822261 100644--- a/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erb+++ b/admin/app/views/spree/admin/store_credit_events/_store_credit_event.html.erb@@ -18,7 +18,7 @@<% if store_credit_event.order %><%= link_to store_credit_event.order.number, spree.edit_admin_order_path(store_credit_event.order) %><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %>diff --git a/admin/app/views/spree/admin/store_credits/edit.html.erb b/admin/app/views/spree/admin/store_credits/edit.html.erbindex df4df69535..5b649d3fb8 100644--- a/admin/app/views/spree/admin/store_credits/edit.html.erb+++ b/admin/app/views/spree/admin/store_credits/edit.html.erb@@ -1,7 +1,7 @@<%= turbo_frame_tag :store_credit_details do %><%= form_for @store_credit, url: spree.admin_user_store_credit_path(@user, @store_credit), method: :put do |f| %><div class="card">- <div class="card-header d-flex justify-content-between align-items-center">+ <div class="card-header flex justify-between items-center"><h5 class="card-title"><%= Spree.t(:details) %></h5>diff --git a/admin/app/views/spree/admin/store_credits/new.html.erb b/admin/app/views/spree/admin/store_credits/new.html.erbindex 84da45414a..3c96a69c7a 100644--- a/admin/app/views/spree/admin/store_credits/new.html.erb+++ b/admin/app/views/spree/admin/store_credits/new.html.erb@@ -8,10 +8,10 @@<% end %><%= form_for @store_credit, url: spree.admin_user_store_credits_path(@user, @store_credit) do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store_credit } %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:store_credits) %>diff --git a/admin/app/views/spree/admin/store_credits/show.html.erb b/admin/app/views/spree/admin/store_credits/show.html.erbindex 86208ab0a3..c10004ad50 100644--- a/admin/app/views/spree/admin/store_credits/show.html.erb+++ b/admin/app/views/spree/admin/store_credits/show.html.erb@@ -4,8 +4,8 @@<%= @store_credit.display_amount %><% end %>-<div class="row">- <div class="col-lg-8">+<div class="grid grid-cols-12 gap-4">+ <div class="col-span-12 lg:col-span-8"><div class="card"><div class="card-header"><h5 class="card-title">@@ -31,10 +31,10 @@</div></div>- <div class="col-lg-4">+ <div class="col-span-12 lg:col-span-4"><%= turbo_frame_tag :store_credit_details do %><div class="card">- <div class="card-header d-flex justify-content-between align-items-center">+ <div class="card-header flex justify-between items-center"><h5 class="card-title"><%= Spree.t(:details) %></h5>@@ -45,8 +45,8 @@</div><div class="card-body p-0"><ul class="list-group list-group-flush">- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:customer) %></span><span>@@ -54,8 +54,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:created_by) %></span><% if @store_credit.created_by %>@@ -63,14 +63,14 @@<%= link_to @store_credit.created_by.email, spree.admin_admin_user_path(@store_credit.created_by) %></span><% else %>- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:created_at) %></span>@@ -79,8 +79,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:amount) %></span>@@ -89,8 +89,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:authorized) %></span>@@ -99,8 +99,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:used) %></span>@@ -109,8 +109,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t('store_credit.remaining') %></span>@@ -119,8 +119,8 @@</span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">- <span class="text-muted">+ <li class="list-group-item flex justify-between items-center">+ <span class="text-gray-600"><%= Spree.t(:currency) %></span>@@ -129,8 +129,8 @@</span></li>- <li class="list-group-item d-flex flex-column justify-content-between align-items-start">- <span class="text-muted mb-2">+ <li class="list-group-item flex flex-col justify-between items-start">+ <span class="text-gray-600 mb-1"><%= Spree.t(:memo) %></span>diff --git a/admin/app/views/spree/admin/storefront/edit.html.erb b/admin/app/views/spree/admin/storefront/edit.html.erbindex 9589a00231..24d17fd9d5 100644--- a/admin/app/views/spree/admin/storefront/edit.html.erb+++ b/admin/app/views/spree/admin/storefront/edit.html.erb@@ -11,12 +11,12 @@<%= turbo_save_button_tag Spree.t('actions.update'), form: "edit_store_#{@store.id}" %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-5 pb-5' %>+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-12 pb-12' %><%= form_for @store, url: spree.admin_storefront_path, method: :patch do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">- <div class="card mb-4">+ <div class="grid grid-cols-12 gap-16">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:seo) %>@@ -29,21 +29,21 @@</div></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:security) %></h5></div>- <div class="card-body" data-controller="reveal" data-reveal-hidden-class="d-none">+ <div class="card-body" data-controller="reveal" data-reveal-hidden-class="hidden"><%= f.spree_check_box :preferred_password_protected, label: Spree.t(:password_protected), help: 'Checking this box will put your storefront behind a password.', data: { action: 'reveal#toggle' } %>- <div class="d-none" data-reveal-target="item">+ <div class="hidden" data-reveal-target="item"><%= f.spree_text_field :storefront_password, label: Spree.t(:password), help: 'Enter a password to protect your storefront.' %></div></div></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:custom_code) %>@@ -56,7 +56,7 @@</div></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:images) %>@@ -69,7 +69,7 @@</div></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:social_media) %>diff --git a/admin/app/views/spree/admin/stores/edit.html.erb b/admin/app/views/spree/admin/stores/edit.html.erbindex e1df6d0397..24a18630c4 100644--- a/admin/app/views/spree/admin/stores/edit.html.erb+++ b/admin/app/views/spree/admin/stores/edit.html.erb@@ -2,10 +2,10 @@<%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_store_#{current_store.id}", data: { admin_target: 'save' } %><% end %>-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-5 pb-5' %>+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-12 pb-12' %>-<div class="row">- <div class="col-lg-6 offset-lg-3">+<div class="grid grid-cols-12 gap-16">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= form_for current_store, url: spree.admin_store_path(section: params[:section]), method: :patch do |f| %><%= render partial: 'spree/admin/stores/form/basic', locals: { f: f } if params[:section].blank? || params[:section] == 'general-settings' %><%= render partial: 'spree/admin/stores/form/emails', locals: { f: f } if params[:section] == 'emails' %>diff --git a/admin/app/views/spree/admin/stores/edit_emails.html.erb b/admin/app/views/spree/admin/stores/edit_emails.html.erbindex 11a73b2dfd..a47a6314c5 100644--- a/admin/app/views/spree/admin/stores/edit_emails.html.erb+++ b/admin/app/views/spree/admin/stores/edit_emails.html.erb@@ -1,10 +1,10 @@-<%= turbo_frame_tag :set_customer_support_email, class: 'w-100' do %>+<%= turbo_frame_tag :set_customer_support_email, class: 'w-full' do %><%= form_for current_store, url: spree.admin_store_path, as: :store do |f| %><div class="form-group"><%= f.label :customer_support_email, Spree.t(:customer_support_email) %>- <%= f.email_field :customer_support_email, class: 'form-control', required: true %>+ <%= f.email_field :customer_support_email, class: 'form-input', required: true %></div>- <div class="d-flex justify-content-between">+ <div class="flex justify-between"><%= turbo_save_button_tag %></div><% end %>diff --git a/admin/app/views/spree/admin/stores/form/_basic.html.erb b/admin/app/views/spree/admin/stores/form/_basic.html.erbindex 2dd8fbae21..27ba1e4bb4 100644--- a/admin/app/views/spree/admin/stores/form/_basic.html.erb+++ b/admin/app/views/spree/admin/stores/form/_basic.html.erb@@ -3,12 +3,12 @@<% end %>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:name) %> & <%= Spree.t(:logo) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600"><%= Spree.t(:store_name_help) %></p><%= f.spree_text_field :name, required: true, autofocus: f.object.new_record? %>@@ -17,28 +17,28 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:currencies) %> & <%= Spree.t(:translations) %></h5></div><div class="card-body"><%= f.spree_select :default_currency, currency_options(@store.default_currency), { label: Spree.t(:default_currency), autocomplete: true } %><%= f.spree_select :supported_currencies, currency_options(@store.supported_currencies&.split(',')), { prompt: false, multiple: true, autocomplete: true } %>- <hr />+ <hr class="my-6" /><%= f.spree_select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), { autocomplete: true } %><%= f.spree_select :supported_locales, options_from_collection_for_select(all_locales_options, :last, :first, @store.supported_locales&.split(',')), { multiple: true, autocomplete: true } %></div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:standards_and_formats) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600"><%= Spree.t(:standards_and_formats_help) %></p>- <div class="form-group mb-3">+ <div class="form-group mb-6"><%= label_tag :preferred_timezone, raw(Spree.t(:timezone) + required_span_tag) %><%= time_zone_select :store, :preferred_timezone, nil, {}, { data: { controller: 'autocomplete-select' } } %></div>@@ -49,7 +49,7 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:phone) %> & <%= Spree.t(:address) %></h5></div>@@ -59,18 +59,27 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:digital_assets) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600 mb-4"><%= Spree.t(:digital_assets_help) %></p>- <%= f.spree_check_box :preferred_limit_digital_download_days %>- <%= f.spree_number_field :preferred_digital_asset_authorized_days, min: 1 %>- <%= f.spree_check_box :preferred_limit_digital_download_count %>- <%= f.spree_number_field :preferred_digital_asset_authorized_clicks, min: 1 %>+ <div data-controller="reveal">+ <%= f.spree_check_box :preferred_limit_digital_download_days, data: { action: 'reveal#toggle' } %>+ <div data-reveal-target="item" <% unless f.object.preferred_limit_digital_download_days %>class="hidden"<% end %>>+ <%= f.spree_number_field :preferred_digital_asset_authorized_days, min: 1 %>+ </div>+ </div>+ <hr class="my-6" />+ <div data-controller="reveal">+ <%= f.spree_check_box :preferred_limit_digital_download_count, data: { action: 'reveal#toggle' } %>+ <div data-reveal-target="item" <% unless f.object.preferred_limit_digital_download_count %>class="hidden"<% end %>>+ <%= f.spree_number_field :preferred_digital_asset_authorized_clicks, min: 1 %>+ </div>+ </div></div></div>diff --git a/admin/app/views/spree/admin/stores/form/_checkout.html.erb b/admin/app/views/spree/admin/stores/form/_checkout.html.erbindex 8b6393032f..2c46a0dfe6 100644--- a/admin/app/views/spree/admin/stores/form/_checkout.html.erb+++ b/admin/app/views/spree/admin/stores/form/_checkout.html.erb@@ -2,21 +2,21 @@<%= Spree.t(:checkout) %> <%= Spree.t(:settings) %><% end %>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:settings) %></h5></div><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 } %>- <span class="form-text mb-3">+ <span class="form-text mb-4"><%= Spree.t(:shipping_zone_help) %><%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %></span><%= f.spree_select :default_country_iso, Spree::Country.pluck(:name, :iso), { include_blank: false, label: Spree.t(:default_country), autocomplete: true, help: Spree.t(:default_country_help) } %>- <hr />+ <hr class="my-6" /><%= f.spree_check_box :preferred_guest_checkout, label: Spree.t('admin.checkout_settings.guest_checkout.label'), help: Spree.t('admin.checkout_settings.guest_checkout.description') %><%= f.spree_check_box :preferred_company_field_enabled, label: Spree.t('admin.store_form.company_field.label'), help: Spree.t('admin.store_form.company_field.description') %>@@ -24,7 +24,7 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:checkout_message) %></h5></div>@@ -34,7 +34,7 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t('admin.checkout_settings.checkout_links.label') %></h5></div>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 df3f0d77d8..8e2fcf8c0a 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@@ -1,28 +1,28 @@<div id="checkout_links"><% if current_store.links.any? %>- <ul class="list-group mb-3"+ <ul class="list-group rounded-lg mb-6 border-gray-200"data-controller="sortable"data-sortable-handle-value=".handle"data-sortable-resource-name-value="page_link"data-sortable-response-kind-value="turbo-stream"><% current_store.links.each do |link| %>- <li class="list-group-item p-0 hover-light"+ <li class="list-group-item p-0 hover:bg-gray-25"data-sortable-update-url="<%= spree.admin_page_link_path(link, sorting_only: true, format: :turbo_stream) %>">- <%= 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 shadow-none hover-gray-200 px-1">+ <%= turbo_frame_tag spree_dom_id(link), class: 'flex items-center w-full py-2 pl-6 pr-2' do %>+ <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'block text-gray-900 flex-1 no-underline' %>+ <span class="btn btn-sm handle shadow-none hover:bg-gray-100 px-1 cursor-move ml-4"><%= icon 'grip-vertical', class: 'mr-0' %>- </button>+ </span><% end %></li><% end %></ul><% else %>- <p class="text-muted text-center p-5">+ <p class="text-gray-600 text-center p-12"><%= Spree.t(:no_resource_found, resource: Spree::PageLink.model_name.human) %></p><% end %>- <%= link_to_with_icon 'plus', Spree.t(:add_link), spree.admin_store_links_path(current_store), class: 'btn btn-primary w-100', data: { turbo_method: :post } %>+ <%= link_to_with_icon 'plus', Spree.t(:add_link), spree.admin_store_links_path(current_store), class: 'btn btn-primary w-full', data: { turbo_method: :post } %></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/stores/form/_emails.html.erb b/admin/app/views/spree/admin/stores/form/_emails.html.erbindex d4b92b9dc4..72b5fa84e5 100644--- a/admin/app/views/spree/admin/stores/form/_emails.html.erb+++ b/admin/app/views/spree/admin/stores/form/_emails.html.erb@@ -3,7 +3,7 @@<% end %>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:settings) %></h5></div>@@ -12,12 +12,12 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title">Email addresses</h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600">Please provide the email address that will be used as the sender of all emails sent from your store.</p>@@ -27,12 +27,12 @@</div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:logo) %></h5></div><div class="card-body">- <p class="text-muted">This logo is included in all email notifications such as order confirmation</p>+ <p class="text-gray-600">This logo is included in all email notifications such as order confirmation</p><%= f.spree_file_field :mailer_logo, width: 204, height: 104 %><p class="form-text mb-0 mt-2">We recommend images with a transparent background.diff --git a/admin/app/views/spree/admin/stores/form/_policies.html.erb b/admin/app/views/spree/admin/stores/form/_policies.html.erbindex 499cc58be2..19a1e6bd27 100644--- a/admin/app/views/spree/admin/stores/form/_policies.html.erb+++ b/admin/app/views/spree/admin/stores/form/_policies.html.erb@@ -6,48 +6,48 @@Policies will be automatically added to footer of your store and will be available to customers during checkout.</div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:terms_of_service) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600">Customers will need to accept these terms of service during signup.</p><%= f.spree_rich_text_area :customer_terms_of_service, label: Spree.t(:terms_of_service) %></div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:privacy_policy) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600">Customers will need to accept these privacy policy during signup.</p><%= f.spree_rich_text_area :customer_privacy_policy, label: Spree.t(:privacy_policy) %></div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:returns_policy) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600">Please provide your customers with a clear and transparent returns policy.</p><%= f.spree_rich_text_area :customer_returns_policy, label: Spree.t(:returns_policy) %></div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:shipping_policy) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600">Please provide your customers with a clear and transparent shipping policy.</p><%= f.spree_rich_text_area :customer_shipping_policy, label: Spree.t(:shipping_policy) %>@@ -55,12 +55,12 @@</div><% if current_store.respond_to?(:partners_terms_of_service) %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title">Vendors <%= Spree.t(:terms_of_service) %></h5></div><div class="card-body">- <p class="text-muted">+ <p class="text-gray-600">Vendors you invite will need to accept these terms of service during their onboarding process.</p><%= f.spree_rich_text_area :partners_terms_of_service, label: Spree.t(:terms_of_service) %>diff --git a/admin/app/views/spree/admin/stores/new.html.erb b/admin/app/views/spree/admin/stores/new.html.erbindex 0e81321ed7..c97ff06748 100644--- a/admin/app/views/spree/admin/stores/new.html.erb+++ b/admin/app/views/spree/admin/stores/new.html.erb@@ -1,13 +1,13 @@<%= form_for @store, url: spree.admin_stores_path, data: { turbo: false, controller: 'store-form enable-button' } do |f| %>- <div class="container pt-5">- <h1><%= Spree.t(:new_store) %></h1>+ <div class="container pt-48">+ <h1 class="mb-6"><%= Spree.t(:new_store) %></h1><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %>- <div class="row">- <div class="col-lg-6">+ <div class="grid grid-cols-12 gap-16">+ <div class="col-span-12 lg:col-span-6"><div class="form-group"><%= f.label :name %>- <%= f.text_field :name, class: 'form-control',+ <%= f.text_field :name, class: 'form-input',placeholder: Spree.t(:store_name),required: true,autofocus: true,@@ -53,35 +53,35 @@</div><% end %></div>- <div class="col-lg-5 offset-lg-1">+ <div class="col-span-12 lg:col-span-5 lg:col-start-8"><h5>What will be shared with this new store:</h5>- <ul class="list-unstyled">+ <ul class="list-none p-0"><li>- <%= icon('check', class: 'text-success') %>+ <%= icon('check', class: 'text-green-700') %><%= Spree.t(:products) %>, <%= Spree.t(:stock_locations) %> & <%= Spree.t(:inventory) %><br />- <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>+ <em class="ml-24 text-gray-600 text-sm">you can select which ones will be available for this store</em></li><li>- <%= icon('check', class: 'text-success') %>+ <%= icon('check', class: 'text-green-700') %><%= Spree.t(:customers) %></li><li>- <%= icon('check', class: 'text-success') %>+ <%= icon('check', class: 'text-green-700') %>Shipping methods, rates and markets</li><li>- <%= icon('check', class: 'text-success') %>+ <%= icon('check', class: 'text-green-700') %><%= Spree.t(:payment_methods) %><br />- <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>+ <em class="ml-24 text-gray-600 text-sm">you can select which ones will be available for this store</em></li><li>- <%= icon('check', class: 'text-success') %>+ <%= icon('check', class: 'text-green-700') %>Admin user privileges</li></ul><h5>What will not be shared with this new store:</h5>- <ul class="list-unstyled">+ <ul class="list-none p-0"><li><%= icon('x', class: 'text-danger') %><%= Spree.t(:orders) %>@@ -122,7 +122,7 @@</div></div></div>- <footer id="footer" class="d-flex justify-content-end">+ <footer id="footer" class="fixed bottom-0 left-0 w-full border-t border-gray-200 px-6 py-4 bg-gray-25 flex items-center justify-end gap-4 z-[1000]"><%= turbo_save_button_tag Spree.t('actions.create'), data: { admin_target: 'save' } %></footer><% end %>diff --git a/admin/app/views/spree/admin/tax_categories/_form.html.erb b/admin/app/views/spree/admin/tax_categories/_form.html.erbindex bb976dfde6..3101380e71 100644--- a/admin/app/views/spree/admin/tax_categories/_form.html.erb+++ b/admin/app/views/spree/admin/tax_categories/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, autofocus: f.object.new_record?, required: true %>diff --git a/admin/app/views/spree/admin/tax_rates/_form.html.erb b/admin/app/views/spree/admin/tax_rates/_form.html.erbindex 3c4bf0e229..217ab01291 100644--- a/admin/app/views/spree/admin/tax_rates/_form.html.erb+++ b/admin/app/views/spree/admin/tax_rates/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_settings) %>@@ -13,7 +13,7 @@<%= f.spree_collection_select :zone_id, @available_zones, :id, :name, label: Spree.t(:zone) %><%= f.spree_collection_select :tax_category_id, @available_categories, :id, :name, label: Spree.t(:tax_category) %>- <hr class="my-4" />+ <hr class="my-6" /><%= f.spree_check_box :included_in_price %><%= f.spree_check_box :show_rate_in_label %>diff --git a/admin/app/views/spree/admin/tax_rates/_table_row.html.erb b/admin/app/views/spree/admin/tax_rates/_table_row.html.erbindex 6023402afe..dcff3c2d58 100644--- a/admin/app/views/spree/admin/tax_rates/_table_row.html.erb+++ b/admin/app/views/spree/admin/tax_rates/_table_row.html.erb@@ -1,5 +1,5 @@<tr id="<%= spree_dom_id tax_rate %>" data-controller="row-link" class="cursor-pointer">- <td class="w-25" data-action="click->row-link#openLink"><%= tax_rate.name %></td>+ <td class="w-1/4" data-action="click->row-link#openLink"><%= tax_rate.name %></td><td class="w-15" data-action="click->row-link#openLink"><%= tax_rate.tax_category.try(:name) || Spree.t(:not_available) %></td>diff --git a/admin/app/views/spree/admin/taxonomies/_form.html.erb b/admin/app/views/spree/admin/taxonomies/_form.html.erbindex ddbe4988e0..b1952663e7 100644--- a/admin/app/views/spree/admin/taxonomies/_form.html.erb+++ b/admin/app/views/spree/admin/taxonomies/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%= f.spree_text_field :name, required: true, autofocus: true %></div>diff --git a/admin/app/views/spree/admin/taxonomies/_table_row.html.erb b/admin/app/views/spree/admin/taxonomies/_table_row.html.erbindex 400d16e32e..32abbd698a 100644--- a/admin/app/views/spree/admin/taxonomies/_table_row.html.erb+++ b/admin/app/views/spree/admin/taxonomies/_table_row.html.erb@@ -1,9 +1,9 @@<tr id="<%= spree_dom_id taxonomy %>" data-controller="row-link" data-sortable-update-url="<%= spree.admin_taxonomy_path(taxonomy) %>"><td class="w-5 move-handle text-center">- <%= icon('grip-vertical', class: 'rounded hover-gray p-2') %>+ <%= icon('grip-vertical', class: 'rounded-md hover:bg-gray-100 p-2') %></td>- <td class="w-50 cursor-pointer py-0" data-action="click->row-link#openLink">- <%= link_to taxonomy.name, spree.admin_taxonomy_path(taxonomy), class: 'text-decoration-none d-flex align-items-center font-weight-bold text-dark', data: { row_link_target: :link, turbo_frame: '_top' } %>+ <td class="w-1/2 cursor-pointer py-0" data-action="click->row-link#openLink">+ <%= link_to taxonomy.name, spree.admin_taxonomy_path(taxonomy), class: 'no-underline flex items-center font-bold text-gray-900', data: { row_link_target: :link, turbo_frame: '_top' } %></td><td class="w-15 cursor-pointer" data-action="click->row-link#openLink"><!-- We don't want to include the root taxon -->diff --git a/admin/app/views/spree/admin/taxons/_form.html.erb b/admin/app/views/spree/admin/taxons/_form.html.erbindex 7971c47503..aaff3beb4f 100644--- a/admin/app/views/spree/admin/taxons/_form.html.erb+++ b/admin/app/views/spree/admin/taxons/_form.html.erb@@ -1,14 +1,14 @@-<div class="row" data-controller="slug-form seo-form">- <div class="col-lg-8">- <div class="card mb-4">- <div class="card-body pb-0 pt-3">+<div class="grid grid-cols-12 gap-6" data-controller="slug-form seo-form">+ <div class="col-span-12 lg:col-span-8">+ <div class="card mb-6">+ <div class="card-body"><%= f.spree_text_field :name, required: true, autofocus: @taxon.new_record?, data: { seo_form_target: 'sourceTitleInput', slug_form_target: 'name', action: 'slug-form#updateUrlFromName' } %><%= f.spree_rich_text_area :description, data: { seo_form_target: 'sourceDescriptionInput' } %></div></div><% if @taxon.new_record? %>- <div class="card mb-4" data-controller="reveal" data-reveal-hidden-class="d-none">+ <div class="card mb-6" data-controller="reveal" data-reveal-hidden-class="hidden"><div class="card-header"><h5 class="card-title"><%= Spree.t('admin.taxon_type') %></h5></div>@@ -16,36 +16,36 @@<div class="custom-control custom-radio mb-2"><%= f.radio_button :automatic, false, id: 'customRadio1', class: 'custom-control-input', checked: true, data: { action: 'reveal#hide' } %><label class="custom-control-label" for="customRadio1"><%= Spree.t('admin.taxon_types.manual') %></label>- <br />- <span class="text-muted"><%= Spree.t('admin.taxon_types.manual_info') %></span>+ <br>+ <span class="text-gray-600"><%= Spree.t('admin.taxon_types.manual_info') %></span></div><div class="custom-control custom-radio"><%= f.radio_button :automatic, true, id: 'customRadio2', class: 'custom-control-input', data: { action: 'reveal#show' } %><label class="custom-control-label" for="customRadio2"><%= Spree.t('admin.taxon_types.automatic') %></label>- <br />- <span class="text-muted"><%= Spree.t('admin.taxon_types.automatic_info') %></span>+ <br>+ <span class="text-gray-600"><%= Spree.t('admin.taxon_types.automatic_info') %></span></div></div>- <div class="card-body border-top pt-4 d-none" data-reveal-target="item">+ <div class="card-body border-t pt-6 hidden" data-reveal-target="item"><h6><%= Spree.t(:rules) %></h6><%= render 'spree/admin/taxons/rules_form', f: f %></div></div><% else %><% if @taxon.automatic? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:rules) %></h5></div><div class="card-body">- <div class="alert alert-info mb-3"><%= Spree.t('admin.taxon_types.automatic_info') %></div>+ <div class="alert alert-info mb-4"><%= Spree.t('admin.taxon_types.automatic_info') %></div><%= render 'spree/admin/taxons/rules_form', f: f %></div></div><% end %>- <div class="card mb-4">- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="card mb-6">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:products) %><span class="badge badge-info ml-2" id="product_count">@@ -58,14 +58,15 @@<% end %></div>- <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 class="card-body border-b py-0">+ <div class="flex items-center gap-2 py-2">+ <%= f.label :sort_order, class: 'mb-0' %>+ <%= f.select :sort_order, taxon_sort_options_for_select, {}, { class: 'form-select form-select-sm w-auto ml-2', data: { action: 'change->auto-submit#submit' } } %></div></div>- <div class="card-body p-2" style="min-height: 300px">- <div class="d-block overflow-y-auto overflow-x-hidden" style="max-height: 300px">+ <div class="card-body min-h-[300px] p-0">+ <div class="block overflow-y-auto overflow-x-hidden max-h-[300px]"><%= turbo_frame_tag :classifications, src: spree.admin_taxon_classifications_path(@taxon.id), loading: :lazy do %><%= render 'spree/admin/shared/spinner' %><% end %>@@ -75,8 +76,8 @@<% end %></div>- <div class="col-lg-4">- <div class="card mb-4">+ <div class="col-span-12 lg:col-span-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:images) %></h5></div>@@ -88,7 +89,7 @@</div></div>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:navigation) %>diff --git a/admin/app/views/spree/admin/taxons/_rule_form.html.erb b/admin/app/views/spree/admin/taxons/_rule_form.html.erbindex c578d8d11a..2a45eace85 100644--- a/admin/app/views/spree/admin/taxons/_rule_form.html.erb+++ b/admin/app/views/spree/admin/taxons/_rule_form.html.erb@@ -1,23 +1,23 @@-<div class="row nested-form-wrapper border-bottom mb-3 pr-2" data-controller="rule-form" data-new-record="<%= rf.object.new_record? %>">+<div class="grid grid-cols-12 gap-6 nested-form-wrapper border-b mb-4 pr-2" data-controller="rule-form" data-new-record="<%= rf.object.new_record? %>"><% @taxon_rules.each do |taxon_rule| %><template id="rule-form-template-<%= taxon_rule.to_s.demodulize %>" data-rule-form-target="template"><%= render "spree/admin/taxons/rule_forms/#{taxon_rule.to_s.demodulize.underscore}", rule_form: rf %></template><% end %>- <div class="col-lg-4 mb-3">- <%= rf.select :type, @rule_types, {}, { class: 'custom-select', data: { action: 'rule-form#replace' } } %>+ <div class="col-span-12 lg:col-span-4 mb-4">+ <%= rf.select :type, @rule_types, {}, { class: 'form-select', data: { action: 'rule-form#replace' } } %></div>- <div class="col-lg-3 mb-3">- <%= rf.select :match_policy, @rule_match_policies, {}, { class: 'custom-select' } %>+ <div class="col-span-12 lg:col-span-3 mb-4">+ <%= rf.select :match_policy, @rule_match_policies, {}, { class: 'form-select' } %></div>- <div class="col-lg-4 mb-3" data-rule-form-target="value">+ <div class="col-span-12 lg:col-span-4 mb-4" data-rule-form-target="value"><%= render "spree/admin/taxons/rule_forms/#{rf.object.type.demodulize.underscore}", rule_form: rf %></div>- <div class="col-lg-1 mb-3 d-flex align-items-center justify-content-center">- <button type="button" data-action="nested-form#remove" class="btn btn-sm btn-danger px-2" data-controller="tooltip" aria-label="<%= Spree.t(:remove_condition) %>">+ <div class="col-span-12 lg:col-span-1 mb-4 flex items-center justify-center">+ <button type="button" data-action="nested-form#remove" class="btn btn-sm btn-danger px-2 h-full" data-controller="tooltip" aria-label="<%= Spree.t(:remove_condition) %>"><%= icon('x', class: 'mr-0') %>- <span class="d-lg-none"><%= Spree.t(:remove_condition) %></span>+ <span class="lg:hidden"><%= Spree.t(:remove_condition) %></span><%= tooltip(Spree.t(:remove_condition)) %></button><%= rf.hidden_field :_destroy if rf.object.persisted? %>diff --git a/admin/app/views/spree/admin/taxons/_rules_form.html.erb b/admin/app/views/spree/admin/taxons/_rules_form.html.erbindex eeda7153ca..63e3c6a2ad 100644--- a/admin/app/views/spree/admin/taxons/_rules_form.html.erb+++ b/admin/app/views/spree/admin/taxons/_rules_form.html.erb@@ -1,12 +1,12 @@<div id="rules-form">- <div class="form-group mb-1">- <span class="d-block d-lg-inline mb-3"><%= Spree.t('admin.taxon_rules.products_must_match') %></span>+ <div class="form-group mb-1 flex items-center gap-4 py-4">+ <span><%= Spree.t('admin.taxon_rules.products_must_match') %></span>- <div class="custom-control custom-radio custom-control-inline ml-lg-3 mb-3">+ <div class="custom-control custom-radio"><%= f.radio_button :rules_match_policy, :all, class: 'custom-control-input' %><%= f.label :rules_match_policy, Spree.t('admin.taxon_rules.all_conditions'), class: 'custom-control-label', for: :taxon_rules_match_policy_all %></div>- <div class="custom-control custom-radio custom-control-inline mb-3">+ <div class="custom-control custom-radio"><%= f.radio_button :rules_match_policy, :any, class: 'custom-control-input' %><%= f.label :rules_match_policy, Spree.t('admin.taxon_rules.any_condition'), class: 'custom-control-label', for: :taxon_rules_match_policy_any %></div>@@ -24,10 +24,10 @@<% end %><!-- Inserted elements will be injected before that target. -->- <div data-nested-form-target="target" class="mb-2"></div>+ <div data-nested-form-target="target" class="mb-4"></div>- <button type="button" class="btn btn-secondary w-100 py-3" data-action="nested-form#add">- <%= icon('plus', class: 'mr-2') %>+ <button type="button" class="btn btn-secondary w-full py-3" data-action="nested-form#add">+ <%= icon('plus', class: 'mr-4') %><%= Spree.t(:add_one)%></button></div>diff --git a/admin/app/views/spree/admin/taxons/rule_forms/_available_on.html.erb b/admin/app/views/spree/admin/taxons/rule_forms/_available_on.html.erbindex 286822d3df..5925ecf802 100644--- a/admin/app/views/spree/admin/taxons/rule_forms/_available_on.html.erb+++ b/admin/app/views/spree/admin/taxons/rule_forms/_available_on.html.erb@@ -1,4 +1,4 @@-<div class="d-flex align-items-center justify-content-center h-100">- <%= rule_form.number_field :value, min: 1, class: 'form-control mr-3' %>- <span class="form-text text-nowrap"><%= Spree.t(:days_ago) %></span>+<div class="flex items-center justify-center h-full">+ <%= rule_form.number_field :value, min: 1, class: 'form-input mr-6' %>+ <span class="form-text whitespace-nowrap"><%= Spree.t(:days_ago) %></span></div>diff --git a/admin/app/views/spree/admin/taxons/rule_forms/_sale.html.erb b/admin/app/views/spree/admin/taxons/rule_forms/_sale.html.erbindex 227dab4ceb..044a17795f 100644--- a/admin/app/views/spree/admin/taxons/rule_forms/_sale.html.erb+++ b/admin/app/views/spree/admin/taxons/rule_forms/_sale.html.erb@@ -1,4 +1,4 @@-<div class="d-flex align-items-center justify-content-center h-100">+<div class="flex items-center justify-center h-full"><span class="badge badge-success"><%= Spree.t(:true_label) %></span><%= rule_form.hidden_field :value, value: true %></div>diff --git a/admin/app/views/spree/admin/themes/_theme.html.erb b/admin/app/views/spree/admin/themes/_theme.html.erbindex 1e4633f5a3..8974f68636 100644--- a/admin/app/views/spree/admin/themes/_theme.html.erb+++ b/admin/app/views/spree/admin/themes/_theme.html.erb@@ -1,14 +1,14 @@<tr id="<%= spree_dom_id theme %>"><td class="w-70 p-0">- <%= link_to theme.ready? ? spree.edit_admin_theme_path(theme) : '#', class: 'd-flex align-items-top p-3', data: { turbo_prefetch: false } do %>+ <%= link_to theme.ready? ? spree.edit_admin_theme_path(theme) : '#', class: 'flex align-items-top p-6', data: { turbo_prefetch: false } do %><div class="w-20">- <%= render 'spree/admin/themes/theme_preview_image', theme: theme, css_class: 'img-thumbnail w-100' %>+ <%= render 'spree/admin/themes/theme_preview_image', theme: theme, css_class: 'border rounded-lg w-full' %></div>- <div class="d-flex flex-column ml-3 w-80">+ <div class="flex flex-col ml-6 w-80"><strong><%= theme.name %></strong><p class="mb-0 mt-1">- <span class="text-muted">+ <span class="text-gray-600"><%= Spree.t(:updated_at) %>:<%= spree_time_ago(theme.updated_at) %></span>@@ -36,17 +36,17 @@</td><td class="w-20"><% if theme.ready? %>- <div class="d-flex justify-content-end w-100">- <%= 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="flex justify-end w-full gap-2">+ <%= link_to Spree.t('actions.publish'), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light', data: { turbo_method: :put } unless theme.default? %><%= dropdown do %>- <%= dropdown_toggle class: 'btn-light btn-sm h-100' do %>+ <%= dropdown_toggle class: 'btn-light btn-sm h-full' do %><%= icon('dots-vertical', class: 'mr-0') %><% end %><%= dropdown_menu do %><%= link_to_edit theme, class: 'dropdown-item', data: { turbo_prefetch: false } %><%= link_to_with_icon 'copy', Spree.t(:clone), spree.clone_admin_theme_path(theme), class: 'dropdown-item', data: { turbo_method: :post } %><% unless theme.default? %>- <%= link_to_delete(theme, icon: 'trash', class: 'dropdown-item btn-danger shadow-none') if can?(:delete, theme) %>+ <%= link_to_delete(theme, icon: 'trash', class: 'dropdown-item text-red-600 hover:bg-red-100 shadow-none') if can?(:delete, theme) %><% end %><% end %><% end %>diff --git a/admin/app/views/spree/admin/themes/_theme_preview_image.html.erb b/admin/app/views/spree/admin/themes/_theme_preview_image.html.erbindex 6d4cd3094e..0cda51820d 100644--- a/admin/app/views/spree/admin/themes/_theme_preview_image.html.erb+++ b/admin/app/views/spree/admin/themes/_theme_preview_image.html.erb@@ -1,6 +1,6 @@<% width ||= 120 %><% height ||= 72 %>-<% css_class ||= 'img-thumbnail border-0' %>+<% css_class ||= '' %><% if theme.screenshot.attached? && theme.screenshot.variable? %><%= image_tag(spree_image_url(theme.screenshot, width: width, height: height), class: css_class, loading: :lazy) %>@@ -11,7 +11,7 @@loading: :lazy) %><% else %>- <div class="rounded bg-light text-muted d-flex align-items-center justify-content-center img-fluid" style="height: <%= height %>px">- <%= icon('camera-off', class: 'text-muted opacity-50') %>+ <div class="rounded-md bg-gray-25 text-gray-600 flex items-center justify-center img-fluid" style="height: <%= height %>px">+ <%= icon('camera-off', class: 'text-gray-600 opacity-50') %></div><% end %>\ No newline at end of filediff --git a/admin/app/views/spree/admin/themes/edit.html.erb b/admin/app/views/spree/admin/themes/edit.html.erbindex fa2fa5a3dd..a12ee8883f 100644--- a/admin/app/views/spree/admin/themes/edit.html.erb+++ b/admin/app/views/spree/admin/themes/edit.html.erb@@ -1,7 +1,7 @@-<div class="d-none d-md-block">+<div class="hidden md:block"><div class="desktopLiveView" data-page-builder-target="previewContainer"><div class="embed-responsive embed-responsive-4by3 bg-transparent">- <iframe class="embed-responsive-item border border-gray bg-transparent rounded"+ <iframe class="embed-responsive-item border border-gray-200 bg-transparent rounded-xl"data-page-builder-target="iframe"data-action="load->page-builder#initializeVisualEditor"id="page-builder-preview"diff --git a/admin/app/views/spree/admin/themes/index.html.erb b/admin/app/views/spree/admin/themes/index.html.erbindex f4b40e70a2..9fdb6d5261 100644--- a/admin/app/views/spree/admin/themes/index.html.erb+++ b/admin/app/views/spree/admin/themes/index.html.erb@@ -16,12 +16,12 @@<br /><% unless current_store.default_custom_domain&.active? %>- <div class="alert alert-info d-inline-flex align-items-center py-2 pr-2">- <div class="d-flex align-items-center">+ <div class="alert alert-info inline-flex items-center py-2 pr-2">+ <div class="flex items-center"><span>You don't have domain connected to your store</span>- <%= link_to 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-secondary ml-3' %>+ <%= link_to 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-secondary ml-4' %></div></div><% end %>@@ -54,14 +54,14 @@<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3"><% available_themes.each do |theme| %>- <div class="col mb-4">- <div class="card hover-light">+ <div class="col mb-6">+ <div class="card hover:bg-gray-25"><% if theme.preview_image_url.present? %><%= image_tag theme.preview_image_url, class: 'card-img-top' %><% end %><div class="card-body"><h5 class="card-title"><%= theme.display_name %></h5>- <p class="text-muted">+ <p class="text-gray-600">by <%= link_to theme.authors.join(', '), theme.website, target: '_blank' %></p><p><%= theme.description %></p>diff --git a/admin/app/views/spree/admin/translations/edit.html.erb b/admin/app/views/spree/admin/translations/edit.html.erbindex b6bc647482..dcbb50b328 100644--- a/admin/app/views/spree/admin/translations/edit.html.erb+++ b/admin/app/views/spree/admin/translations/edit.html.erb@@ -27,9 +27,9 @@<% end %><% else %><div class="drawer-body">- <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">- <%= icon 'language', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>- <p class="text-center"><%= Spree.t('admin.translations.no_translations_configured') %></p>+ <div class="text-gray-600 p-12 flex items-center w-full justify-center flex-col">+ <%= icon 'language', class: 'mb-5 opacity-50 text-4xl' %>+ <p class="text-center mb-3"><%= Spree.t('admin.translations.no_translations_configured') %></p><% if can?(:edit, current_store) %><%= link_to_with_icon 'settings', Spree.t('admin.translations.configure_store'), spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } %>diff --git a/admin/app/views/spree/admin/translations/option_types/_form.html.erb b/admin/app/views/spree/admin/translations/option_types/_form.html.erbindex 345a116e39..553b899e66 100644--- a/admin/app/views/spree/admin/translations/option_types/_form.html.erb+++ b/admin/app/views/spree/admin/translations/option_types/_form.html.erb@@ -5,7 +5,7 @@<% end %><% if resource.option_values.any? %>- <tr class="bg-light">+ <tr class="bg-gray-25"><th colspan="3"><%= Spree.t(:option_values) %></th></tr>@@ -14,7 +14,7 @@<tr><td><%= Spree.t(field) %></td><td><%= ff.object.send(field) %></td>- <td><%= ff.text_field "#{field}_#{locale}", class: 'form-control' %></td>+ <td><%= ff.text_field "#{field}_#{locale}", class: 'form-input' %></td></tr><% end %><% end %>diff --git a/admin/app/views/spree/admin/translations/products/_form.html.erb b/admin/app/views/spree/admin/translations/products/_form.html.erbindex 5fc75ee61b..6f8f39fa81 100644--- a/admin/app/views/spree/admin/translations/products/_form.html.erb+++ b/admin/app/views/spree/admin/translations/products/_form.html.erb@@ -11,4 +11,4 @@<% end %><% end %>-<div class="pb-5"></div>\ No newline at end of file+<div class="pb-12"></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/user_passwords/edit.html.erb b/admin/app/views/spree/admin/user_passwords/edit.html.erbindex 071b6e98da..8bf3918468 100644--- a/admin/app/views/spree/admin/user_passwords/edit.html.erb+++ b/admin/app/views/spree/admin/user_passwords/edit.html.erb@@ -1,21 +1,21 @@<% content_for(:title, Spree.t(:forgot_password)) %>-<h1 class="mb-3 font-weight-light"><%= Spree.t(:change_password) %></h1>+<h1 class="mb-4 font-light"><%= Spree.t(:change_password) %></h1><%= form_for(resource, as: resource_name, url: password_path(:admin_user), html: { method: :put }, data: { turbo_frame: :_top, turbo: false }) do |f| %><%= render partial: 'spree/admin/shared/error_messages', locals: { target: resource } %><%= f.hidden_field :reset_password_token %>- <div class="form-group mb-3">+ <div class="form-group mb-4"><%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %><% if @minimum_password_length %><em>(<%= @minimum_password_length %> characters minimum)</em><% end %>- <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>+ <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'form-input form-input-lg', min: @minimum_password_length %></div>- <div class="form-group mb-3">+ <div class="form-group mb-4"><%= f.label :password_confirmation, Spree.t(:confirm_password), required: true, class: 'form-label' %>- <%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>+ <%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'form-input form-input-lg', min: @minimum_password_length %></div><%= render 'spree/admin/shared/devise/links', f: f %>- <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>+ <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-full' %><% end %>diff --git a/admin/app/views/spree/admin/user_passwords/new.html.erb b/admin/app/views/spree/admin/user_passwords/new.html.erbindex 81347cd14c..3c920b9d7e 100644--- a/admin/app/views/spree/admin/user_passwords/new.html.erb+++ b/admin/app/views/spree/admin/user_passwords/new.html.erb@@ -1,12 +1,12 @@<% content_for(:title, Spree.t(:forgot_password)) %>-<h1 class="mb-3 font-weight-light"><%= Spree.t(:forgot_password) %></h1>+<h1 class="mb-4 font-light"><%= Spree.t(:forgot_password) %></h1><%= form_for(resource, as: resource_name, url: password_path(:admin_user), data: { turbo_frame: :_top }) do |f| %>- <div class="form-group mb-3">+ <div class="form-group mb-4"><%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>- <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: '[email protected]', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>+ <%= f.email_field :email, required: true, class: 'form-input form-input-lg', placeholder: '[email protected]', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %></div><%= render 'spree/admin/shared/devise/links', f: f %>- <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>+ <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-full' %><% end %>diff --git a/admin/app/views/spree/admin/user_sessions/new.html.erb b/admin/app/views/spree/admin/user_sessions/new.html.erbindex 69bcc8077e..4e77b96150 100644--- a/admin/app/views/spree/admin/user_sessions/new.html.erb+++ b/admin/app/views/spree/admin/user_sessions/new.html.erb@@ -1,16 +1,16 @@<% content_for(:title, Spree.t(:login)) %>-<h1 class="mb-3 font-weight-light">Welcome back</h1>+<h1 class="mb-4 font-light">Welcome back</h1><%= form_for resource, as: resource_name, url: session_path(resource_name), data: { controller: 'enable-button', turbo: false } do |f| %>- <div class="form-group mb-3">+ <div class="form-group mb-4"><%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>- <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: '[email protected]', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>+ <%= f.email_field :email, required: true, class: 'form-input form-input-lg', placeholder: '[email protected]', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %></div>- <div class="form-group mb-3">+ <div class="form-group mb-4"><%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>- <%= f.password_field :password, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: '********', autocomplete: 'current-password' %>+ <%= f.password_field :password, required: true, class: 'form-input form-input-lg', placeholder: '********', autocomplete: 'current-password' %></div><%= render 'spree/admin/shared/devise/links', f: f %>- <%= turbo_save_button_tag Spree.t(:login), class: 'btn btn-primary btn-lg w-100' %>+ <%= turbo_save_button_tag Spree.t(:login), class: 'btn btn-primary btn-lg w-full' %><% end %>diff --git a/admin/app/views/spree/admin/users/_billing.html.erb b/admin/app/views/spree/admin/users/_billing.html.erbindex 4143d9c095..a4475e191a 100644--- a/admin/app/views/spree/admin/users/_billing.html.erb+++ b/admin/app/views/spree/admin/users/_billing.html.erb@@ -1,5 +1,5 @@<div class="card" id="user-bill-address" data-controller="reveal">- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:billing_address) %></h5><% if @user.billing_address.present? %>@@ -22,7 +22,7 @@<% if @user.billing_address %><div data-reveal-target="item"><% if @user.billing_address == @user.shipping_address %>- <div class="text-muted">+ <div class="text-gray-600"><%= Spree.t(:same_as_shipping_address) %></div><% else %>@@ -52,7 +52,7 @@<% end %><% else %><%= form_for [:admin, @user], as: :user, url: spree.admin_user_path(@user), method: :put, data: { controller: 'auto-submit' } do |f| %>- <div class="custom-control custom-radio mb-4">+ <div class="custom-control custom-radio mb-6"><%= f.radio_button :bill_address_id, @user.ship_address_id,checked: false,id: 'user_bill_address_id',@@ -69,7 +69,7 @@</div><% else %><%= turbo_frame_tag :new_address_billing do %>- <div class="text-center p-5 text-muted">+ <div class="text-center p-12 text-gray-600"><%= Spree.t(:not_available) %></div><% end %>diff --git a/admin/app/views/spree/admin/users/_details.html.erb b/admin/app/views/spree/admin/users/_details.html.erbindex 5123feba14..75756c68a2 100644--- a/admin/app/views/spree/admin/users/_details.html.erb+++ b/admin/app/views/spree/admin/users/_details.html.erb@@ -1,6 +1,6 @@-<div class="card mb-4" id="user-details">+<div class="card mb-6" id="user-details"><%= turbo_frame_tag :edit_user do %>- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5>@@ -8,30 +8,30 @@</div><div class="card-body p-0"><ul class="list-group list-group-flush">- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:email) %><span><%= @user.email %><%= clipboard_component(@user.email) %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:phone) %><span><%= @user.phone.presence || Spree.t(:not_available) %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:name) %><span><%= customer_full_name(@user) %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:email_marketing) %><%= active_badge(@user.accepts_email_marketing?) %></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:tags) %><span><% @user.tag_list.each do |tag| %>@@ -39,7 +39,7 @@<% end %></span></li>- <li class="list-group-item d-flex justify-content-between align-items-center">+ <li class="list-group-item flex justify-between items-center"><%= Spree.t(:roles) %><span><% @user.spree_roles.each do |role| %>diff --git a/admin/app/views/spree/admin/users/_filters.html.erb b/admin/app/views/spree/admin/users/_filters.html.erbindex 489cb6f63d..53a5a9ff0c 100644--- a/admin/app/views/spree/admin/users/_filters.html.erb+++ b/admin/app/views/spree/admin/users/_filters.html.erb@@ -1,5 +1,5 @@<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters dialog"} do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-col lg:flex-row gap-2"><%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %><%= render "spree/admin/shared/calendar_range_picker",@@ -8,7 +8,7 @@date_from_value: params.dig(:q, :created_at_gt),date_to_value: params.dig(:q, :created_at_lt) %>- <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>+ <%= button_tag type: 'button', class: 'btn btn-light flex items-center', data: { action: 'dialog#open' } do %><%= icon "adjustments", class: "mr-1" %><%= Spree.t("admin.filters") %><% end %>@@ -19,11 +19,11 @@<div class="drawer-body"><div class="form-group"><%= f.label :bill_address_firstname_i_cont_any, Spree.t(:first_name) %>- <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>+ <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-input", data: { filters_target: :input } %></div><div class="form-group"><%= f.label :bill_address_lastname_eq, Spree.t(:last_name) %>- <%= f.text_field :bill_address_lastname_eq, class: "form-control", data: { filters_target: :input } %>+ <%= f.text_field :bill_address_lastname_eq, class: "form-input", data: { filters_target: :input } %></div><div class="form-group"><%= f.label :addresses_country_name_eq, Spree.t(:location) %>@@ -31,7 +31,7 @@active_option: params.dig(:q, :addresses_country_name_eq),options: Spree::Country.all.to_tom_select_json,value_field: :name,- select_class: "w-100",+ select_class: "w-full",select_data: {filters_target: "input",} %>@@ -43,7 +43,7 @@options: user_tags_json_array,multiple: true,value_field: :name,- select_class: "w-100",+ select_class: "w-full",select_data: {filters_target: "input",} %>@@ -53,7 +53,7 @@<%= f.select :accepts_email_marketing_eq,options_for_select([["Yes", true], ["No", false]], params.dig(:q, :accepts_email_marketing_eq)),{ include_blank: true },- { class: "custom-select", data: { filters_target: :input } } %>+ { class: "form-select", data: { filters_target: :input } } %></div><div class="form-group"><%= f.label :spree_roles_name_in, Spree.t(:roles) %>@@ -62,7 +62,7 @@options: user_roles_json_array,multiple: true,value_field: :name,- select_class: "w-100",+ select_class: "w-full",select_data: {filters_target: "input",} %>diff --git a/admin/app/views/spree/admin/users/_form.html.erb b/admin/app/views/spree/admin/users/_form.html.erbindex ada9ee151a..7e2ca873a7 100644--- a/admin/app/views/spree/admin/users/_form.html.erb+++ b/admin/app/views/spree/admin/users/_form.html.erb@@ -1,5 +1,5 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body">- <%= render 'spree/admin/users/form_fields', f: f %>+ <%= render 'spree/admin/users/form_fields', f: f %></div></div>\ No newline at end of filediff --git a/admin/app/views/spree/admin/users/_form_fields.html.erb b/admin/app/views/spree/admin/users/_form_fields.html.erbindex db7e9e84dc..15f6b82c14 100644--- a/admin/app/views/spree/admin/users/_form_fields.html.erb+++ b/admin/app/views/spree/admin/users/_form_fields.html.erb@@ -4,7 +4,7 @@<%= f.spree_text_field :phone %><div class="form-group"><%= f.label :tag_list, Spree.t(:tags) %>- <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-100', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>+ <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-full', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %></div><% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %><%= f.spree_select :spree_role_ids,diff --git a/admin/app/views/spree/admin/users/_last_order.html.erb b/admin/app/views/spree/admin/users/_last_order.html.erbindex ebd78d952e..05e051777f 100644--- a/admin/app/views/spree/admin/users/_last_order.html.erb+++ b/admin/app/views/spree/admin/users/_last_order.html.erb@@ -1,5 +1,5 @@<% if @last_order.present? %>- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t('admin.user.last_order_placed') %>@@ -9,19 +9,19 @@<% cache spree_base_cache_scope.call(@last_order) do %><ul class="list-group list-group-flush"><li class="list-group-item">- <div class="row">- <div class="col-lg-9">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-9"><p class="mb-1">- <%= link_to @last_order.number, spree.edit_admin_order_path(@last_order), class: 'font-weight-bold' %>+ <%= link_to @last_order.number, spree.edit_admin_order_path(@last_order), class: 'font-bold' %><%= order_payment_state(@last_order, class: 'ml-2') %><%= order_shipment_state(@last_order, class: 'ml-2') %></p>- <span class="text-muted" data-controller="tooltip">+ <span class="text-gray-600" data-controller="tooltip"><%= spree_time_ago(@last_order.completed_at) %><%= tooltip(spree_time(@last_order.completed_at)) %></span></div>- <div class="col-lg-3 text-lg-right font-weight-bold">+ <div class="col-span-12 lg:col-span-3 text-lg-right font-bold"><%= @last_order.display_total %></div></div>diff --git a/admin/app/views/spree/admin/users/_last_order_line_item.html.erb b/admin/app/views/spree/admin/users/_last_order_line_item.html.erbindex 531d8d20a0..2473b7a009 100644--- a/admin/app/views/spree/admin/users/_last_order_line_item.html.erb+++ b/admin/app/views/spree/admin/users/_last_order_line_item.html.erb@@ -1,18 +1,18 @@<li class="list-group-item">- <div class="row">- <div class="col-8">- <%= link_to spree.edit_admin_product_path(line_item.product), class: 'd-flex text-decoration-none' do %>+ <div class="grid grid-cols-12 gap-4">+ <div class="col-span-8">+ <%= link_to spree.edit_admin_product_path(line_item.product), class: 'flex no-underline' do %><%= render 'spree/admin/shared/product_image', object: line_item.product %>- <span class="ml-3 text-dark">+ <span class="ml-6 text-gray-900"><strong><%= line_item.name %></strong><br /><%= line_item.options_text %></span><% end %></div>- <div class="col-2 text-lg-right">+ <div class="col-span-2 text-lg-right">x <%= line_item.quantity %></div>- <div class="col-2 text-lg-right">+ <div class="col-span-2 text-lg-right"><%= line_item.display_total %></div></div>diff --git a/admin/app/views/spree/admin/users/_lifetime_stats.html.erb b/admin/app/views/spree/admin/users/_lifetime_stats.html.erbindex 17116035c0..48e36d780a 100644--- a/admin/app/views/spree/admin/users/_lifetime_stats.html.erb+++ b/admin/app/views/spree/admin/users/_lifetime_stats.html.erb@@ -1,63 +1,52 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body">- <div class="row">- <div class="col-lg-4">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">- <span class="text-muted"><%= Spree.t('admin.amount_spent') %></span>- <span class="font-size-lg text-dark font-weight-bold mt-1">- <%= @user.display_lifetime_value %>- </span>- </div>+ <div class="grid grid-cols-2 lg:grid-cols-3 gap-6">+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t('admin.amount_spent') %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @user.display_lifetime_value %>+ </span></div>- <div class="col-lg-4">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">- <span class="text-muted"><%= Spree.t(:orders) %></span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">- <%= @user.completed_orders.count %>- </span>- </div>+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t(:orders) %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @user.completed_orders.count %>+ </span></div>- <div class="col-lg-4">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0">- <span class="text-muted"><%= Spree.t('admin.avg_order_value') %></span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">- <%= @user.display_average_order_value %>- </span>- </div>+ <div class="flex flex-col mb-6 lg:mb-0 gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t('admin.avg_order_value') %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @user.display_average_order_value %>+ </span></div>- </div>-- <hr />- <div class="row">- <div class="col-lg-4">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">- <span class="text-muted"><%= Spree.t(:store_credits) %></span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">- <%= Spree::Money.new(@user.total_available_store_credit(current_currency, current_store), currency: current_currency) %>+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t(:store_credits) %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= Spree::Money.new(@user.total_available_store_credit(current_currency, current_store), currency: current_currency) %>+ </span>+ <% if can?(:create, Spree::StoreCredit) %>+ <span>+ <%= link_to_with_icon 'plus', Spree.t(:add_store_credit), spree.new_admin_user_store_credit_path(@user), class: 'btn btn-secondary btn-sm' %></span>- </div>+ <% end %></div>- <div class="col-lg-4">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">- <span class="text-muted"><%= Spree.t(:created_at) %></span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">- <%= spree_time(@user.created_at) %>- </span>- </div>+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t(:created_at) %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= spree_time(@user.created_at) %>+ </span></div><% if @visits_count.present? %>- <div class="col-lg-4">- <div class="d-flex justify-content-center flex-column mb-3 mb-lg-0 border-right">- <span class="text-muted"><%= Spree.t(:visits) %></span>- <span class="font-size-lg text-dark font-weight-bold mt-1 me-3">- <%= @visits_count %>- </span>- </div>+ <div class="flex flex-col mb-6 lg:mb-0 border-r gap-2">+ <span class="text-sm text-gray-500"><%= Spree.t(:visits) %></span>+ <span class="text-lg text-gray-900 font-bold">+ <%= @visits_count %>+ </span></div><% end %></div>diff --git a/admin/app/views/spree/admin/users/_shipping.html.erb b/admin/app/views/spree/admin/users/_shipping.html.erbindex 4e976bb8f2..ef4bc9f8f3 100644--- a/admin/app/views/spree/admin/users/_shipping.html.erb+++ b/admin/app/views/spree/admin/users/_shipping.html.erb@@ -1,5 +1,5 @@-<div class="card mb-4" id="user-ship-address">- <div class="card-header d-flex align-items-center justify-content-between">+<div class="card mb-6" id="user-ship-address">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:shipping_address) %></h5><% if @user.shipping_address.present? %>@@ -18,13 +18,13 @@<% if @user.shipping_address %><%= turbo_frame_tag :edit_address_shipping do %><%= render 'spree/admin/shared/map', map_object: @user.ship_address, label: customer_full_name(@user) || @user.email %>- <div class="mt-3">+ <div class="mt-6"><%= render 'spree/admin/shared/address', address: @user.shipping_address %></div><% end %><% else %><%= turbo_frame_tag :new_address_shipping do %>- <div class="text-center p-5 text-muted">+ <div class="text-center p-12 text-gray-600"><%= Spree.t(:not_available) %></div><% end %>diff --git a/admin/app/views/spree/admin/users/_tabs.html.erb b/admin/app/views/spree/admin/users/_tabs.html.erbindex 38f89c1634..9065e56a35 100644--- a/admin/app/views/spree/admin/users/_tabs.html.erb+++ b/admin/app/views/spree/admin/users/_tabs.html.erb@@ -1,5 +1,5 @@<div data-controller="tabs">- <ul class="nav nav-pills mb-3" role="tablist">+ <ul class="nav nav-pills mb-4" role="tablist"><% if spree.respond_to?(:admin_user_visits_path) %><li class="nav-item" role="presentation"><a class="nav-link active" id="pills-overview-tab" data-tabs-target="tab" data-action="click->tabs#select" role="tab" aria-controls="pills-overview" aria-selected="true">Timeline</a>@@ -29,13 +29,13 @@</ul><% if spree.respond_to?(:admin_user_visits_path) %>- <div data-tabs-target="panel" id="pills-overview" role="tabpanel" aria-labelledby="pills-overview" class="pt-3 animate__animated animate__fadeIn">+ <div data-tabs-target="panel" id="pills-overview" role="tabpanel" aria-labelledby="pills-overview" class="pt-4 animate-fade-in"><%= turbo_frame_tag :user_visits, src: spree.admin_user_visits_path(@user), target: '_top' %></div><% end %><% if can?(:read, Spree::Order) %>- <div data-tabs-target="panel" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2" class="animate__animated animate__fadeIn" <%= 'hidden' if spree.respond_to?(:admin_user_visits_path) %>>+ <div data-tabs-target="panel" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2" class="animate-fade-in" <%= 'hidden' if spree.respond_to?(:admin_user_visits_path) %>><div class="card-lg"><%= turbo_frame_tag :orders_list, src: spree.admin_user_orders_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>@@ -43,7 +43,7 @@</div></div>- <div data-tabs-target="panel" id="pills-checkouts" role="tabpanel" aria-labelledby="pills-checkouts" hidden class="animate__animated animate__fadeIn">+ <div data-tabs-target="panel" id="pills-checkouts" role="tabpanel" aria-labelledby="pills-checkouts" hidden class="animate-fade-in"><div class="card-lg"><%= turbo_frame_tag :orders_list, src: spree.admin_user_checkouts_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>@@ -53,7 +53,7 @@<% end %><% if spree.respond_to?(:admin_user_gift_cards_path) && can?(:read, Spree::GiftCard) %>- <div data-tabs-target="panel" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards" hidden class="animate__animated animate__fadeIn">+ <div data-tabs-target="panel" id="pills-gift-cards" role="tabpanel" aria-labelledby="pills-gift-cards" hidden class="animate-fade-in"><div class="card-lg"><%= turbo_frame_tag :gift_cards_list, src: spree.admin_user_gift_cards_path(@user, frame_name: :gift_cards_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>@@ -63,7 +63,7 @@<% end %><% if can?(:read, Spree::StoreCredit) %>- <div data-tabs-target="panel" id="pills-store-credits" role="tabpanel" aria-labelledby="pills-store-credits" hidden class="animate__animated animate__fadeIn">+ <div data-tabs-target="panel" id="pills-store-credits" role="tabpanel" aria-labelledby="pills-store-credits" hidden class="animate-fade-in"><div class="card-lg"><%= turbo_frame_tag :store_credits_list, src: spree.admin_user_store_credits_path(@user, frame_name: :store_credits_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %><%= render 'spree/admin/shared/spinner' %>diff --git a/admin/app/views/spree/admin/users/_user.html.erb b/admin/app/views/spree/admin/users/_user.html.erbindex 4ca8362aa9..1b9104649d 100644--- a/admin/app/views/spree/admin/users/_user.html.erb+++ b/admin/app/views/spree/admin/users/_user.html.erb@@ -2,17 +2,17 @@<td class="pr-0 w-5"><%= bulk_operations_checkbox(user) %></td>- <td class='w-50 text-nowrap py-0 pl-1 pr-0'>+ <td class='w-1/2 whitespace-nowrap py-0 pl-1 pr-0'><%= render 'spree/admin/shared/user', user: user %></td><td class="cursor-pointer" data-action="click->row-link#openLink"><%= active_badge(user.accepts_email_marketing?) %></td>- <td class="w-25 cursor-pointer" data-action="click->row-link#openLink">+ <td class="w-1/4 cursor-pointer" data-action="click->row-link#openLink"><%= customer_location_flag(user) %><%= customer_location(user) %></td>- <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>- <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>- <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= spree_time(user.created_at) %></td>+ <td class='w-10 whitespace-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>+ <td class='w-10 whitespace-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>+ <td class='w-10 whitespace-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= spree_time(user.created_at) %></td></tr>diff --git a/admin/app/views/spree/admin/users/bulk_modal.html.erb b/admin/app/views/spree/admin/users/bulk_modal.html.erbindex 3d166f3fe9..782763a4e8 100644--- a/admin/app/views/spree/admin/users/bulk_modal.html.erb+++ b/admin/app/views/spree/admin/users/bulk_modal.html.erb@@ -1,10 +1,10 @@<%= turbo_frame_tag :bulk_dialog do %><%= dialog_header(@title, 'bulk-dialog') %><div class="dialog-body overflow-visible">- <p><%= @body %></p>+ <p class="mb-3"><%= @body %></p><% if params[:kind] == 'add_tags' || params[:kind] == 'remove_tags' %>- <%= tom_select_tag 'tags', multiple: true, class: 'w-100', options: user_tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %>+ <%= tom_select_tag 'tags', multiple: true, class: 'w-full', options: user_tags_json_array, required: true, value_field: :name, create: params[:kind] == 'add_tags' %><% end %></div><div class="dialog-footer">diff --git a/admin/app/views/spree/admin/users/edit.html.erb b/admin/app/views/spree/admin/users/edit.html.erbindex 7d075e9149..cf9843c07d 100644--- a/admin/app/views/spree/admin/users/edit.html.erb+++ b/admin/app/views/spree/admin/users/edit.html.erb@@ -1,5 +1,5 @@<%= turbo_frame_tag :edit_user do %>- <div class="card-header d-flex align-items-center justify-content-between">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:details) %></h5>diff --git a/admin/app/views/spree/admin/users/index.html.erb b/admin/app/views/spree/admin/users/index.html.erbindex 5ca99f6dc1..c3257b9700 100644--- a/admin/app/views/spree/admin/users/index.html.erb+++ b/admin/app/views/spree/admin/users/index.html.erb@@ -19,7 +19,7 @@<div data-controller="bulk-operation bulk-dialog" data-action="keydown.esc->bulk-operation#cancel" tabindex="0"><%= form_tag spree.admin_users_path, data: { 'bulk-operation-target': 'form' } do %><%= render 'spree/admin/shared/bulk_modal' %>- <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">+ <div id="bulk-panel" class="hidden" data-bulk-operation-target="panel"><div class="bulk-panel-container"><%= bulk_operations_counter %>diff --git a/admin/app/views/spree/admin/users/show.html.erb b/admin/app/views/spree/admin/users/show.html.erbindex 920691475b..d497f52121 100644--- a/admin/app/views/spree/admin/users/show.html.erb+++ b/admin/app/views/spree/admin/users/show.html.erb@@ -1,7 +1,7 @@<% content_for :page_title do %><%= page_header_back_button spree.admin_users_path, @user %><%= customer_full_name(@user) || @user.email %>- <span class="font-size-base font-weight-normal">+ <span class="text-base font-normal"><%= customer_location_flag(@user) %><%= customer_location(@user) %></span>@@ -17,14 +17,14 @@<% end %><% end %>-<div class="row">- <div class="col-lg-8 mb-4">+<div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-8 mb-6"><%= render 'spree/admin/users/lifetime_stats' %><%= render 'spree/admin/users/last_order' %><%= render 'spree/admin/users/tabs' %></div>- <div class="col-lg-4">+ <div class="col-span-12 lg:col-span-4"><%= render 'spree/admin/users/details' %><%= render 'spree/admin/users/shipping' %><%= render 'spree/admin/users/billing' %>diff --git a/admin/app/views/spree/admin/variants/_search_result.html.erb b/admin/app/views/spree/admin/variants/_search_result.html.erbindex 2f87ed8f14..70c70bd8b3 100644--- a/admin/app/views/spree/admin/variants/_search_result.html.erb+++ b/admin/app/views/spree/admin/variants/_search_result.html.erb@@ -1,14 +1,14 @@<div class="search-picker__option <% if variant.purchasable? || params[:all] %>cursor-pointer<% else %>opacity-50 disabled<% end %>" data-action="click->search-picker#toggle"><%= radio_button_tag "#{params[:param_name]}[variant_id]", variant.id, false, class: "custom-control-input", id: "ids_#{variant.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" }, disabled: !params[:all] && !variant.purchasable? %><label for="ids_<%= variant.id %>" class="pr-2 <% unless variant.purchasable? %>cursor-not-allowed<% end %>">- <div class="w-70 d-flex align-items-center">+ <div class="w-70 flex items-center"><div class="variant-image"><%= render 'spree/admin/shared/product_image', object: variant %></div>- <div class="ml-3 variant-info">+ <div class="ml-6 variant-info"><strong class="variant-name"><%= highlight(variant.name, params.dig(:q)) %></strong><% if variant.options_text.present? %>- <p class="text-muted my-1 font-size-sm">+ <p class="text-gray-600 my-1 text-sm"><%= variant.options_text %></p><% end %>@@ -18,7 +18,7 @@<% if params[:stock_location_id].present? %><% stock_item = variant.stock_items.find { |si| si.stock_location_id == params[:stock_location_id] } %><span><%= stock_item&.count_on_hand || 0 %> at location</span>- <% if stock_item&.backorderable? %> <span class="text-muted"><%= Spree.t(:backorderable) %></span><% end %>+ <% if stock_item&.backorderable? %> <span class="text-gray-600"><%= Spree.t(:backorderable) %></span><% end %><% else %><%= display_inventory(variant) %><% end %>diff --git a/admin/app/views/spree/admin/variants/_search_results.html.erb b/admin/app/views/spree/admin/variants/_search_results.html.erbindex 98d1d8406c..b5c98eee76 100644--- a/admin/app/views/spree/admin/variants/_search_results.html.erb+++ b/admin/app/views/spree/admin/variants/_search_results.html.erb@@ -2,7 +2,7 @@<% if variants.any? %><%= render collection: variants, partial: 'spree/admin/variants/search_result', as: :variant %><% else %>- <p class="text-muted text-center py-5">+ <p class="text-gray-600 text-center py-12"><%= Spree.t('admin.variants.search_results.no_variants') %></p><% end %>diff --git a/admin/app/views/spree/admin/variants/_variant.html.erb b/admin/app/views/spree/admin/variants/_variant.html.erbindex 95cd24dd90..7f08a32bcf 100644--- a/admin/app/views/spree/admin/variants/_variant.html.erb+++ b/admin/app/views/spree/admin/variants/_variant.html.erb@@ -5,12 +5,12 @@<% variant_url = spree.edit_admin_product_variant_path(variant.product, variant) %><% end %>- <%= link_to variant_url, id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'd-flex align-items-center justify-content-start text-decoration-none' do %>+ <%= link_to variant_url, id: spree_dom_id(variant), data: { turbo_permanent: true, turbo_frame: :_top }, class: 'flex items-center justify-start no-underline' do %><%= render "spree/admin/shared/product_image", object: variant %>- <div class="ml-3">+ <div class="ml-6"><strong><%= variant.name %></strong><% if !variant.is_master? && variant.options_text.present? %>- <p class="text-muted my-1 font-size-sm">+ <p class="text-gray-600 my-1 text-sm"><%= variant.options_text %></p><% end %>diff --git a/admin/app/views/spree/admin/variants/edit.html.erb b/admin/app/views/spree/admin/variants/edit.html.erbindex 285996c7e7..57b3d3762f 100644--- a/admin/app/views/spree/admin/variants/edit.html.erb+++ b/admin/app/views/spree/admin/variants/edit.html.erb@@ -4,8 +4,8 @@<% end %><%= form_for [:admin, @product, @variant] do |f| %>- <div class="row">- <div class="col-lg-6 offset-lg-3">+ <div class="grid grid-cols-12 gap-6">+ <div class="col-span-12 lg:col-span-6 lg:col-start-4"><%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %><%= render 'spree/admin/variants/form/basic', f: f %><%= render 'spree/admin/variants/form/pricing', f: f %>diff --git a/admin/app/views/spree/admin/variants/form/_basic.html.erb b/admin/app/views/spree/admin/variants/form/_basic.html.erbindex 1e29d037d7..5cd326d19d 100644--- a/admin/app/views/spree/admin/variants/form/_basic.html.erb+++ b/admin/app/views/spree/admin/variants/form/_basic.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:settings) %>diff --git a/admin/app/views/spree/admin/variants/form/_dimensions.html.erb b/admin/app/views/spree/admin/variants/form/_dimensions.html.erbindex 10a22dd53b..1bdc77d3a5 100644--- a/admin/app/views/spree/admin/variants/form/_dimensions.html.erb+++ b/admin/app/views/spree/admin/variants/form/_dimensions.html.erb@@ -1,19 +1,14 @@-<div class="row">- <div class="col-lg-6">- <%= f.spree_text_field :width, value: number_with_precision(f.object.width, precision: 2) %>- <%= f.spree_text_field :height, value: number_with_precision(f.object.height, precision: 2) %>- </div>-- <div class="col-lg-6">- <%= f.spree_text_field :depth, value: number_with_precision(f.object.depth, precision: 2) %>- <%= f.spree_select :dimensions_unit, options_for_select(dimension_units(current_store), f.object.dimensions_unit), { include_blank: false, label: Spree.t(:unit) } %>- </div>+<div class="grid grid-cols-2 gap-3">+ <%= f.spree_text_field :width, value: number_with_precision(f.object.width, precision: 2) %>+ <%= f.spree_text_field :height, value: number_with_precision(f.object.height, precision: 2) %>+ <%= f.spree_text_field :depth, value: number_with_precision(f.object.depth, precision: 2) %>+ <%= f.spree_select :dimensions_unit, options_for_select(dimension_units(current_store), f.object.dimensions_unit), { include_blank: false, label: Spree.t(:unit) } %></div><div class="form-group"><%= f.label :weight %>- <div class="form-control d-flex align-items-center py-0 focus-border focus-shadow">- <%= f.text_field :weight, value: number_with_precision(f.object.weight, precision: 2), class: 'form-control-plaintext pl-0' %>- <%= f.select :weight_unit, options_for_select(weight_units(current_store), f.object.weight_unit), { include_blank: false }, { class: 'form-control-plaintext w-auto border-left' } %>+ <div class="input-group">+ <%= f.text_field :weight, value: number_with_precision(f.object.weight, precision: 2), class: 'border-0 focus:ring-0 focus:outline-none grow rounded-lg text-base' %>+ <%= f.select :weight_unit, options_for_select(weight_units(current_store), f.object.weight_unit), { include_blank: false }, { class: 'border-0 focus:ring-0 focus:outline-none rounded-lg text-base' } %></div></div>diff --git a/admin/app/views/spree/admin/variants/form/_inventory.html.erb b/admin/app/views/spree/admin/variants/form/_inventory.html.erbindex cdec6f739f..4c3b821cfe 100644--- a/admin/app/views/spree/admin/variants/form/_inventory.html.erb+++ b/admin/app/views/spree/admin/variants/form/_inventory.html.erb@@ -1,15 +1,15 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:inventory) %></h5></div>- <div class="card-body p-0" data-controller="reveal" data-reveal-hidden-class="d-none">- <div class="mb-4 m-3">+ <div class="card-body p-0" data-controller="reveal" data-reveal-hidden-class="hidden!">+ <div class="p-3"><%= f.spree_check_box :track_inventory, data: { action: 'change->reveal#toggle' } %></div>- <table class="table <%= 'd-none' unless f.object.track_inventory? %>" data-reveal-target="item">+ <table class="table <%= 'hidden!' unless f.object.track_inventory? %>" data-reveal-target="item"><thead><tr><th scope="col"><%= Spree.t(:stock_location) %></th>@@ -30,19 +30,16 @@<%= link_to stock_item_form.object.stock_location.name, spree.edit_admin_stock_location_path(stock_item_form.object.stock_location) %></td><td class="w-20">- <%= stock_item_form.number_field :count_on_hand, min: 0, class: 'form-control', disabled: !can?(:manage, stock_item_form.object) %>+ <%= stock_item_form.spree_number_field :count_on_hand, min: 0, disabled: !can?(:manage, stock_item_form.object), label: false %></td><td class="w-40">- <div class="custom-control custom-checkbox">- <%= stock_item_form.check_box :backorderable, class: 'custom-control-input', disabled: !can?(:manage, stock_item_form.object) %>- <%= stock_item_form.label :backorderable, Spree.t(:continue_selling_when_out_of_stock),class: 'custom-control-label' %>- </div>+ <%= stock_item_form.spree_check_box :backorderable, disabled: !can?(:manage, stock_item_form.object), label: Spree.t(:continue_selling_when_out_of_stock) %></td></tr><% end %></tbody></table>- <div class="card-footer border-top text-center bg-light text-muted">+ <div class="card-footer border-t text-center bg-gray-25 text-gray-600 py-2 text-sm"><%= Spree.t('admin.variants_form.stock_locations_link', link: spree.admin_stock_locations_path).html_safe %></div></div>diff --git a/admin/app/views/spree/admin/variants/form/_pricing.html.erb b/admin/app/views/spree/admin/variants/form/_pricing.html.erbindex a79827706b..1bc941c5b5 100644--- a/admin/app/views/spree/admin/variants/form/_pricing.html.erb+++ b/admin/app/views/spree/admin/variants/form/_pricing.html.erb@@ -1,5 +1,5 @@-<div class="card mb-4" data-product-form-target="pricesForm">- <div class="card-header d-flex align-items-center justify-content-between">+<div class="card mb-6" data-product-form-target="pricesForm">+ <div class="card-header flex items-center justify-between"><h5 class="card-title"><%= Spree.t(:pricing) %></h5>@@ -29,16 +29,16 @@<tr><td><%= price_form.object.currency %></td><td>- <div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container d-flex">- <%= price_form.text_field :amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object), value: price_form.object.amount.present? ? Spree::Money.new(price_form.object.amount, currency: price_form.object.currency, symbol: '').to_s : '' %>- <span><%= currency_symbol(price_form.object.currency) %></span>- </div>+ <%= price_form.spree_text_field :amount, disabled: !can?(:manage, price_form.object),+ value: price_form.object.amount.present? ? Spree::Money.new(price_form.object.amount, currency: price_form.object.currency, symbol: '').to_s : '',+ append: currency_symbol(price_form.object.currency),+ label: false %></td><td>- <div class="form-control align-items-center py-0 focus-shadow focus-border mr-2 price-input-container d-flex">- <%= price_form.text_field :compare_at_amount, class: 'form-control-plaintext px-0', disabled: !can?(:manage, price_form.object), value: price_form.object.compare_at_amount.present? ? Spree::Money.new(price_form.object.compare_at_amount, currency: price_form.object.currency, symbol: '').to_s : '' %>- <span><%= currency_symbol(price_form.object.currency) %></span>- </div>+ <%= price_form.spree_text_field :compare_at_amount, disabled: !can?(:manage, price_form.object),+ value: price_form.object.compare_at_amount.present? ? Spree::Money.new(price_form.object.compare_at_amount, currency: price_form.object.currency, symbol: '').to_s : '',+ append: currency_symbol(price_form.object.currency),+ label: false %></td></tr><% end %>@@ -46,4 +46,3 @@</table></div></div>-diff --git a/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb b/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erbindex ed1957e4a5..50d4712675 100644--- a/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb+++ b/admin/app/views/spree/admin/webhooks_subscribers/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_settings) %>@@ -9,7 +9,7 @@<%= f.spree_check_box :active %></div></div>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>@@ -18,7 +18,7 @@<div class="card-body" data-controller="reveal"><div class="form-group"><div>- <div class="custom-control custom-radio mb-3">+ <div class="custom-control custom-radio mb-12"><%= radio_button_tag :subscribe_to_all_events, true,subscribe_to_all_events?,{@@ -34,7 +34,7 @@<%= label_tag :subscribe_to_all_events_false, Spree.t('admin.webhooks_subscribers.select_events'), class: 'custom-control-label' %><div data-reveal-target="item" class="<%= subscribe_to_all_events? ? 'hidden' : '' %>">- <div class="bg-light rounded-lg p-3 mt-3">+ <div class="bg-gray-25 rounded-xl p-12 mt-12"><% @supported_events.each do |event| %><div class="form-group"><div class="custom-control custom-switch">@@ -45,7 +45,7 @@true,nil %>- <%= f.label resource_name, class: 'custom-control-label w-100' do %>+ <%= f.label resource_name, class: 'custom-control-label w-full' do %><%= Spree.t("#{resource_name.to_s.pluralize}") %><p class="gap-2 mb-0 mt-1"><% event.last.each do |event| %>diff --git a/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erb b/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erbindex 71b9a703fe..719dd44d7b 100644--- a/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erb+++ b/admin/app/views/spree/admin/webhooks_subscribers/_table_row.html.erb@@ -1,9 +1,9 @@<tr id="<%= spree_dom_id webhooks_subscriber %>" data-controller="row-link" class="cursor-pointer">- <td class="w-40 text-wrap" data-action="click->row-link#openLink">+ <td class="w-40 whitespace-normal" data-action="click->row-link#openLink"><%= webhooks_subscriber.url %></td><td class="w-5" data-action="click->row-link#openLink"><%= active_badge(webhooks_subscriber.active) %></td>- <td class="w-30 text-wrap" data-action="click->row-link#openLink">+ <td class="w-30 whitespace-normal" data-action="click->row-link#openLink"><% webhooks_subscriber.subscriptions&.sort&.each do |subscription| %><span class="badge badge-light"><%= subscription %></span><% end %>@@ -12,7 +12,7 @@<% if webhooks_subscriber.latest_event_at %><%= spree_time(webhooks_subscriber.latest_event_at) %><% else %>- <span class="text-muted"><%= Spree.t(:not_available) %></span>+ <span class="text-gray-600"><%= Spree.t(:not_available) %></span><% end %></td><td class="w-15">diff --git a/admin/app/views/spree/admin/webhooks_subscribers/show.html.erb b/admin/app/views/spree/admin/webhooks_subscribers/show.html.erbindex 23d22f181e..9e7033fa59 100644--- a/admin/app/views/spree/admin/webhooks_subscribers/show.html.erb+++ b/admin/app/views/spree/admin/webhooks_subscribers/show.html.erb@@ -11,16 +11,16 @@<%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_webhooks_subscriber_path(@webhooks_subscriber), class: 'btn btn-light' %><% end %>-<ul class="list-group bg-white mb-4 rounded-lg">- <li class="list-group-item d-flex justify-content-between">- <strong class="text-uppercase"><%= Spree.t(:url) %></strong>- <%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url, class: 'text-blue text-decoration-none' %>+<ul class="list-group bg-white mb-6 rounded-xl">+ <li class="list-group-item flex justify-between">+ <strong class="uppercase"><%= Spree.t(:url) %></strong>+ <%= external_link_to @webhooks_subscriber.url, @webhooks_subscriber.url, class: 'text-blue-500 no-underline' %></li>- <li class="list-group-item d-flex justify-content-between">+ <li class="list-group-item flex justify-between"><strong><%= Spree.t(:active) %></strong><%= active_badge(@webhooks_subscriber.active) %></li>- <li class="list-group-item d-flex justify-content-between">+ <li class="list-group-item flex justify-between"><strong><%= Spree.t('admin.webhooks_subscribers.subscriptions') %></strong><div><% @webhooks_subscriber.subscriptions&.sort&.each do |subscription| %>@@ -30,7 +30,7 @@</li></ul>-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t('admin.webhooks_subscribers.webhooks_events') %>diff --git a/admin/app/views/spree/admin/zones/_country_members.html.erb b/admin/app/views/spree/admin/zones/_country_members.html.erbindex 33fe95ea3e..478ec77f68 100644--- a/admin/app/views/spree/admin/zones/_country_members.html.erb+++ b/admin/app/views/spree/admin/zones/_country_members.html.erb@@ -1,5 +1,5 @@<div id="country_members">- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:countries) %>@@ -9,7 +9,7 @@<div class="card-body"><div class="form-group"><%= zone_form.label :country_ids, Spree.t(:countries) %>- <%= tom_select_tag 'zone[country_ids]', multiple: true, class: 'w-100', options: Spree::Country.all.to_tom_select_json, active_option: @zone.country_ids %>+ <%= tom_select_tag 'zone[country_ids]', multiple: true, class: 'w-full', options: Spree::Country.all.to_tom_select_json, active_option: @zone.country_ids %></div></div></div>diff --git a/admin/app/views/spree/admin/zones/_form.html.erb b/admin/app/views/spree/admin/zones/_form.html.erbindex 21eb180ff3..9d1ce15c15 100644--- a/admin/app/views/spree/admin/zones/_form.html.erb+++ b/admin/app/views/spree/admin/zones/_form.html.erb@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:general_settings) %></h5></div>@@ -10,7 +10,7 @@<%= f.spree_check_box :default_tax, label: Spree.t(:default_tax_zone) %>- <h6 class="mb-2 mt-3"><%= Spree.t(:type) %></h6>+ <h6 class="mb-2 mt-4"><%= Spree.t(:type) %></h6><%= f.spree_radio_button :kind, :country, id: 'country_based', data: { action: 'auto-submit#submit' }, label: Spree.t(:country_based) %><%= f.spree_radio_button :kind, :state, id: 'state_based', data: { action: 'auto-submit#submit' }, label: Spree.t(:state_based) %></div>diff --git a/admin/app/views/spree/admin/zones/_state_members.html.erb b/admin/app/views/spree/admin/zones/_state_members.html.erbindex da0d05155f..8fcf7eb6c8 100644--- a/admin/app/views/spree/admin/zones/_state_members.html.erb+++ b/admin/app/views/spree/admin/zones/_state_members.html.erb@@ -1,5 +1,5 @@<div id="state_members">- <div class="card mb-4">+ <div class="card mb-6"><div class="card-header"><h5 class="card-title"><%= Spree.t(:states) %>@@ -9,12 +9,12 @@<div class="card-body"><div class="form-group"><%= label_tag :states_country_id, Spree.t(:country) %>- <%= tom_select_tag :states_country_id, class: 'w-100', options: Spree::Country.joins(:states).to_tom_select_json, active_option: @selected_country&.id, select_data: {action: "auto-submit#submit"} %>+ <%= tom_select_tag :states_country_id, class: 'w-full', options: Spree::Country.joins(:states).to_tom_select_json, active_option: @selected_country&.id, select_data: {action: "auto-submit#submit"} %></div><div class="form-group"><%= zone_form.label :state_ids, Spree.t(:states) %>- <%= tom_select_tag 'zone[state_ids]', multiple: true, class: 'w-100', options: @states.to_tom_select_json, active_option: @zone.state_ids %>+ <%= tom_select_tag 'zone[state_ids]', multiple: true, class: 'w-full', options: @states.to_tom_select_json, active_option: @zone.state_ids %></div></div></div>diff --git a/admin/app/views/spree/admin/zones/_table_row.html.erb b/admin/app/views/spree/admin/zones/_table_row.html.erbindex 0fb6d6ac42..df61e68828 100644--- a/admin/app/views/spree/admin/zones/_table_row.html.erb+++ b/admin/app/views/spree/admin/zones/_table_row.html.erb@@ -1,6 +1,6 @@<tr id="<%= spree_dom_id zone %>" class="cursor-pointer" data-controller="row-link">- <td class="w-25" data-action="click->row-link#openLink"><%= zone.name %></td>- <td class="w-40 text-muted text-wrap" data-action="click->row-link#openLink"><%= zone.description %></td>+ <td class="w-1/4" data-action="click->row-link#openLink"><%= zone.name %></td>+ <td class="w-40 text-gray-600 whitespace-normal" data-action="click->row-link#openLink"><%= zone.description %></td><td class="w-10" data-action="click->row-link#openLink"><%= active_badge(zone.default_tax?) %></td><td class="w-10 actions"><%= link_to_edit(zone, data: { row_link_target: :link, turbo_frame: '_top' }) if can? :edit, zone %>diff --git a/admin/config/importmap.rb b/admin/config/importmap.rbindex 65dd641c4e..ce146661e2 100644--- a/admin/config/importmap.rb+++ b/admin/config/importmap.rb@@ -14,8 +14,6 @@ pin 'chartkick', to: 'chartkick.js', preload: ['application-spree-admin']pin 'Chart.bundle', to: 'Chart.bundle.js', preload: ['application-spree-admin']pin 'local-time', preload: ['application-spree-admin'] # @3.0.2pin 'mapkick/bundle', to: 'mapkick.bundle.js', preload: ['application-spree-admin']-pin "jquery", to: 'jquery.min.js', preload: ['application-spree-admin'] # @3.7.1-pin 'bootstrap', to: 'bootstrap--dist--js--bootstrap.bundle.min.js.js', preload: ['application-spree-admin'] # @4.6.2pin 'dompurify', preload: ['application-spree-admin'] # @3.2.5# Stimulus componentsdiff --git a/admin/config/initializers/dartsass.rb b/admin/config/initializers/dartsass.rbdeleted file mode 100644index 909c7d0b8a..0000000000--- a/admin/config/initializers/dartsass.rb+++ /dev/null@@ -1,3 +0,0 @@-Rails.application.config.dartsass.builds = {- Spree::Admin::Engine.root.join('app/assets/stylesheets/spree/admin/application.scss') => 'spree/admin/application.css'-}diff --git a/admin/config/initializers/form_builder.rb b/admin/config/initializers/form_builder.rbdeleted file mode 100644index 9397c7a67c..0000000000--- a/admin/config/initializers/form_builder.rb+++ /dev/null@@ -1,10 +0,0 @@-#-# Allow some application_helper methods to be used in the scoped form_for manner-#-class ActionView::Helpers::FormBuilder- def error_message_on(method, options = {})- @template.error_message_on(@object_name, method, objectify_options(options))- end-end--ActionView::Base.field_error_proc = proc { |html_tag, _instance| "<span class=\"field_with_errors\">#{html_tag}</span>".html_safe }diff --git a/admin/config/tailwind.config.js b/admin/config/tailwind.config.jsnew file mode 100644index 0000000000..795a76f30f--- /dev/null+++ b/admin/config/tailwind.config.js@@ -0,0 +1,14 @@+// Tailwind CSS v4 - Minimal config for content paths only+// Theme configuration has been moved to app/assets/tailwind/spree/admin/application.css+module.exports = {+ content: [+ // Host app admin customizations+ './app/helpers/spree/admin/**/*.rb',+ './app/javascript/spree/admin/**/*.js',+ './app/views/spree/admin/**/*.erb',+ // Spree Admin engine paths (set by engine initializer)+ process.env.SPREE_ADMIN_PATH + '/app/helpers/**/*.rb',+ process.env.SPREE_ADMIN_PATH + '/app/javascript/**/*.js',+ process.env.SPREE_ADMIN_PATH + '/app/views/spree/admin/**/*.erb'+ ].filter(Boolean)+}diff --git a/admin/lib/generators/spree/admin/install/install_generator.rb b/admin/lib/generators/spree/admin/install/install_generator.rbindex 7ab76cddb7..09b5d8d5f0 100644--- a/admin/lib/generators/spree/admin/install/install_generator.rb+++ b/admin/lib/generators/spree/admin/install/install_generator.rb@@ -15,16 +15,33 @@ module Spreeenddef install+ install_procfile+ install_bin_dev+ install_assets_manifest+ install_tailwind_css+ end++ private++ def install_procfileif Rails.root && Rails.root.join("Procfile.dev").exist?- append_to_file 'Procfile.dev', "\nadmin_css: bin/rails dartsass:watch" unless File.read('Procfile.dev').include?('admin_css:')+ # Remove old dartsass entry if present+ if File.read('Procfile.dev').include?('dartsass:watch')+ gsub_file 'Procfile.dev', /^admin_css:.*dartsass:watch.*\n?/, ''+ end+ append_to_file 'Procfile.dev', "\nadmin_css: bin/rails spree:admin:tailwindcss:watch" unless File.read('Procfile.dev').include?('spree:admin:tailwindcss:watch')else- create_file 'Procfile.dev', "admin_css: bin/rails dartsass:watch\n"+ create_file 'Procfile.dev', "admin_css: bin/rails spree:admin:tailwindcss:watch\n"end+ end+ def install_bin_devsay "Add bin/dev to start foreman"copy_file "dev", "bin/dev", force: truechmod "bin/dev", 0755, verbose: false+ end+ def install_assets_manifestempty_directory Rails.root.join('app/assets/builds') if Rails.rootunless File.exist?('app/assets/config/manifest.js')@@ -36,6 +53,14 @@ module Spreeappend_to_file 'app/assets/config/manifest.js', "\n//= link_tree ../builds" unless File.read('app/assets/config/manifest.js').include?('//= link_tree ../builds')endend++ def install_tailwind_css+ template(+ 'app/assets/tailwind/spree_admin.css',+ 'app/assets/tailwind/spree_admin.css'+ )+ say "Created app/assets/tailwind/spree_admin.css for Tailwind CSS customization"+ endendendenddiff --git a/admin/lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.tt b/admin/lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.ttnew file mode 100644index 0000000000..20fd2f48ae--- /dev/null+++ b/admin/lib/generators/spree/admin/install/templates/app/assets/tailwind/spree_admin.css.tt@@ -0,0 +1,27 @@+/*+ * Spree Admin Tailwind CSS+ *+ * This file is the entry point for Spree Admin's Tailwind CSS.+ * It imports the base styles from the Spree Admin gem and allows+ * you to add custom admin styles.+ *+ * The import path below is automatically set during installation.+ * If you need to reinstall or update, run: rails g spree:admin:install+ */++/* Import Spree Admin base styles from the gem */+@import "<%= Spree::Admin::Engine.root.join('app/assets/tailwind/spree/admin/index.css') %>";++/* Scan host app's custom admin code for Tailwind classes */+@source "../../views/spree/admin/**/*.erb";+@source "../../helpers/spree/admin/**/*.rb";+@source "../../javascript/spree/admin/**/*.js";++/* Add your custom admin styles below */+/* Example:+@layer components {+ .my-custom-admin-component {+ @apply bg-zinc-950-500 text-white rounded-lg p-4;+ }+}+*/diff --git a/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt b/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.ttindex 16289041da..c0046fc470 100644--- a/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt+++ b/admin/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt@@ -1,5 +1,5 @@<%%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %>- <div class="d-flex flex-column flex-lg-row gap-2">+ <div class="flex flex-column flex-lg-row gap-2"><%%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %><%%= render 'spree/admin/shared/filters_button' %></div>diff --git a/admin/lib/generators/spree/admin/scaffold/templates/views/_form.html.erb.tt b/admin/lib/generators/spree/admin/scaffold/templates/views/_form.html.erb.ttindex bcd53d550a..89284ec345 100644--- a/admin/lib/generators/spree/admin/scaffold/templates/views/_form.html.erb.tt+++ b/admin/lib/generators/spree/admin/scaffold/templates/views/_form.html.erb.tt@@ -1,4 +1,4 @@-<div class="card mb-4">+<div class="card mb-6"><div class="card-body"><%%= f.spree_text_field :name, required: true, autofocus: true %></div>diff --git a/admin/lib/spree/admin.rb b/admin/lib/spree/admin.rbindex 3f72e744da..205854f0cb 100644--- a/admin/lib/spree/admin.rb+++ b/admin/lib/spree/admin.rb@@ -8,11 +8,10 @@ require 'groupdate'require 'hightop'require 'importmap-rails'require 'mapkick-rb'-require 'bootstrap'require 'turbo-rails'require 'stimulus-rails'require 'local_time'-require 'dartsass-rails'+require 'tailwindcss-rails'require 'inline_svg'require 'spree/admin/action_callbacks'diff --git a/admin/lib/spree/admin/engine.rb b/admin/lib/spree/admin/engine.rbindex 685ecfe8e8..676376abf8 100644--- a/admin/lib/spree/admin/engine.rb+++ b/admin/lib/spree/admin/engine.rb@@ -187,31 +187,32 @@ module SpreeSpree::Admin::RuntimeConfig = Spree::Admin::RuntimeConfiguration.newend- initializer 'spree.admin.dartsass_fix' do |app|- if app.config.respond_to?(:assets) && defined?(Sprockets)- # we're not using any sass compressors, as we're using dartsass-rails- # some gems however like payment_icons still have sassc-rails as a dependency- # which sets the css_compressor to :sass and breaks the assets pipeline- app.config.assets.css_compressor = nil if app.config.assets.css_compressor == :sass- end- end-# Rails 7.1 introduced a new feature that raises an error if a callback action is missing.# We need to disable it as we use a lot of concerns that add callback actions.initializer 'spree.admin.disable_raise_on_missing_callback_actions' do |app|app.config.action_controller.raise_on_missing_callback_actions = falseend+ initializer 'spree.admin.tailwind_path', before: :load_config_initializers do+ ENV['SPREE_ADMIN_PATH'] ||= root.to_s+ end+initializer 'spree.admin.assets' do |app|if app.config.respond_to?(:assets)app.config.assets.paths << root.join('app/javascript')app.config.assets.paths << root.join('vendor/javascript')- app.config.assets.precompile += %w[ spree_admin_manifest bootstrap.bundle.min.js jquery3.min.js ] if defined?(Sprockets)+ # Add host app's builds directory for compiled Tailwind CSS+ app.config.assets.paths << Rails.root.join('app/assets/builds')+ app.config.assets.precompile += %w[ spree_admin_manifest ] if defined?(Sprockets)# fix for TinyMCE-rails gem to work with both propshaft and sprocketsapp.config.assets.excluded_paths ||= [] if defined?(Sprockets)endend+ rake_tasks do+ load root.join('lib/tasks/tailwind.rake')+ end+initializer 'spree.admin.importmap', after: 'importmap' do |app|app.config.spree_admin = ActiveSupport::OrderedOptions.newapp.config.spree_admin.cache_sweepers = []diff --git a/admin/lib/tasks/tailwind.rake b/admin/lib/tasks/tailwind.rakenew file mode 100644index 0000000000..5445b67e69--- /dev/null+++ b/admin/lib/tasks/tailwind.rake@@ -0,0 +1,101 @@+module Spree+ module Admin+ module TailwindHelper+ class << self+ # Returns the input CSS path from the host app+ # Created by the install generator (rails g spree:admin:install)+ def input_path+ Rails.root.join("app/assets/tailwind/spree_admin.css")+ end++ def output_path+ Rails.root.join("app/assets/builds/spree/admin/application.css")+ end+ end+ end+ end+end++namespace :spree do+ namespace :admin do+ namespace :tailwindcss do+ desc "Build Spree Admin Tailwind CSS"+ task build: :environment do+ require "tailwindcss/ruby"++ input_path = Spree::Admin::TailwindHelper.input_path+ output_path = Spree::Admin::TailwindHelper.output_path++ # Ensure output directory exists+ FileUtils.mkdir_p(output_path.dirname)++ command = [+ Tailwindcss::Ruby.executable,+ "-i", input_path.to_s,+ "-o", output_path.to_s+ ]++ command << "--minify" unless Rails.env.development? || Rails.env.test?++ puts "Building Spree Admin Tailwind CSS..."+ puts " Input: #{input_path}"+ system(*command) || raise("Spree Admin Tailwind build failed")+ puts "Done! Output: #{output_path}"+ end++ desc "Watch Spree Admin Tailwind CSS for changes"+ task watch: :environment do+ require "tailwindcss/ruby"++ input_path = Spree::Admin::TailwindHelper.input_path+ output_path = Spree::Admin::TailwindHelper.output_path++ # Ensure output directory exists+ FileUtils.mkdir_p(output_path.dirname)++ command = [+ Tailwindcss::Ruby.executable,+ "-i", input_path.to_s,+ "-o", output_path.to_s,+ "--watch"+ ]++ puts "Watching Spree Admin Tailwind CSS for changes..."+ puts " Input: #{input_path}"+ system(*command)+ end+ end+ end+end++# Override the default tailwindcss:build task from tailwindcss-rails gem.+# Spree Admin handles its own Tailwind build, so we make the default task+# a no-op unless the host app has additional Tailwind CSS outside of Spree Admin.+if Rake::Task.task_defined?("tailwindcss:build")+ Rake::Task["tailwindcss:build"].clear++ namespace :tailwindcss do+ desc "Build Tailwind CSS (overridden by Spree Admin)"+ task build: :environment do+ # Spree Admin's tailwind build handles everything through spree:admin:tailwindcss:build+ # This task is intentionally empty to prevent the default tailwindcss-rails behavior+ # which would fail if app/assets/tailwind/application.css doesn't exist in the host app.+ #+ # If you have host app CSS that needs separate compilation, you can:+ # 1. Add your styles to app/assets/tailwind/application.css and let Spree Admin compile it+ # 2. Create a separate rake task for your host app's CSS+ end+ end+end++# Hook into assets:precompile+if Rake::Task.task_defined?("assets:precompile")+ Rake::Task["assets:precompile"].enhance(["spree:admin:tailwindcss:build"])+end++# Hook into test preparation tasks+%w[test:prepare spec:prepare db:test:prepare].each do |task_name|+ if Rake::Task.task_defined?(task_name)+ Rake::Task[task_name].enhance(["spree:admin:tailwindcss:build"])+ end+enddiff --git a/admin/spec/features/spree/admin/getting_started_spec.rb b/admin/spec/features/spree/admin/getting_started_spec.rbindex c30c4242e6..c16e8bb392 100644--- a/admin/spec/features/spree/admin/getting_started_spec.rb+++ b/admin/spec/features/spree/admin/getting_started_spec.rb@@ -11,7 +11,7 @@ RSpec.feature 'Getting Started' docontext 'when there are no tax rates' doit 'asks to setup taxes' dovisit spree.admin_getting_started_path- find('#setup_task_setup_taxes_collection summary').click+ find('#setup_task_setup_taxes_collection .card-header').clickexpect(page).to have_text Spree.t('admin.store_setup_tasks.taxes.copy', link: spree.admin_tax_rates_path)end@@ -24,7 +24,7 @@ RSpec.feature 'Getting Started' doendit 'confirms the setup' do- find('#setup_task_setup_taxes_collection summary').click+ find('#setup_task_setup_taxes_collection .card-header').clickexpect(page).to have_text("You're all set! You can always manage your taxes")end@@ -37,7 +37,7 @@ RSpec.feature 'Getting Started' doendscenario 'adds and updates the customer support email' do- find('#setup_task_set_customer_support_email summary').click+ find('#setup_task_set_customer_support_email .card-header').clickwithin '#set_customer_support_email' doclick_on 'Edit'diff --git a/admin/spec/features/spree/admin/settings/shipping_methods_spec.rb b/admin/spec/features/spree/admin/settings/shipping_methods_spec.rbindex d36c991d7f..158ddf7d29 100644--- a/admin/spec/features/spree/admin/settings/shipping_methods_spec.rb+++ b/admin/spec/features/spree/admin/settings/shipping_methods_spec.rb@@ -12,7 +12,7 @@ RSpec.feature 'Shipping methods', js: true doit 'allows Store Owner to create new shipping method' dovisit spree.new_admin_shipping_method_path- fill_in 'Name', with: 'New Shipping Method'+ fill_in 'Name', with: 'New Shipping Method', match: :firstselect 'Flat rate', from: 'Calculator'expect(page).to have_content 'Flat rate'@@ -46,7 +46,7 @@ RSpec.feature 'Shipping methods', js: true dovisit spree.edit_admin_shipping_method_path(shipping_method)- fill_in 'Name', with: 'Express'+ fill_in 'Name', with: 'Express', match: :firstselect 'Flat Percent', from: 'Calculator'expect(page).to have_content 'Flat Percent'diff --git a/admin/spec/helpers/spree/admin/avatars_helper_spec.rb b/admin/spec/helpers/spree/admin/avatars_helper_spec.rbnew file mode 100644index 0000000000..91d394d418--- /dev/null+++ b/admin/spec/helpers/spree/admin/avatars_helper_spec.rb@@ -0,0 +1,23 @@+require 'spec_helper'++describe Spree::Admin::AvatarsHelper, type: :helper do+ describe '#render_avatar' do+ let(:user) { create(:admin_user) }++ context 'when user has an avatar' do+ before { user.avatar.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg'), filename: 'thinking-cat.jpg') }++ it 'returns the avatar url' do+ ActiveStorage::Current.url_options = { host: 'localhost', port: 3000 }+ expect(render_avatar(user)).to match(/rails\/active_storage/)+ expect(render_avatar(user)).to match(/thinking-cat\.jpg/)+ end+ end++ context 'when user does not have an avatar' do+ it 'returns initials' do+ expect(render_avatar(user)).to match(/avatar/)+ end+ end+ end+enddiff --git a/admin/spec/helpers/spree/admin/base_helper_spec.rb b/admin/spec/helpers/spree/admin/base_helper_spec.rbindex fafd8bf213..11793aa8c8 100644--- a/admin/spec/helpers/spree/admin/base_helper_spec.rb+++ b/admin/spec/helpers/spree/admin/base_helper_spec.rb@@ -1,26 +1,6 @@require 'spec_helper'describe Spree::Admin::BaseHelper do- describe '#render_avatar' do- let(:user) { create(:admin_user) }-- context 'when user has an avatar' do- before { user.avatar.attach(io: File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg'), filename: 'thinking-cat.jpg') }-- it 'returns the avatar url' do- ActiveStorage::Current.url_options = { host: 'localhost', port: 3000 }- expect(render_avatar(user)).to match(/rails\/active_storage/)- expect(render_avatar(user)).to match(/thinking-cat\.jpg/)- end- end-- context 'when user does not have an avatar' do- it 'returns initials' do- expect(render_avatar(user)).to match(/avatar/)- end- end- end-describe '#spree_time_ago' doit 'returns the local time ago with a tooltip' dotime = Time.zone.parse('2025-10-21 12:00')diff --git a/admin/spec/helpers/spree/admin/navigation_helper_spec.rb b/admin/spec/helpers/spree/admin/navigation_helper_spec.rbindex fea9332c0c..f462073e9d 100644--- a/admin/spec/helpers/spree/admin/navigation_helper_spec.rb+++ b/admin/spec/helpers/spree/admin/navigation_helper_spec.rb@@ -56,7 +56,7 @@ describe Spree::Admin::NavigationHelper, type: :helper doit 'creates a button with spinner for turbo' doresult = helper.button('Submit', 'save')expect(result).to include('data-turbo-submits-with')- expect(result).to include('spinner-border')+ expect(result).to include('animate-spin')endenddiff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspecindex 91033a0390..2fb9417cdf 100644--- a/admin/spree_admin.gemspec+++ b/admin/spree_admin.gemspec@@ -30,10 +30,10 @@ Gem::Specification.new do |s|s.add_dependency 'spree_api', ">= #{s.version}"s.add_dependency 'active_link_to'- s.add_dependency 'bootstrap', '~> 4.6', '>= 4.6.2.1's.add_dependency 'breadcrumbs_on_rails', '~> 4.1's.add_dependency 'chartkick', '~> 5.0'- s.add_dependency 'dartsass-rails', '~> 0.5'+ s.add_dependency 'tailwindcss-rails', '>= 4.0'+ s.add_dependency 'tailwindcss-ruby', '>= 4.0's.add_dependency 'groupdate', '~> 6.2's.add_dependency 'hightop', '~> 0.3's.add_dependency 'importmap-rails'diff --git a/admin/vendor/javascript/bootstrap--dist--js--bootstrap.bundle.min.js.js b/admin/vendor/javascript/bootstrap--dist--js--bootstrap.bundle.min.js.jsdeleted file mode 100644index 14ab4bb3da..0000000000--- a/admin/vendor/javascript/bootstrap--dist--js--bootstrap.bundle.min.js.js+++ /dev/null@@ -1,8 +0,0 @@-// bootstrap/dist/js/[email protected] downloaded from https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js--/*!- * Bootstrap v4.6.2 (https://getbootstrap.com/)- * Copyright 2011-2022 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)- */-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("jquery")):"function"==typeof define&&define.amd?define(["exports","jquery"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).bootstrap={},t.jQuery)}(this,(function(t,e){"use strict";function n(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var i=n(e);function o(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}function r(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),Object.defineProperty(t,"prototype",{writable:!1}),t}function a(){return a=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var i in n)Object.prototype.hasOwnProperty.call(n,i)&&(t[i]=n[i])}return t},a.apply(this,arguments)}function s(t,e){return s=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},s(t,e)}var l="transitionend";var u={TRANSITION_END:"bsTransitionEnd",getUID:function(t){do{t+=~~(1e6*Math.random())}while(document.getElementById(t));return t},getSelectorFromElement:function(t){var e=t.getAttribute("data-target");if(!e||"#"===e){var n=t.getAttribute("href");e=n&&"#"!==n?n.trim():""}try{return document.querySelector(e)?e:null}catch(t){return null}},getTransitionDurationFromElement:function(t){if(!t)return 0;var e=i.default(t).css("transition-duration"),n=i.default(t).css("transition-delay"),o=parseFloat(e),r=parseFloat(n);return o||r?(e=e.split(",")[0],n=n.split(",")[0],1e3*(parseFloat(e)+parseFloat(n))):0},reflow:function(t){return t.offsetHeight},triggerTransitionEnd:function(t){i.default(t).trigger(l)},supportsTransitionEnd:function(){return Boolean(l)},isElement:function(t){return(t[0]||t).nodeType},typeCheckConfig:function(t,e,n){for(var i in n)if(Object.prototype.hasOwnProperty.call(n,i)){var o=n[i],r=e[i],a=r&&u.isElement(r)?"element":null===(s=r)||"undefined"==typeof s?""+s:{}.toString.call(s).match(/\s([a-z]+)/i)[1].toLowerCase();if(!new RegExp(o).test(a))throw new Error(t.toUpperCase()+': Option "'+i+'" provided type "'+a+'" but expected type "'+o+'".')}var s},findShadowRoot:function(t){if(!document.documentElement.attachShadow)return null;if("function"==typeof t.getRootNode){var e=t.getRootNode();return e instanceof ShadowRoot?e:null}return t instanceof ShadowRoot?t:t.parentNode?u.findShadowRoot(t.parentNode):null},jQueryDetection:function(){if("undefined"==typeof i.default)throw new TypeError("Bootstrap's JavaScript requires jQuery. jQuery must be included before Bootstrap's JavaScript.");var t=i.default.fn.jquery.split(" ")[0].split(".");if(t[0]<2&&t[1]<9||1===t[0]&&9===t[1]&&t[2]<1||t[0]>=4)throw new Error("Bootstrap's JavaScript requires at least jQuery v1.9.1 but less than v4.0.0")}};u.jQueryDetection(),i.default.fn.emulateTransitionEnd=function(t){var e=this,n=!1;return i.default(this).one(u.TRANSITION_END,(function(){n=!0})),setTimeout((function(){n||u.triggerTransitionEnd(e)}),t),this},i.default.event.special[u.TRANSITION_END]={bindType:l,delegateType:l,handle:function(t){if(i.default(t.target).is(this))return t.handleObj.handler.apply(this,arguments)}};var f="bs.alert",d=i.default.fn.alert,c=function(){function t(t){this._element=t}var e=t.prototype;return e.close=function(t){var e=this._element;t&&(e=this._getRootElement(t)),this._triggerCloseEvent(e).isDefaultPrevented()||this._removeElement(e)},e.dispose=function(){i.default.removeData(this._element,f),this._element=null},e._getRootElement=function(t){var e=u.getSelectorFromElement(t),n=!1;return e&&(n=document.querySelector(e)),n||(n=i.default(t).closest(".alert")[0]),n},e._triggerCloseEvent=function(t){var e=i.default.Event("close.bs.alert");return i.default(t).trigger(e),e},e._removeElement=function(t){var e=this;if(i.default(t).removeClass("show"),i.default(t).hasClass("fade")){var n=u.getTransitionDurationFromElement(t);i.default(t).one(u.TRANSITION_END,(function(n){return e._destroyElement(t,n)})).emulateTransitionEnd(n)}else this._destroyElement(t)},e._destroyElement=function(t){i.default(t).detach().trigger("closed.bs.alert").remove()},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this),o=n.data(f);o||(o=new t(this),n.data(f,o)),"close"===e&&o[e](this)}))},t._handleDismiss=function(t){return function(e){e&&e.preventDefault(),t.close(this)}},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}}]),t}();i.default(document).on("click.bs.alert.data-api",'[data-dismiss="alert"]',c._handleDismiss(new c)),i.default.fn.alert=c._jQueryInterface,i.default.fn.alert.Constructor=c,i.default.fn.alert.noConflict=function(){return i.default.fn.alert=d,c._jQueryInterface};var h="bs.button",p=i.default.fn.button,m="active",g='[data-toggle^="button"]',_='input:not([type="hidden"])',v=".btn",b=function(){function t(t){this._element=t,this.shouldAvoidTriggerChange=!1}var e=t.prototype;return e.toggle=function(){var t=!0,e=!0,n=i.default(this._element).closest('[data-toggle="buttons"]')[0];if(n){var o=this._element.querySelector(_);if(o){if("radio"===o.type)if(o.checked&&this._element.classList.contains(m))t=!1;else{var r=n.querySelector(".active");r&&i.default(r).removeClass(m)}t&&("checkbox"!==o.type&&"radio"!==o.type||(o.checked=!this._element.classList.contains(m)),this.shouldAvoidTriggerChange||i.default(o).trigger("change")),o.focus(),e=!1}}this._element.hasAttribute("disabled")||this._element.classList.contains("disabled")||(e&&this._element.setAttribute("aria-pressed",!this._element.classList.contains(m)),t&&i.default(this._element).toggleClass(m))},e.dispose=function(){i.default.removeData(this._element,h),this._element=null},t._jQueryInterface=function(e,n){return this.each((function(){var o=i.default(this),r=o.data(h);r||(r=new t(this),o.data(h,r)),r.shouldAvoidTriggerChange=n,"toggle"===e&&r[e]()}))},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}}]),t}();i.default(document).on("click.bs.button.data-api",g,(function(t){var e=t.target,n=e;if(i.default(e).hasClass("btn")||(e=i.default(e).closest(v)[0]),!e||e.hasAttribute("disabled")||e.classList.contains("disabled"))t.preventDefault();else{var o=e.querySelector(_);if(o&&(o.hasAttribute("disabled")||o.classList.contains("disabled")))return void t.preventDefault();"INPUT"!==n.tagName&&"LABEL"===e.tagName||b._jQueryInterface.call(i.default(e),"toggle","INPUT"===n.tagName)}})).on("focus.bs.button.data-api blur.bs.button.data-api",g,(function(t){var e=i.default(t.target).closest(v)[0];i.default(e).toggleClass("focus",/^focus(in)?$/.test(t.type))})),i.default(window).on("load.bs.button.data-api",(function(){for(var t=[].slice.call(document.querySelectorAll('[data-toggle="buttons"] .btn')),e=0,n=t.length;e<n;e++){var i=t[e],o=i.querySelector(_);o.checked||o.hasAttribute("checked")?i.classList.add(m):i.classList.remove(m)}for(var r=0,a=(t=[].slice.call(document.querySelectorAll('[data-toggle="button"]'))).length;r<a;r++){var s=t[r];"true"===s.getAttribute("aria-pressed")?s.classList.add(m):s.classList.remove(m)}})),i.default.fn.button=b._jQueryInterface,i.default.fn.button.Constructor=b,i.default.fn.button.noConflict=function(){return i.default.fn.button=p,b._jQueryInterface};var y="carousel",E="bs.carousel",w=i.default.fn[y],T="active",C="next",S="prev",N="slid.bs.carousel",D=".active.carousel-item",A={interval:5e3,keyboard:!0,slide:!1,pause:"hover",wrap:!0,touch:!0},k={interval:"(number|boolean)",keyboard:"boolean",slide:"(boolean|string)",pause:"(string|boolean)",wrap:"boolean",touch:"boolean"},I={TOUCH:"touch",PEN:"pen"},O=function(){function t(t,e){this._items=null,this._interval=null,this._activeElement=null,this._isPaused=!1,this._isSliding=!1,this.touchTimeout=null,this.touchStartX=0,this.touchDeltaX=0,this._config=this._getConfig(e),this._element=t,this._indicatorsElement=this._element.querySelector(".carousel-indicators"),this._touchSupported="ontouchstart"in document.documentElement||navigator.maxTouchPoints>0,this._pointerEvent=Boolean(window.PointerEvent||window.MSPointerEvent),this._addEventListeners()}var e=t.prototype;return e.next=function(){this._isSliding||this._slide(C)},e.nextWhenVisible=function(){var t=i.default(this._element);!document.hidden&&t.is(":visible")&&"hidden"!==t.css("visibility")&&this.next()},e.prev=function(){this._isSliding||this._slide(S)},e.pause=function(t){t||(this._isPaused=!0),this._element.querySelector(".carousel-item-next, .carousel-item-prev")&&(u.triggerTransitionEnd(this._element),this.cycle(!0)),clearInterval(this._interval),this._interval=null},e.cycle=function(t){t||(this._isPaused=!1),this._interval&&(clearInterval(this._interval),this._interval=null),this._config.interval&&!this._isPaused&&(this._updateInterval(),this._interval=setInterval((document.visibilityState?this.nextWhenVisible:this.next).bind(this),this._config.interval))},e.to=function(t){var e=this;this._activeElement=this._element.querySelector(D);var n=this._getItemIndex(this._activeElement);if(!(t>this._items.length-1||t<0))if(this._isSliding)i.default(this._element).one(N,(function(){return e.to(t)}));else{if(n===t)return this.pause(),void this.cycle();var o=t>n?C:S;this._slide(o,this._items[t])}},e.dispose=function(){i.default(this._element).off(".bs.carousel"),i.default.removeData(this._element,E),this._items=null,this._config=null,this._element=null,this._interval=null,this._isPaused=null,this._isSliding=null,this._activeElement=null,this._indicatorsElement=null},e._getConfig=function(t){return t=a({},A,t),u.typeCheckConfig(y,t,k),t},e._handleSwipe=function(){var t=Math.abs(this.touchDeltaX);if(!(t<=40)){var e=t/this.touchDeltaX;this.touchDeltaX=0,e>0&&this.prev(),e<0&&this.next()}},e._addEventListeners=function(){var t=this;this._config.keyboard&&i.default(this._element).on("keydown.bs.carousel",(function(e){return t._keydown(e)})),"hover"===this._config.pause&&i.default(this._element).on("mouseenter.bs.carousel",(function(e){return t.pause(e)})).on("mouseleave.bs.carousel",(function(e){return t.cycle(e)})),this._config.touch&&this._addTouchEventListeners()},e._addTouchEventListeners=function(){var t=this;if(this._touchSupported){var e=function(e){t._pointerEvent&&I[e.originalEvent.pointerType.toUpperCase()]?t.touchStartX=e.originalEvent.clientX:t._pointerEvent||(t.touchStartX=e.originalEvent.touches[0].clientX)},n=function(e){t._pointerEvent&&I[e.originalEvent.pointerType.toUpperCase()]&&(t.touchDeltaX=e.originalEvent.clientX-t.touchStartX),t._handleSwipe(),"hover"===t._config.pause&&(t.pause(),t.touchTimeout&&clearTimeout(t.touchTimeout),t.touchTimeout=setTimeout((function(e){return t.cycle(e)}),500+t._config.interval))};i.default(this._element.querySelectorAll(".carousel-item img")).on("dragstart.bs.carousel",(function(t){return t.preventDefault()})),this._pointerEvent?(i.default(this._element).on("pointerdown.bs.carousel",(function(t){return e(t)})),i.default(this._element).on("pointerup.bs.carousel",(function(t){return n(t)})),this._element.classList.add("pointer-event")):(i.default(this._element).on("touchstart.bs.carousel",(function(t){return e(t)})),i.default(this._element).on("touchmove.bs.carousel",(function(e){return function(e){t.touchDeltaX=e.originalEvent.touches&&e.originalEvent.touches.length>1?0:e.originalEvent.touches[0].clientX-t.touchStartX}(e)})),i.default(this._element).on("touchend.bs.carousel",(function(t){return n(t)})))}},e._keydown=function(t){if(!/input|textarea/i.test(t.target.tagName))switch(t.which){case 37:t.preventDefault(),this.prev();break;case 39:t.preventDefault(),this.next()}},e._getItemIndex=function(t){return this._items=t&&t.parentNode?[].slice.call(t.parentNode.querySelectorAll(".carousel-item")):[],this._items.indexOf(t)},e._getItemByDirection=function(t,e){var n=t===C,i=t===S,o=this._getItemIndex(e),r=this._items.length-1;if((i&&0===o||n&&o===r)&&!this._config.wrap)return e;var a=(o+(t===S?-1:1))%this._items.length;return-1===a?this._items[this._items.length-1]:this._items[a]},e._triggerSlideEvent=function(t,e){var n=this._getItemIndex(t),o=this._getItemIndex(this._element.querySelector(D)),r=i.default.Event("slide.bs.carousel",{relatedTarget:t,direction:e,from:o,to:n});return i.default(this._element).trigger(r),r},e._setActiveIndicatorElement=function(t){if(this._indicatorsElement){var e=[].slice.call(this._indicatorsElement.querySelectorAll(".active"));i.default(e).removeClass(T);var n=this._indicatorsElement.children[this._getItemIndex(t)];n&&i.default(n).addClass(T)}},e._updateInterval=function(){var t=this._activeElement||this._element.querySelector(D);if(t){var e=parseInt(t.getAttribute("data-interval"),10);e?(this._config.defaultInterval=this._config.defaultInterval||this._config.interval,this._config.interval=e):this._config.interval=this._config.defaultInterval||this._config.interval}},e._slide=function(t,e){var n,o,r,a=this,s=this._element.querySelector(D),l=this._getItemIndex(s),f=e||s&&this._getItemByDirection(t,s),d=this._getItemIndex(f),c=Boolean(this._interval);if(t===C?(n="carousel-item-left",o="carousel-item-next",r="left"):(n="carousel-item-right",o="carousel-item-prev",r="right"),f&&i.default(f).hasClass(T))this._isSliding=!1;else if(!this._triggerSlideEvent(f,r).isDefaultPrevented()&&s&&f){this._isSliding=!0,c&&this.pause(),this._setActiveIndicatorElement(f),this._activeElement=f;var h=i.default.Event(N,{relatedTarget:f,direction:r,from:l,to:d});if(i.default(this._element).hasClass("slide")){i.default(f).addClass(o),u.reflow(f),i.default(s).addClass(n),i.default(f).addClass(n);var p=u.getTransitionDurationFromElement(s);i.default(s).one(u.TRANSITION_END,(function(){i.default(f).removeClass(n+" "+o).addClass(T),i.default(s).removeClass("active "+o+" "+n),a._isSliding=!1,setTimeout((function(){return i.default(a._element).trigger(h)}),0)})).emulateTransitionEnd(p)}else i.default(s).removeClass(T),i.default(f).addClass(T),this._isSliding=!1,i.default(this._element).trigger(h);c&&this.cycle()}},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this).data(E),o=a({},A,i.default(this).data());"object"==typeof e&&(o=a({},o,e));var r="string"==typeof e?e:o.slide;if(n||(n=new t(this,o),i.default(this).data(E,n)),"number"==typeof e)n.to(e);else if("string"==typeof r){if("undefined"==typeof n[r])throw new TypeError('No method named "'+r+'"');n[r]()}else o.interval&&o.ride&&(n.pause(),n.cycle())}))},t._dataApiClickHandler=function(e){var n=u.getSelectorFromElement(this);if(n){var o=i.default(n)[0];if(o&&i.default(o).hasClass("carousel")){var r=a({},i.default(o).data(),i.default(this).data()),s=this.getAttribute("data-slide-to");s&&(r.interval=!1),t._jQueryInterface.call(i.default(o),r),s&&i.default(o).data(E).to(s),e.preventDefault()}}},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"Default",get:function(){return A}}]),t}();i.default(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",O._dataApiClickHandler),i.default(window).on("load.bs.carousel.data-api",(function(){for(var t=[].slice.call(document.querySelectorAll('[data-ride="carousel"]')),e=0,n=t.length;e<n;e++){var o=i.default(t[e]);O._jQueryInterface.call(o,o.data())}})),i.default.fn[y]=O._jQueryInterface,i.default.fn[y].Constructor=O,i.default.fn[y].noConflict=function(){return i.default.fn[y]=w,O._jQueryInterface};var x="collapse",j="bs.collapse",L=i.default.fn[x],P="show",F="collapse",R="collapsing",B="collapsed",H="width",M='[data-toggle="collapse"]',q={toggle:!0,parent:""},Q={toggle:"boolean",parent:"(string|element)"},W=function(){function t(t,e){this._isTransitioning=!1,this._element=t,this._config=this._getConfig(e),this._triggerArray=[].slice.call(document.querySelectorAll('[data-toggle="collapse"][href="#'+t.id+'"],[data-toggle="collapse"][data-target="#'+t.id+'"]'));for(var n=[].slice.call(document.querySelectorAll(M)),i=0,o=n.length;i<o;i++){var r=n[i],a=u.getSelectorFromElement(r),s=[].slice.call(document.querySelectorAll(a)).filter((function(e){return e===t}));null!==a&&s.length>0&&(this._selector=a,this._triggerArray.push(r))}this._parent=this._config.parent?this._getParent():null,this._config.parent||this._addAriaAndCollapsedClass(this._element,this._triggerArray),this._config.toggle&&this.toggle()}var e=t.prototype;return e.toggle=function(){i.default(this._element).hasClass(P)?this.hide():this.show()},e.show=function(){var e,n,o=this;if(!(this._isTransitioning||i.default(this._element).hasClass(P)||(this._parent&&0===(e=[].slice.call(this._parent.querySelectorAll(".show, .collapsing")).filter((function(t){return"string"==typeof o._config.parent?t.getAttribute("data-parent")===o._config.parent:t.classList.contains(F)}))).length&&(e=null),e&&(n=i.default(e).not(this._selector).data(j))&&n._isTransitioning))){var r=i.default.Event("show.bs.collapse");if(i.default(this._element).trigger(r),!r.isDefaultPrevented()){e&&(t._jQueryInterface.call(i.default(e).not(this._selector),"hide"),n||i.default(e).data(j,null));var a=this._getDimension();i.default(this._element).removeClass(F).addClass(R),this._element.style[a]=0,this._triggerArray.length&&i.default(this._triggerArray).removeClass(B).attr("aria-expanded",!0),this.setTransitioning(!0);var s="scroll"+(a[0].toUpperCase()+a.slice(1)),l=u.getTransitionDurationFromElement(this._element);i.default(this._element).one(u.TRANSITION_END,(function(){i.default(o._element).removeClass(R).addClass("collapse show"),o._element.style[a]="",o.setTransitioning(!1),i.default(o._element).trigger("shown.bs.collapse")})).emulateTransitionEnd(l),this._element.style[a]=this._element[s]+"px"}}},e.hide=function(){var t=this;if(!this._isTransitioning&&i.default(this._element).hasClass(P)){var e=i.default.Event("hide.bs.collapse");if(i.default(this._element).trigger(e),!e.isDefaultPrevented()){var n=this._getDimension();this._element.style[n]=this._element.getBoundingClientRect()[n]+"px",u.reflow(this._element),i.default(this._element).addClass(R).removeClass("collapse show");var o=this._triggerArray.length;if(o>0)for(var r=0;r<o;r++){var a=this._triggerArray[r],s=u.getSelectorFromElement(a);null!==s&&(i.default([].slice.call(document.querySelectorAll(s))).hasClass(P)||i.default(a).addClass(B).attr("aria-expanded",!1))}this.setTransitioning(!0),this._element.style[n]="";var l=u.getTransitionDurationFromElement(this._element);i.default(this._element).one(u.TRANSITION_END,(function(){t.setTransitioning(!1),i.default(t._element).removeClass(R).addClass(F).trigger("hidden.bs.collapse")})).emulateTransitionEnd(l)}}},e.setTransitioning=function(t){this._isTransitioning=t},e.dispose=function(){i.default.removeData(this._element,j),this._config=null,this._parent=null,this._element=null,this._triggerArray=null,this._isTransitioning=null},e._getConfig=function(t){return(t=a({},q,t)).toggle=Boolean(t.toggle),u.typeCheckConfig(x,t,Q),t},e._getDimension=function(){return i.default(this._element).hasClass(H)?H:"height"},e._getParent=function(){var e,n=this;u.isElement(this._config.parent)?(e=this._config.parent,"undefined"!=typeof this._config.parent.jquery&&(e=this._config.parent[0])):e=document.querySelector(this._config.parent);var o='[data-toggle="collapse"][data-parent="'+this._config.parent+'"]',r=[].slice.call(e.querySelectorAll(o));return i.default(r).each((function(e,i){n._addAriaAndCollapsedClass(t._getTargetFromElement(i),[i])})),e},e._addAriaAndCollapsedClass=function(t,e){var n=i.default(t).hasClass(P);e.length&&i.default(e).toggleClass(B,!n).attr("aria-expanded",n)},t._getTargetFromElement=function(t){var e=u.getSelectorFromElement(t);return e?document.querySelector(e):null},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this),o=n.data(j),r=a({},q,n.data(),"object"==typeof e&&e?e:{});if(!o&&r.toggle&&"string"==typeof e&&/show|hide/.test(e)&&(r.toggle=!1),o||(o=new t(this,r),n.data(j,o)),"string"==typeof e){if("undefined"==typeof o[e])throw new TypeError('No method named "'+e+'"');o[e]()}}))},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"Default",get:function(){return q}}]),t}();i.default(document).on("click.bs.collapse.data-api",M,(function(t){"A"===t.currentTarget.tagName&&t.preventDefault();var e=i.default(this),n=u.getSelectorFromElement(this),o=[].slice.call(document.querySelectorAll(n));i.default(o).each((function(){var t=i.default(this),n=t.data(j)?"toggle":e.data();W._jQueryInterface.call(t,n)}))})),i.default.fn[x]=W._jQueryInterface,i.default.fn[x].Constructor=W,i.default.fn[x].noConflict=function(){return i.default.fn[x]=L,W._jQueryInterface};var U="undefined"!=typeof window&&"undefined"!=typeof document&&"undefined"!=typeof navigator,V=function(){for(var t=["Edge","Trident","Firefox"],e=0;e<t.length;e+=1)if(U&&navigator.userAgent.indexOf(t[e])>=0)return 1;return 0}(),Y=U&&window.Promise?function(t){var e=!1;return function(){e||(e=!0,window.Promise.resolve().then((function(){e=!1,t()})))}}:function(t){var e=!1;return function(){e||(e=!0,setTimeout((function(){e=!1,t()}),V))}};function z(t){return t&&"[object Function]"==={}.toString.call(t)}function K(t,e){if(1!==t.nodeType)return[];var n=t.ownerDocument.defaultView.getComputedStyle(t,null);return e?n[e]:n}function X(t){return"HTML"===t.nodeName?t:t.parentNode||t.host}function G(t){if(!t)return document.body;switch(t.nodeName){case"HTML":case"BODY":return t.ownerDocument.body;case"#document":return t.body}var e=K(t),n=e.overflow,i=e.overflowX,o=e.overflowY;return/(auto|scroll|overlay)/.test(n+o+i)?t:G(X(t))}function $(t){return t&&t.referenceNode?t.referenceNode:t}var J=U&&!(!window.MSInputMethodContext||!document.documentMode),Z=U&&/MSIE 10/.test(navigator.userAgent);function tt(t){return 11===t?J:10===t?Z:J||Z}function et(t){if(!t)return document.documentElement;for(var e=tt(10)?document.body:null,n=t.offsetParent||null;n===e&&t.nextElementSibling;)n=(t=t.nextElementSibling).offsetParent;var i=n&&n.nodeName;return i&&"BODY"!==i&&"HTML"!==i?-1!==["TH","TD","TABLE"].indexOf(n.nodeName)&&"static"===K(n,"position")?et(n):n:t?t.ownerDocument.documentElement:document.documentElement}function nt(t){return null!==t.parentNode?nt(t.parentNode):t}function it(t,e){if(!(t&&t.nodeType&&e&&e.nodeType))return document.documentElement;var n=t.compareDocumentPosition(e)&Node.DOCUMENT_POSITION_FOLLOWING,i=n?t:e,o=n?e:t,r=document.createRange();r.setStart(i,0),r.setEnd(o,0);var a,s,l=r.commonAncestorContainer;if(t!==l&&e!==l||i.contains(o))return"BODY"===(s=(a=l).nodeName)||"HTML"!==s&&et(a.firstElementChild)!==a?et(l):l;var u=nt(t);return u.host?it(u.host,e):it(t,nt(e).host)}function ot(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"top",n="top"===e?"scrollTop":"scrollLeft",i=t.nodeName;if("BODY"===i||"HTML"===i){var o=t.ownerDocument.documentElement,r=t.ownerDocument.scrollingElement||o;return r[n]}return t[n]}function rt(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],i=ot(e,"top"),o=ot(e,"left"),r=n?-1:1;return t.top+=i*r,t.bottom+=i*r,t.left+=o*r,t.right+=o*r,t}function at(t,e){var n="x"===e?"Left":"Top",i="Left"===n?"Right":"Bottom";return parseFloat(t["border"+n+"Width"])+parseFloat(t["border"+i+"Width"])}function st(t,e,n,i){return Math.max(e["offset"+t],e["scroll"+t],n["client"+t],n["offset"+t],n["scroll"+t],tt(10)?parseInt(n["offset"+t])+parseInt(i["margin"+("Height"===t?"Top":"Left")])+parseInt(i["margin"+("Height"===t?"Bottom":"Right")]):0)}function lt(t){var e=t.body,n=t.documentElement,i=tt(10)&&getComputedStyle(n);return{height:st("Height",e,n,i),width:st("Width",e,n,i)}}var ut=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")},ft=function(){function t(t,e){for(var n=0;n<e.length;n++){var i=e[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(e,n,i){return n&&t(e.prototype,n),i&&t(e,i),e}}(),dt=function(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t},ct=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var i in n)Object.prototype.hasOwnProperty.call(n,i)&&(t[i]=n[i])}return t};function ht(t){return ct({},t,{right:t.left+t.width,bottom:t.top+t.height})}function pt(t){var e={};try{if(tt(10)){e=t.getBoundingClientRect();var n=ot(t,"top"),i=ot(t,"left");e.top+=n,e.left+=i,e.bottom+=n,e.right+=i}else e=t.getBoundingClientRect()}catch(t){}var o={left:e.left,top:e.top,width:e.right-e.left,height:e.bottom-e.top},r="HTML"===t.nodeName?lt(t.ownerDocument):{},a=r.width||t.clientWidth||o.width,s=r.height||t.clientHeight||o.height,l=t.offsetWidth-a,u=t.offsetHeight-s;if(l||u){var f=K(t);l-=at(f,"x"),u-=at(f,"y"),o.width-=l,o.height-=u}return ht(o)}function mt(t,e){var n=arguments.length>2&&void 0!==arguments[2]&&arguments[2],i=tt(10),o="HTML"===e.nodeName,r=pt(t),a=pt(e),s=G(t),l=K(e),u=parseFloat(l.borderTopWidth),f=parseFloat(l.borderLeftWidth);n&&o&&(a.top=Math.max(a.top,0),a.left=Math.max(a.left,0));var d=ht({top:r.top-a.top-u,left:r.left-a.left-f,width:r.width,height:r.height});if(d.marginTop=0,d.marginLeft=0,!i&&o){var c=parseFloat(l.marginTop),h=parseFloat(l.marginLeft);d.top-=u-c,d.bottom-=u-c,d.left-=f-h,d.right-=f-h,d.marginTop=c,d.marginLeft=h}return(i&&!n?e.contains(s):e===s&&"BODY"!==s.nodeName)&&(d=rt(d,e)),d}function gt(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=t.ownerDocument.documentElement,i=mt(t,n),o=Math.max(n.clientWidth,window.innerWidth||0),r=Math.max(n.clientHeight,window.innerHeight||0),a=e?0:ot(n),s=e?0:ot(n,"left"),l={top:a-i.top+i.marginTop,left:s-i.left+i.marginLeft,width:o,height:r};return ht(l)}function _t(t){var e=t.nodeName;if("BODY"===e||"HTML"===e)return!1;if("fixed"===K(t,"position"))return!0;var n=X(t);return!!n&&_t(n)}function vt(t){if(!t||!t.parentElement||tt())return document.documentElement;for(var e=t.parentElement;e&&"none"===K(e,"transform");)e=e.parentElement;return e||document.documentElement}function bt(t,e,n,i){var o=arguments.length>4&&void 0!==arguments[4]&&arguments[4],r={top:0,left:0},a=o?vt(t):it(t,$(e));if("viewport"===i)r=gt(a,o);else{var s=void 0;"scrollParent"===i?"BODY"===(s=G(X(e))).nodeName&&(s=t.ownerDocument.documentElement):s="window"===i?t.ownerDocument.documentElement:i;var l=mt(s,a,o);if("HTML"!==s.nodeName||_t(a))r=l;else{var u=lt(t.ownerDocument),f=u.height,d=u.width;r.top+=l.top-l.marginTop,r.bottom=f+l.top,r.left+=l.left-l.marginLeft,r.right=d+l.left}}var c="number"==typeof(n=n||0);return r.left+=c?n:n.left||0,r.top+=c?n:n.top||0,r.right-=c?n:n.right||0,r.bottom-=c?n:n.bottom||0,r}function yt(t){return t.width*t.height}function Et(t,e,n,i,o){var r=arguments.length>5&&void 0!==arguments[5]?arguments[5]:0;if(-1===t.indexOf("auto"))return t;var a=bt(n,i,r,o),s={top:{width:a.width,height:e.top-a.top},right:{width:a.right-e.right,height:a.height},bottom:{width:a.width,height:a.bottom-e.bottom},left:{width:e.left-a.left,height:a.height}},l=Object.keys(s).map((function(t){return ct({key:t},s[t],{area:yt(s[t])})})).sort((function(t,e){return e.area-t.area})),u=l.filter((function(t){var e=t.width,i=t.height;return e>=n.clientWidth&&i>=n.clientHeight})),f=u.length>0?u[0].key:l[0].key,d=t.split("-")[1];return f+(d?"-"+d:"")}function wt(t,e,n){var i=arguments.length>3&&void 0!==arguments[3]?arguments[3]:null,o=i?vt(e):it(e,$(n));return mt(n,o,i)}function Tt(t){var e=t.ownerDocument.defaultView.getComputedStyle(t),n=parseFloat(e.marginTop||0)+parseFloat(e.marginBottom||0),i=parseFloat(e.marginLeft||0)+parseFloat(e.marginRight||0);return{width:t.offsetWidth+i,height:t.offsetHeight+n}}function Ct(t){var e={left:"right",right:"left",bottom:"top",top:"bottom"};return t.replace(/left|right|bottom|top/g,(function(t){return e[t]}))}function St(t,e,n){n=n.split("-")[0];var i=Tt(t),o={width:i.width,height:i.height},r=-1!==["right","left"].indexOf(n),a=r?"top":"left",s=r?"left":"top",l=r?"height":"width",u=r?"width":"height";return o[a]=e[a]+e[l]/2-i[l]/2,o[s]=n===s?e[s]-i[u]:e[Ct(s)],o}function Nt(t,e){return Array.prototype.find?t.find(e):t.filter(e)[0]}function Dt(t,e,n){return(void 0===n?t:t.slice(0,function(t,e,n){if(Array.prototype.findIndex)return t.findIndex((function(t){return t.name===n}));var i=Nt(t,(function(t){return t.name===n}));return t.indexOf(i)}(t,0,n))).forEach((function(t){t.function&&console.warn("`modifier.function` is deprecated, use `modifier.fn`!");var n=t.function||t.fn;t.enabled&&z(n)&&(e.offsets.popper=ht(e.offsets.popper),e.offsets.reference=ht(e.offsets.reference),e=n(e,t))})),e}function At(){if(!this.state.isDestroyed){var t={instance:this,styles:{},arrowStyles:{},attributes:{},flipped:!1,offsets:{}};t.offsets.reference=wt(this.state,this.popper,this.reference,this.options.positionFixed),t.placement=Et(this.options.placement,t.offsets.reference,this.popper,this.reference,this.options.modifiers.flip.boundariesElement,this.options.modifiers.flip.padding),t.originalPlacement=t.placement,t.positionFixed=this.options.positionFixed,t.offsets.popper=St(this.popper,t.offsets.reference,t.placement),t.offsets.popper.position=this.options.positionFixed?"fixed":"absolute",t=Dt(this.modifiers,t),this.state.isCreated?this.options.onUpdate(t):(this.state.isCreated=!0,this.options.onCreate(t))}}function kt(t,e){return t.some((function(t){var n=t.name;return t.enabled&&n===e}))}function It(t){for(var e=[!1,"ms","Webkit","Moz","O"],n=t.charAt(0).toUpperCase()+t.slice(1),i=0;i<e.length;i++){var o=e[i],r=o?""+o+n:t;if("undefined"!=typeof document.body.style[r])return r}return null}function Ot(){return this.state.isDestroyed=!0,kt(this.modifiers,"applyStyle")&&(this.popper.removeAttribute("x-placement"),this.popper.style.position="",this.popper.style.top="",this.popper.style.left="",this.popper.style.right="",this.popper.style.bottom="",this.popper.style.willChange="",this.popper.style[It("transform")]=""),this.disableEventListeners(),this.options.removeOnDestroy&&this.popper.parentNode.removeChild(this.popper),this}function xt(t){var e=t.ownerDocument;return e?e.defaultView:window}function jt(t,e,n,i){var o="BODY"===t.nodeName,r=o?t.ownerDocument.defaultView:t;r.addEventListener(e,n,{passive:!0}),o||jt(G(r.parentNode),e,n,i),i.push(r)}function Lt(t,e,n,i){n.updateBound=i,xt(t).addEventListener("resize",n.updateBound,{passive:!0});var o=G(t);return jt(o,"scroll",n.updateBound,n.scrollParents),n.scrollElement=o,n.eventsEnabled=!0,n}function Pt(){this.state.eventsEnabled||(this.state=Lt(this.reference,this.options,this.state,this.scheduleUpdate))}function Ft(){var t,e;this.state.eventsEnabled&&(cancelAnimationFrame(this.scheduleUpdate),this.state=(t=this.reference,e=this.state,xt(t).removeEventListener("resize",e.updateBound),e.scrollParents.forEach((function(t){t.removeEventListener("scroll",e.updateBound)})),e.updateBound=null,e.scrollParents=[],e.scrollElement=null,e.eventsEnabled=!1,e))}function Rt(t){return""!==t&&!isNaN(parseFloat(t))&&isFinite(t)}function Bt(t,e){Object.keys(e).forEach((function(n){var i="";-1!==["width","height","top","right","bottom","left"].indexOf(n)&&Rt(e[n])&&(i="px"),t.style[n]=e[n]+i}))}var Ht=U&&/Firefox/i.test(navigator.userAgent);function Mt(t,e,n){var i=Nt(t,(function(t){return t.name===e})),o=!!i&&t.some((function(t){return t.name===n&&t.enabled&&t.order<i.order}));if(!o){var r="`"+e+"`",a="`"+n+"`";console.warn(a+" modifier is required by "+r+" modifier in order to work, be sure to include it before "+r+"!")}return o}var qt=["auto-start","auto","auto-end","top-start","top","top-end","right-start","right","right-end","bottom-end","bottom","bottom-start","left-end","left","left-start"],Qt=qt.slice(3);function Wt(t){var e=arguments.length>1&&void 0!==arguments[1]&&arguments[1],n=Qt.indexOf(t),i=Qt.slice(n+1).concat(Qt.slice(0,n));return e?i.reverse():i}var Ut={placement:"bottom",positionFixed:!1,eventsEnabled:!0,removeOnDestroy:!1,onCreate:function(){},onUpdate:function(){},modifiers:{shift:{order:100,enabled:!0,fn:function(t){var e=t.placement,n=e.split("-")[0],i=e.split("-")[1];if(i){var o=t.offsets,r=o.reference,a=o.popper,s=-1!==["bottom","top"].indexOf(n),l=s?"left":"top",u=s?"width":"height",f={start:dt({},l,r[l]),end:dt({},l,r[l]+r[u]-a[u])};t.offsets.popper=ct({},a,f[i])}return t}},offset:{order:200,enabled:!0,fn:function(t,e){var n,i=e.offset,o=t.placement,r=t.offsets,a=r.popper,s=r.reference,l=o.split("-")[0];return n=Rt(+i)?[+i,0]:function(t,e,n,i){var o=[0,0],r=-1!==["right","left"].indexOf(i),a=t.split(/(\+|\-)/).map((function(t){return t.trim()})),s=a.indexOf(Nt(a,(function(t){return-1!==t.search(/,|\s/)})));a[s]&&-1===a[s].indexOf(",")&&console.warn("Offsets separated by white space(s) are deprecated, use a comma (,) instead.");var l=/\s*,\s*|\s+/,u=-1!==s?[a.slice(0,s).concat([a[s].split(l)[0]]),[a[s].split(l)[1]].concat(a.slice(s+1))]:[a];return u=u.map((function(t,i){var o=(1===i?!r:r)?"height":"width",a=!1;return t.reduce((function(t,e){return""===t[t.length-1]&&-1!==["+","-"].indexOf(e)?(t[t.length-1]=e,a=!0,t):a?(t[t.length-1]+=e,a=!1,t):t.concat(e)}),[]).map((function(t){return function(t,e,n,i){var o=t.match(/((?:\-|\+)?\d*\.?\d*)(.*)/),r=+o[1],a=o[2];return r?0===a.indexOf("%")?ht("%p"===a?n:i)[e]/100*r:"vh"===a||"vw"===a?("vh"===a?Math.max(document.documentElement.clientHeight,window.innerHeight||0):Math.max(document.documentElement.clientWidth,window.innerWidth||0))/100*r:r:t}(t,o,e,n)}))})),u.forEach((function(t,e){t.forEach((function(n,i){Rt(n)&&(o[e]+=n*("-"===t[i-1]?-1:1))}))})),o}(i,a,s,l),"left"===l?(a.top+=n[0],a.left-=n[1]):"right"===l?(a.top+=n[0],a.left+=n[1]):"top"===l?(a.left+=n[0],a.top-=n[1]):"bottom"===l&&(a.left+=n[0],a.top+=n[1]),t.popper=a,t},offset:0},preventOverflow:{order:300,enabled:!0,fn:function(t,e){var n=e.boundariesElement||et(t.instance.popper);t.instance.reference===n&&(n=et(n));var i=It("transform"),o=t.instance.popper.style,r=o.top,a=o.left,s=o[i];o.top="",o.left="",o[i]="";var l=bt(t.instance.popper,t.instance.reference,e.padding,n,t.positionFixed);o.top=r,o.left=a,o[i]=s,e.boundaries=l;var u=e.priority,f=t.offsets.popper,d={primary:function(t){var n=f[t];return f[t]<l[t]&&!e.escapeWithReference&&(n=Math.max(f[t],l[t])),dt({},t,n)},secondary:function(t){var n="right"===t?"left":"top",i=f[n];return f[t]>l[t]&&!e.escapeWithReference&&(i=Math.min(f[n],l[t]-("right"===t?f.width:f.height))),dt({},n,i)}};return u.forEach((function(t){var e=-1!==["left","top"].indexOf(t)?"primary":"secondary";f=ct({},f,d[e](t))})),t.offsets.popper=f,t},priority:["left","right","top","bottom"],padding:5,boundariesElement:"scrollParent"},keepTogether:{order:400,enabled:!0,fn:function(t){var e=t.offsets,n=e.popper,i=e.reference,o=t.placement.split("-")[0],r=Math.floor,a=-1!==["top","bottom"].indexOf(o),s=a?"right":"bottom",l=a?"left":"top",u=a?"width":"height";return n[s]<r(i[l])&&(t.offsets.popper[l]=r(i[l])-n[u]),n[l]>r(i[s])&&(t.offsets.popper[l]=r(i[s])),t}},arrow:{order:500,enabled:!0,fn:function(t,e){var n;if(!Mt(t.instance.modifiers,"arrow","keepTogether"))return t;var i=e.element;if("string"==typeof i){if(!(i=t.instance.popper.querySelector(i)))return t}else if(!t.instance.popper.contains(i))return console.warn("WARNING: `arrow.element` must be child of its popper element!"),t;var o=t.placement.split("-")[0],r=t.offsets,a=r.popper,s=r.reference,l=-1!==["left","right"].indexOf(o),u=l?"height":"width",f=l?"Top":"Left",d=f.toLowerCase(),c=l?"left":"top",h=l?"bottom":"right",p=Tt(i)[u];s[h]-p<a[d]&&(t.offsets.popper[d]-=a[d]-(s[h]-p)),s[d]+p>a[h]&&(t.offsets.popper[d]+=s[d]+p-a[h]),t.offsets.popper=ht(t.offsets.popper);var m=s[d]+s[u]/2-p/2,g=K(t.instance.popper),_=parseFloat(g["margin"+f]),v=parseFloat(g["border"+f+"Width"]),b=m-t.offsets.popper[d]-_-v;return b=Math.max(Math.min(a[u]-p,b),0),t.arrowElement=i,t.offsets.arrow=(dt(n={},d,Math.round(b)),dt(n,c,""),n),t},element:"[x-arrow]"},flip:{order:600,enabled:!0,fn:function(t,e){if(kt(t.instance.modifiers,"inner"))return t;if(t.flipped&&t.placement===t.originalPlacement)return t;var n=bt(t.instance.popper,t.instance.reference,e.padding,e.boundariesElement,t.positionFixed),i=t.placement.split("-")[0],o=Ct(i),r=t.placement.split("-")[1]||"",a=[];switch(e.behavior){case"flip":a=[i,o];break;case"clockwise":a=Wt(i);break;case"counterclockwise":a=Wt(i,!0);break;default:a=e.behavior}return a.forEach((function(s,l){if(i!==s||a.length===l+1)return t;i=t.placement.split("-")[0],o=Ct(i);var u=t.offsets.popper,f=t.offsets.reference,d=Math.floor,c="left"===i&&d(u.right)>d(f.left)||"right"===i&&d(u.left)<d(f.right)||"top"===i&&d(u.bottom)>d(f.top)||"bottom"===i&&d(u.top)<d(f.bottom),h=d(u.left)<d(n.left),p=d(u.right)>d(n.right),m=d(u.top)<d(n.top),g=d(u.bottom)>d(n.bottom),_="left"===i&&h||"right"===i&&p||"top"===i&&m||"bottom"===i&&g,v=-1!==["top","bottom"].indexOf(i),b=!!e.flipVariations&&(v&&"start"===r&&h||v&&"end"===r&&p||!v&&"start"===r&&m||!v&&"end"===r&&g),y=!!e.flipVariationsByContent&&(v&&"start"===r&&p||v&&"end"===r&&h||!v&&"start"===r&&g||!v&&"end"===r&&m),E=b||y;(c||_||E)&&(t.flipped=!0,(c||_)&&(i=a[l+1]),E&&(r=function(t){return"end"===t?"start":"start"===t?"end":t}(r)),t.placement=i+(r?"-"+r:""),t.offsets.popper=ct({},t.offsets.popper,St(t.instance.popper,t.offsets.reference,t.placement)),t=Dt(t.instance.modifiers,t,"flip"))})),t},behavior:"flip",padding:5,boundariesElement:"viewport",flipVariations:!1,flipVariationsByContent:!1},inner:{order:700,enabled:!1,fn:function(t){var e=t.placement,n=e.split("-")[0],i=t.offsets,o=i.popper,r=i.reference,a=-1!==["left","right"].indexOf(n),s=-1===["top","left"].indexOf(n);return o[a?"left":"top"]=r[n]-(s?o[a?"width":"height"]:0),t.placement=Ct(e),t.offsets.popper=ht(o),t}},hide:{order:800,enabled:!0,fn:function(t){if(!Mt(t.instance.modifiers,"hide","preventOverflow"))return t;var e=t.offsets.reference,n=Nt(t.instance.modifiers,(function(t){return"preventOverflow"===t.name})).boundaries;if(e.bottom<n.top||e.left>n.right||e.top>n.bottom||e.right<n.left){if(!0===t.hide)return t;t.hide=!0,t.attributes["x-out-of-boundaries"]=""}else{if(!1===t.hide)return t;t.hide=!1,t.attributes["x-out-of-boundaries"]=!1}return t}},computeStyle:{order:850,enabled:!0,fn:function(t,e){var n=e.x,i=e.y,o=t.offsets.popper,r=Nt(t.instance.modifiers,(function(t){return"applyStyle"===t.name})).gpuAcceleration;void 0!==r&&console.warn("WARNING: `gpuAcceleration` option moved to `computeStyle` modifier and will not be supported in future versions of Popper.js!");var a,s,l=void 0!==r?r:e.gpuAcceleration,u=et(t.instance.popper),f=pt(u),d={position:o.position},c=function(t,e){var n=t.offsets,i=n.popper,o=n.reference,r=Math.round,a=Math.floor,s=function(t){return t},l=r(o.width),u=r(i.width),f=-1!==["left","right"].indexOf(t.placement),d=-1!==t.placement.indexOf("-"),c=e?f||d||l%2==u%2?r:a:s,h=e?r:s;return{left:c(l%2==1&&u%2==1&&!d&&e?i.left-1:i.left),top:h(i.top),bottom:h(i.bottom),right:c(i.right)}}(t,window.devicePixelRatio<2||!Ht),h="bottom"===n?"top":"bottom",p="right"===i?"left":"right",m=It("transform");if(s="bottom"===h?"HTML"===u.nodeName?-u.clientHeight+c.bottom:-f.height+c.bottom:c.top,a="right"===p?"HTML"===u.nodeName?-u.clientWidth+c.right:-f.width+c.right:c.left,l&&m)d[m]="translate3d("+a+"px, "+s+"px, 0)",d[h]=0,d[p]=0,d.willChange="transform";else{var g="bottom"===h?-1:1,_="right"===p?-1:1;d[h]=s*g,d[p]=a*_,d.willChange=h+", "+p}var v={"x-placement":t.placement};return t.attributes=ct({},v,t.attributes),t.styles=ct({},d,t.styles),t.arrowStyles=ct({},t.offsets.arrow,t.arrowStyles),t},gpuAcceleration:!0,x:"bottom",y:"right"},applyStyle:{order:900,enabled:!0,fn:function(t){var e,n;return Bt(t.instance.popper,t.styles),e=t.instance.popper,n=t.attributes,Object.keys(n).forEach((function(t){!1!==n[t]?e.setAttribute(t,n[t]):e.removeAttribute(t)})),t.arrowElement&&Object.keys(t.arrowStyles).length&&Bt(t.arrowElement,t.arrowStyles),t},onLoad:function(t,e,n,i,o){var r=wt(o,e,t,n.positionFixed),a=Et(n.placement,r,e,t,n.modifiers.flip.boundariesElement,n.modifiers.flip.padding);return e.setAttribute("x-placement",a),Bt(e,{position:n.positionFixed?"fixed":"absolute"}),n},gpuAcceleration:void 0}}},Vt=function(){function t(e,n){var i=this,o=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{};ut(this,t),this.scheduleUpdate=function(){return requestAnimationFrame(i.update)},this.update=Y(this.update.bind(this)),this.options=ct({},t.Defaults,o),this.state={isDestroyed:!1,isCreated:!1,scrollParents:[]},this.reference=e&&e.jquery?e[0]:e,this.popper=n&&n.jquery?n[0]:n,this.options.modifiers={},Object.keys(ct({},t.Defaults.modifiers,o.modifiers)).forEach((function(e){i.options.modifiers[e]=ct({},t.Defaults.modifiers[e]||{},o.modifiers?o.modifiers[e]:{})})),this.modifiers=Object.keys(this.options.modifiers).map((function(t){return ct({name:t},i.options.modifiers[t])})).sort((function(t,e){return t.order-e.order})),this.modifiers.forEach((function(t){t.enabled&&z(t.onLoad)&&t.onLoad(i.reference,i.popper,i.options,t,i.state)})),this.update();var r=this.options.eventsEnabled;r&&this.enableEventListeners(),this.state.eventsEnabled=r}return ft(t,[{key:"update",value:function(){return At.call(this)}},{key:"destroy",value:function(){return Ot.call(this)}},{key:"enableEventListeners",value:function(){return Pt.call(this)}},{key:"disableEventListeners",value:function(){return Ft.call(this)}}]),t}();Vt.Utils=("undefined"!=typeof window?window:global).PopperUtils,Vt.placements=qt,Vt.Defaults=Ut;var Yt=Vt,zt="dropdown",Kt="bs.dropdown",Xt=i.default.fn[zt],Gt=new RegExp("38|40|27"),$t="disabled",Jt="show",Zt="dropdown-menu-right",te="hide.bs.dropdown",ee="hidden.bs.dropdown",ne="click.bs.dropdown.data-api",ie="keydown.bs.dropdown.data-api",oe='[data-toggle="dropdown"]',re=".dropdown-menu",ae={offset:0,flip:!0,boundary:"scrollParent",reference:"toggle",display:"dynamic",popperConfig:null},se={offset:"(number|string|function)",flip:"boolean",boundary:"(string|element)",reference:"(string|element)",display:"string",popperConfig:"(null|object)"},le=function(){function t(t,e){this._element=t,this._popper=null,this._config=this._getConfig(e),this._menu=this._getMenuElement(),this._inNavbar=this._detectNavbar(),this._addEventListeners()}var e=t.prototype;return e.toggle=function(){if(!this._element.disabled&&!i.default(this._element).hasClass($t)){var e=i.default(this._menu).hasClass(Jt);t._clearMenus(),e||this.show(!0)}},e.show=function(e){if(void 0===e&&(e=!1),!(this._element.disabled||i.default(this._element).hasClass($t)||i.default(this._menu).hasClass(Jt))){var n={relatedTarget:this._element},o=i.default.Event("show.bs.dropdown",n),r=t._getParentFromElement(this._element);if(i.default(r).trigger(o),!o.isDefaultPrevented()){if(!this._inNavbar&&e){if("undefined"==typeof Yt)throw new TypeError("Bootstrap's dropdowns require Popper (https://popper.js.org)");var a=this._element;"parent"===this._config.reference?a=r:u.isElement(this._config.reference)&&(a=this._config.reference,"undefined"!=typeof this._config.reference.jquery&&(a=this._config.reference[0])),"scrollParent"!==this._config.boundary&&i.default(r).addClass("position-static"),this._popper=new Yt(a,this._menu,this._getPopperConfig())}"ontouchstart"in document.documentElement&&0===i.default(r).closest(".navbar-nav").length&&i.default(document.body).children().on("mouseover",null,i.default.noop),this._element.focus(),this._element.setAttribute("aria-expanded",!0),i.default(this._menu).toggleClass(Jt),i.default(r).toggleClass(Jt).trigger(i.default.Event("shown.bs.dropdown",n))}}},e.hide=function(){if(!this._element.disabled&&!i.default(this._element).hasClass($t)&&i.default(this._menu).hasClass(Jt)){var e={relatedTarget:this._element},n=i.default.Event(te,e),o=t._getParentFromElement(this._element);i.default(o).trigger(n),n.isDefaultPrevented()||(this._popper&&this._popper.destroy(),i.default(this._menu).toggleClass(Jt),i.default(o).toggleClass(Jt).trigger(i.default.Event(ee,e)))}},e.dispose=function(){i.default.removeData(this._element,Kt),i.default(this._element).off(".bs.dropdown"),this._element=null,this._menu=null,null!==this._popper&&(this._popper.destroy(),this._popper=null)},e.update=function(){this._inNavbar=this._detectNavbar(),null!==this._popper&&this._popper.scheduleUpdate()},e._addEventListeners=function(){var t=this;i.default(this._element).on("click.bs.dropdown",(function(e){e.preventDefault(),e.stopPropagation(),t.toggle()}))},e._getConfig=function(t){return t=a({},this.constructor.Default,i.default(this._element).data(),t),u.typeCheckConfig(zt,t,this.constructor.DefaultType),t},e._getMenuElement=function(){if(!this._menu){var e=t._getParentFromElement(this._element);e&&(this._menu=e.querySelector(re))}return this._menu},e._getPlacement=function(){var t=i.default(this._element.parentNode),e="bottom-start";return t.hasClass("dropup")?e=i.default(this._menu).hasClass(Zt)?"top-end":"top-start":t.hasClass("dropright")?e="right-start":t.hasClass("dropleft")?e="left-start":i.default(this._menu).hasClass(Zt)&&(e="bottom-end"),e},e._detectNavbar=function(){return i.default(this._element).closest(".navbar").length>0},e._getOffset=function(){var t=this,e={};return"function"==typeof this._config.offset?e.fn=function(e){return e.offsets=a({},e.offsets,t._config.offset(e.offsets,t._element)),e}:e.offset=this._config.offset,e},e._getPopperConfig=function(){var t={placement:this._getPlacement(),modifiers:{offset:this._getOffset(),flip:{enabled:this._config.flip},preventOverflow:{boundariesElement:this._config.boundary}}};return"static"===this._config.display&&(t.modifiers.applyStyle={enabled:!1}),a({},t,this._config.popperConfig)},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this).data(Kt);if(n||(n=new t(this,"object"==typeof e?e:null),i.default(this).data(Kt,n)),"string"==typeof e){if("undefined"==typeof n[e])throw new TypeError('No method named "'+e+'"');n[e]()}}))},t._clearMenus=function(e){if(!e||3!==e.which&&("keyup"!==e.type||9===e.which))for(var n=[].slice.call(document.querySelectorAll(oe)),o=0,r=n.length;o<r;o++){var a=t._getParentFromElement(n[o]),s=i.default(n[o]).data(Kt),l={relatedTarget:n[o]};if(e&&"click"===e.type&&(l.clickEvent=e),s){var u=s._menu;if(i.default(a).hasClass(Jt)&&!(e&&("click"===e.type&&/input|textarea/i.test(e.target.tagName)||"keyup"===e.type&&9===e.which)&&i.default.contains(a,e.target))){var f=i.default.Event(te,l);i.default(a).trigger(f),f.isDefaultPrevented()||("ontouchstart"in document.documentElement&&i.default(document.body).children().off("mouseover",null,i.default.noop),n[o].setAttribute("aria-expanded","false"),s._popper&&s._popper.destroy(),i.default(u).removeClass(Jt),i.default(a).removeClass(Jt).trigger(i.default.Event(ee,l)))}}}},t._getParentFromElement=function(t){var e,n=u.getSelectorFromElement(t);return n&&(e=document.querySelector(n)),e||t.parentNode},t._dataApiKeydownHandler=function(e){if(!(/input|textarea/i.test(e.target.tagName)?32===e.which||27!==e.which&&(40!==e.which&&38!==e.which||i.default(e.target).closest(re).length):!Gt.test(e.which))&&!this.disabled&&!i.default(this).hasClass($t)){var n=t._getParentFromElement(this),o=i.default(n).hasClass(Jt);if(o||27!==e.which){if(e.preventDefault(),e.stopPropagation(),!o||27===e.which||32===e.which)return 27===e.which&&i.default(n.querySelector(oe)).trigger("focus"),void i.default(this).trigger("click");var r=[].slice.call(n.querySelectorAll(".dropdown-menu .dropdown-item:not(.disabled):not(:disabled)")).filter((function(t){return i.default(t).is(":visible")}));if(0!==r.length){var a=r.indexOf(e.target);38===e.which&&a>0&&a--,40===e.which&&a<r.length-1&&a++,a<0&&(a=0),r[a].focus()}}}},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"Default",get:function(){return ae}},{key:"DefaultType",get:function(){return se}}]),t}();i.default(document).on(ie,oe,le._dataApiKeydownHandler).on(ie,re,le._dataApiKeydownHandler).on(ne+" keyup.bs.dropdown.data-api",le._clearMenus).on(ne,oe,(function(t){t.preventDefault(),t.stopPropagation(),le._jQueryInterface.call(i.default(this),"toggle")})).on(ne,".dropdown form",(function(t){t.stopPropagation()})),i.default.fn[zt]=le._jQueryInterface,i.default.fn[zt].Constructor=le,i.default.fn[zt].noConflict=function(){return i.default.fn[zt]=Xt,le._jQueryInterface};var ue="bs.modal",fe=i.default.fn.modal,de="modal-open",ce="fade",he="show",pe="modal-static",me="hidden.bs.modal",ge="show.bs.modal",_e="focusin.bs.modal",ve="resize.bs.modal",be="click.dismiss.bs.modal",ye="keydown.dismiss.bs.modal",Ee="mousedown.dismiss.bs.modal",we=".fixed-top, .fixed-bottom, .is-fixed, .sticky-top",Te={backdrop:!0,keyboard:!0,focus:!0,show:!0},Ce={backdrop:"(boolean|string)",keyboard:"boolean",focus:"boolean",show:"boolean"},Se=function(){function t(t,e){this._config=this._getConfig(e),this._element=t,this._dialog=t.querySelector(".modal-dialog"),this._backdrop=null,this._isShown=!1,this._isBodyOverflowing=!1,this._ignoreBackdropClick=!1,this._isTransitioning=!1,this._scrollbarWidth=0}var e=t.prototype;return e.toggle=function(t){return this._isShown?this.hide():this.show(t)},e.show=function(t){var e=this;if(!this._isShown&&!this._isTransitioning){var n=i.default.Event(ge,{relatedTarget:t});i.default(this._element).trigger(n),n.isDefaultPrevented()||(this._isShown=!0,i.default(this._element).hasClass(ce)&&(this._isTransitioning=!0),this._checkScrollbar(),this._setScrollbar(),this._adjustDialog(),this._setEscapeEvent(),this._setResizeEvent(),i.default(this._element).on(be,'[data-dismiss="modal"]',(function(t){return e.hide(t)})),i.default(this._dialog).on(Ee,(function(){i.default(e._element).one("mouseup.dismiss.bs.modal",(function(t){i.default(t.target).is(e._element)&&(e._ignoreBackdropClick=!0)}))})),this._showBackdrop((function(){return e._showElement(t)})))}},e.hide=function(t){var e=this;if(t&&t.preventDefault(),this._isShown&&!this._isTransitioning){var n=i.default.Event("hide.bs.modal");if(i.default(this._element).trigger(n),this._isShown&&!n.isDefaultPrevented()){this._isShown=!1;var o=i.default(this._element).hasClass(ce);if(o&&(this._isTransitioning=!0),this._setEscapeEvent(),this._setResizeEvent(),i.default(document).off(_e),i.default(this._element).removeClass(he),i.default(this._element).off(be),i.default(this._dialog).off(Ee),o){var r=u.getTransitionDurationFromElement(this._element);i.default(this._element).one(u.TRANSITION_END,(function(t){return e._hideModal(t)})).emulateTransitionEnd(r)}else this._hideModal()}}},e.dispose=function(){[window,this._element,this._dialog].forEach((function(t){return i.default(t).off(".bs.modal")})),i.default(document).off(_e),i.default.removeData(this._element,ue),this._config=null,this._element=null,this._dialog=null,this._backdrop=null,this._isShown=null,this._isBodyOverflowing=null,this._ignoreBackdropClick=null,this._isTransitioning=null,this._scrollbarWidth=null},e.handleUpdate=function(){this._adjustDialog()},e._getConfig=function(t){return t=a({},Te,t),u.typeCheckConfig("modal",t,Ce),t},e._triggerBackdropTransition=function(){var t=this,e=i.default.Event("hidePrevented.bs.modal");if(i.default(this._element).trigger(e),!e.isDefaultPrevented()){var n=this._element.scrollHeight>document.documentElement.clientHeight;n||(this._element.style.overflowY="hidden"),this._element.classList.add(pe);var o=u.getTransitionDurationFromElement(this._dialog);i.default(this._element).off(u.TRANSITION_END),i.default(this._element).one(u.TRANSITION_END,(function(){t._element.classList.remove(pe),n||i.default(t._element).one(u.TRANSITION_END,(function(){t._element.style.overflowY=""})).emulateTransitionEnd(t._element,o)})).emulateTransitionEnd(o),this._element.focus()}},e._showElement=function(t){var e=this,n=i.default(this._element).hasClass(ce),o=this._dialog?this._dialog.querySelector(".modal-body"):null;this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE||document.body.appendChild(this._element),this._element.style.display="block",this._element.removeAttribute("aria-hidden"),this._element.setAttribute("aria-modal",!0),this._element.setAttribute("role","dialog"),i.default(this._dialog).hasClass("modal-dialog-scrollable")&&o?o.scrollTop=0:this._element.scrollTop=0,n&&u.reflow(this._element),i.default(this._element).addClass(he),this._config.focus&&this._enforceFocus();var r=i.default.Event("shown.bs.modal",{relatedTarget:t}),a=function(){e._config.focus&&e._element.focus(),e._isTransitioning=!1,i.default(e._element).trigger(r)};if(n){var s=u.getTransitionDurationFromElement(this._dialog);i.default(this._dialog).one(u.TRANSITION_END,a).emulateTransitionEnd(s)}else a()},e._enforceFocus=function(){var t=this;i.default(document).off(_e).on(_e,(function(e){document!==e.target&&t._element!==e.target&&0===i.default(t._element).has(e.target).length&&t._element.focus()}))},e._setEscapeEvent=function(){var t=this;this._isShown?i.default(this._element).on(ye,(function(e){t._config.keyboard&&27===e.which?(e.preventDefault(),t.hide()):t._config.keyboard||27!==e.which||t._triggerBackdropTransition()})):this._isShown||i.default(this._element).off(ye)},e._setResizeEvent=function(){var t=this;this._isShown?i.default(window).on(ve,(function(e){return t.handleUpdate(e)})):i.default(window).off(ve)},e._hideModal=function(){var t=this;this._element.style.display="none",this._element.setAttribute("aria-hidden",!0),this._element.removeAttribute("aria-modal"),this._element.removeAttribute("role"),this._isTransitioning=!1,this._showBackdrop((function(){i.default(document.body).removeClass(de),t._resetAdjustments(),t._resetScrollbar(),i.default(t._element).trigger(me)}))},e._removeBackdrop=function(){this._backdrop&&(i.default(this._backdrop).remove(),this._backdrop=null)},e._showBackdrop=function(t){var e=this,n=i.default(this._element).hasClass(ce)?ce:"";if(this._isShown&&this._config.backdrop){if(this._backdrop=document.createElement("div"),this._backdrop.className="modal-backdrop",n&&this._backdrop.classList.add(n),i.default(this._backdrop).appendTo(document.body),i.default(this._element).on(be,(function(t){e._ignoreBackdropClick?e._ignoreBackdropClick=!1:t.target===t.currentTarget&&("static"===e._config.backdrop?e._triggerBackdropTransition():e.hide())})),n&&u.reflow(this._backdrop),i.default(this._backdrop).addClass(he),!t)return;if(!n)return void t();var o=u.getTransitionDurationFromElement(this._backdrop);i.default(this._backdrop).one(u.TRANSITION_END,t).emulateTransitionEnd(o)}else if(!this._isShown&&this._backdrop){i.default(this._backdrop).removeClass(he);var r=function(){e._removeBackdrop(),t&&t()};if(i.default(this._element).hasClass(ce)){var a=u.getTransitionDurationFromElement(this._backdrop);i.default(this._backdrop).one(u.TRANSITION_END,r).emulateTransitionEnd(a)}else r()}else t&&t()},e._adjustDialog=function(){var t=this._element.scrollHeight>document.documentElement.clientHeight;!this._isBodyOverflowing&&t&&(this._element.style.paddingLeft=this._scrollbarWidth+"px"),this._isBodyOverflowing&&!t&&(this._element.style.paddingRight=this._scrollbarWidth+"px")},e._resetAdjustments=function(){this._element.style.paddingLeft="",this._element.style.paddingRight=""},e._checkScrollbar=function(){var t=document.body.getBoundingClientRect();this._isBodyOverflowing=Math.round(t.left+t.right)<window.innerWidth,this._scrollbarWidth=this._getScrollbarWidth()},e._setScrollbar=function(){var t=this;if(this._isBodyOverflowing){var e=[].slice.call(document.querySelectorAll(we)),n=[].slice.call(document.querySelectorAll(".sticky-top"));i.default(e).each((function(e,n){var o=n.style.paddingRight,r=i.default(n).css("padding-right");i.default(n).data("padding-right",o).css("padding-right",parseFloat(r)+t._scrollbarWidth+"px")})),i.default(n).each((function(e,n){var o=n.style.marginRight,r=i.default(n).css("margin-right");i.default(n).data("margin-right",o).css("margin-right",parseFloat(r)-t._scrollbarWidth+"px")}));var o=document.body.style.paddingRight,r=i.default(document.body).css("padding-right");i.default(document.body).data("padding-right",o).css("padding-right",parseFloat(r)+this._scrollbarWidth+"px")}i.default(document.body).addClass(de)},e._resetScrollbar=function(){var t=[].slice.call(document.querySelectorAll(we));i.default(t).each((function(t,e){var n=i.default(e).data("padding-right");i.default(e).removeData("padding-right"),e.style.paddingRight=n||""}));var e=[].slice.call(document.querySelectorAll(".sticky-top"));i.default(e).each((function(t,e){var n=i.default(e).data("margin-right");"undefined"!=typeof n&&i.default(e).css("margin-right",n).removeData("margin-right")}));var n=i.default(document.body).data("padding-right");i.default(document.body).removeData("padding-right"),document.body.style.paddingRight=n||""},e._getScrollbarWidth=function(){var t=document.createElement("div");t.className="modal-scrollbar-measure",document.body.appendChild(t);var e=t.getBoundingClientRect().width-t.clientWidth;return document.body.removeChild(t),e},t._jQueryInterface=function(e,n){return this.each((function(){var o=i.default(this).data(ue),r=a({},Te,i.default(this).data(),"object"==typeof e&&e?e:{});if(o||(o=new t(this,r),i.default(this).data(ue,o)),"string"==typeof e){if("undefined"==typeof o[e])throw new TypeError('No method named "'+e+'"');o[e](n)}else r.show&&o.show(n)}))},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"Default",get:function(){return Te}}]),t}();i.default(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',(function(t){var e,n=this,o=u.getSelectorFromElement(this);o&&(e=document.querySelector(o));var r=i.default(e).data(ue)?"toggle":a({},i.default(e).data(),i.default(this).data());"A"!==this.tagName&&"AREA"!==this.tagName||t.preventDefault();var s=i.default(e).one(ge,(function(t){t.isDefaultPrevented()||s.one(me,(function(){i.default(n).is(":visible")&&n.focus()}))}));Se._jQueryInterface.call(i.default(e),r,this)})),i.default.fn.modal=Se._jQueryInterface,i.default.fn.modal.Constructor=Se,i.default.fn.modal.noConflict=function(){return i.default.fn.modal=fe,Se._jQueryInterface};var Ne=["background","cite","href","itemtype","longdesc","poster","src","xlink:href"],De=/^(?:(?:https?|mailto|ftp|tel|file|sms):|[^#&/:?]*(?:[#/?]|$))/i,Ae=/^data:(?:image\/(?:bmp|gif|jpeg|jpg|png|tiff|webp)|video\/(?:mpeg|mp4|ogg|webm)|audio\/(?:mp3|oga|ogg|opus));base64,[\d+/a-z]+=*$/i;function ke(t,e,n){if(0===t.length)return t;if(n&&"function"==typeof n)return n(t);for(var i=(new window.DOMParser).parseFromString(t,"text/html"),o=Object.keys(e),r=[].slice.call(i.body.querySelectorAll("*")),a=function(t,n){var i=r[t],a=i.nodeName.toLowerCase();if(-1===o.indexOf(i.nodeName.toLowerCase()))return i.parentNode.removeChild(i),"continue";var s=[].slice.call(i.attributes),l=[].concat(e["*"]||[],e[a]||[]);s.forEach((function(t){(function(t,e){var n=t.nodeName.toLowerCase();if(-1!==e.indexOf(n))return-1===Ne.indexOf(n)||Boolean(De.test(t.nodeValue)||Ae.test(t.nodeValue));for(var i=e.filter((function(t){return t instanceof RegExp})),o=0,r=i.length;o<r;o++)if(i[o].test(n))return!0;return!1})(t,l)||i.removeAttribute(t.nodeName)}))},s=0,l=r.length;s<l;s++)a(s);return i.body.innerHTML}var Ie="tooltip",Oe="bs.tooltip",xe=i.default.fn.tooltip,je=new RegExp("(^|\\s)bs-tooltip\\S+","g"),Le=["sanitize","whiteList","sanitizeFn"],Pe="fade",Fe="show",Re="show",Be="out",He="hover",Me="focus",qe={AUTO:"auto",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left"},Qe={animation:!0,template:'<div class="tooltip" role="tooltip"><div class="arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,selector:!1,placement:"top",offset:0,container:!1,fallbackPlacement:"flip",boundary:"scrollParent",customClass:"",sanitize:!0,sanitizeFn:null,whiteList:{"*":["class","dir","id","lang","role",/^aria-[\w-]*$/i],a:["target","href","title","rel"],area:[],b:[],br:[],col:[],code:[],div:[],em:[],hr:[],h1:[],h2:[],h3:[],h4:[],h5:[],h6:[],i:[],img:["src","srcset","alt","title","width","height"],li:[],ol:[],p:[],pre:[],s:[],small:[],span:[],sub:[],sup:[],strong:[],u:[],ul:[]},popperConfig:null},We={animation:"boolean",template:"string",title:"(string|element|function)",trigger:"string",delay:"(number|object)",html:"boolean",selector:"(string|boolean)",placement:"(string|function)",offset:"(number|string|function)",container:"(string|element|boolean)",fallbackPlacement:"(string|array)",boundary:"(string|element)",customClass:"(string|function)",sanitize:"boolean",sanitizeFn:"(null|function)",whiteList:"object",popperConfig:"(null|object)"},Ue={HIDE:"hide.bs.tooltip",HIDDEN:"hidden.bs.tooltip",SHOW:"show.bs.tooltip",SHOWN:"shown.bs.tooltip",INSERTED:"inserted.bs.tooltip",CLICK:"click.bs.tooltip",FOCUSIN:"focusin.bs.tooltip",FOCUSOUT:"focusout.bs.tooltip",MOUSEENTER:"mouseenter.bs.tooltip",MOUSELEAVE:"mouseleave.bs.tooltip"},Ve=function(){function t(t,e){if("undefined"==typeof Yt)throw new TypeError("Bootstrap's tooltips require Popper (https://popper.js.org)");this._isEnabled=!0,this._timeout=0,this._hoverState="",this._activeTrigger={},this._popper=null,this.element=t,this.config=this._getConfig(e),this.tip=null,this._setListeners()}var e=t.prototype;return e.enable=function(){this._isEnabled=!0},e.disable=function(){this._isEnabled=!1},e.toggleEnabled=function(){this._isEnabled=!this._isEnabled},e.toggle=function(t){if(this._isEnabled)if(t){var e=this.constructor.DATA_KEY,n=i.default(t.currentTarget).data(e);n||(n=new this.constructor(t.currentTarget,this._getDelegateConfig()),i.default(t.currentTarget).data(e,n)),n._activeTrigger.click=!n._activeTrigger.click,n._isWithActiveTrigger()?n._enter(null,n):n._leave(null,n)}else{if(i.default(this.getTipElement()).hasClass(Fe))return void this._leave(null,this);this._enter(null,this)}},e.dispose=function(){clearTimeout(this._timeout),i.default.removeData(this.element,this.constructor.DATA_KEY),i.default(this.element).off(this.constructor.EVENT_KEY),i.default(this.element).closest(".modal").off("hide.bs.modal",this._hideModalHandler),this.tip&&i.default(this.tip).remove(),this._isEnabled=null,this._timeout=null,this._hoverState=null,this._activeTrigger=null,this._popper&&this._popper.destroy(),this._popper=null,this.element=null,this.config=null,this.tip=null},e.show=function(){var t=this;if("none"===i.default(this.element).css("display"))throw new Error("Please use show on visible elements");var e=i.default.Event(this.constructor.Event.SHOW);if(this.isWithContent()&&this._isEnabled){i.default(this.element).trigger(e);var n=u.findShadowRoot(this.element),o=i.default.contains(null!==n?n:this.element.ownerDocument.documentElement,this.element);if(e.isDefaultPrevented()||!o)return;var r=this.getTipElement(),a=u.getUID(this.constructor.NAME);r.setAttribute("id",a),this.element.setAttribute("aria-describedby",a),this.setContent(),this.config.animation&&i.default(r).addClass(Pe);var s="function"==typeof this.config.placement?this.config.placement.call(this,r,this.element):this.config.placement,l=this._getAttachment(s);this.addAttachmentClass(l);var f=this._getContainer();i.default(r).data(this.constructor.DATA_KEY,this),i.default.contains(this.element.ownerDocument.documentElement,this.tip)||i.default(r).appendTo(f),i.default(this.element).trigger(this.constructor.Event.INSERTED),this._popper=new Yt(this.element,r,this._getPopperConfig(l)),i.default(r).addClass(Fe),i.default(r).addClass(this.config.customClass),"ontouchstart"in document.documentElement&&i.default(document.body).children().on("mouseover",null,i.default.noop);var d=function(){t.config.animation&&t._fixTransition();var e=t._hoverState;t._hoverState=null,i.default(t.element).trigger(t.constructor.Event.SHOWN),e===Be&&t._leave(null,t)};if(i.default(this.tip).hasClass(Pe)){var c=u.getTransitionDurationFromElement(this.tip);i.default(this.tip).one(u.TRANSITION_END,d).emulateTransitionEnd(c)}else d()}},e.hide=function(t){var e=this,n=this.getTipElement(),o=i.default.Event(this.constructor.Event.HIDE),r=function(){e._hoverState!==Re&&n.parentNode&&n.parentNode.removeChild(n),e._cleanTipClass(),e.element.removeAttribute("aria-describedby"),i.default(e.element).trigger(e.constructor.Event.HIDDEN),null!==e._popper&&e._popper.destroy(),t&&t()};if(i.default(this.element).trigger(o),!o.isDefaultPrevented()){if(i.default(n).removeClass(Fe),"ontouchstart"in document.documentElement&&i.default(document.body).children().off("mouseover",null,i.default.noop),this._activeTrigger.click=!1,this._activeTrigger.focus=!1,this._activeTrigger.hover=!1,i.default(this.tip).hasClass(Pe)){var a=u.getTransitionDurationFromElement(n);i.default(n).one(u.TRANSITION_END,r).emulateTransitionEnd(a)}else r();this._hoverState=""}},e.update=function(){null!==this._popper&&this._popper.scheduleUpdate()},e.isWithContent=function(){return Boolean(this.getTitle())},e.addAttachmentClass=function(t){i.default(this.getTipElement()).addClass("bs-tooltip-"+t)},e.getTipElement=function(){return this.tip=this.tip||i.default(this.config.template)[0],this.tip},e.setContent=function(){var t=this.getTipElement();this.setElementContent(i.default(t.querySelectorAll(".tooltip-inner")),this.getTitle()),i.default(t).removeClass("fade show")},e.setElementContent=function(t,e){"object"!=typeof e||!e.nodeType&&!e.jquery?this.config.html?(this.config.sanitize&&(e=ke(e,this.config.whiteList,this.config.sanitizeFn)),t.html(e)):t.text(e):this.config.html?i.default(e).parent().is(t)||t.empty().append(e):t.text(i.default(e).text())},e.getTitle=function(){var t=this.element.getAttribute("data-original-title");return t||(t="function"==typeof this.config.title?this.config.title.call(this.element):this.config.title),t},e._getPopperConfig=function(t){var e=this;return a({},{placement:t,modifiers:{offset:this._getOffset(),flip:{behavior:this.config.fallbackPlacement},arrow:{element:".arrow"},preventOverflow:{boundariesElement:this.config.boundary}},onCreate:function(t){t.originalPlacement!==t.placement&&e._handlePopperPlacementChange(t)},onUpdate:function(t){return e._handlePopperPlacementChange(t)}},this.config.popperConfig)},e._getOffset=function(){var t=this,e={};return"function"==typeof this.config.offset?e.fn=function(e){return e.offsets=a({},e.offsets,t.config.offset(e.offsets,t.element)),e}:e.offset=this.config.offset,e},e._getContainer=function(){return!1===this.config.container?document.body:u.isElement(this.config.container)?i.default(this.config.container):i.default(document).find(this.config.container)},e._getAttachment=function(t){return qe[t.toUpperCase()]},e._setListeners=function(){var t=this;this.config.trigger.split(" ").forEach((function(e){if("click"===e)i.default(t.element).on(t.constructor.Event.CLICK,t.config.selector,(function(e){return t.toggle(e)}));else if("manual"!==e){var n=e===He?t.constructor.Event.MOUSEENTER:t.constructor.Event.FOCUSIN,o=e===He?t.constructor.Event.MOUSELEAVE:t.constructor.Event.FOCUSOUT;i.default(t.element).on(n,t.config.selector,(function(e){return t._enter(e)})).on(o,t.config.selector,(function(e){return t._leave(e)}))}})),this._hideModalHandler=function(){t.element&&t.hide()},i.default(this.element).closest(".modal").on("hide.bs.modal",this._hideModalHandler),this.config.selector?this.config=a({},this.config,{trigger:"manual",selector:""}):this._fixTitle()},e._fixTitle=function(){var t=typeof this.element.getAttribute("data-original-title");(this.element.getAttribute("title")||"string"!==t)&&(this.element.setAttribute("data-original-title",this.element.getAttribute("title")||""),this.element.setAttribute("title",""))},e._enter=function(t,e){var n=this.constructor.DATA_KEY;(e=e||i.default(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),i.default(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusin"===t.type?Me:He]=!0),i.default(e.getTipElement()).hasClass(Fe)||e._hoverState===Re?e._hoverState=Re:(clearTimeout(e._timeout),e._hoverState=Re,e.config.delay&&e.config.delay.show?e._timeout=setTimeout((function(){e._hoverState===Re&&e.show()}),e.config.delay.show):e.show())},e._leave=function(t,e){var n=this.constructor.DATA_KEY;(e=e||i.default(t.currentTarget).data(n))||(e=new this.constructor(t.currentTarget,this._getDelegateConfig()),i.default(t.currentTarget).data(n,e)),t&&(e._activeTrigger["focusout"===t.type?Me:He]=!1),e._isWithActiveTrigger()||(clearTimeout(e._timeout),e._hoverState=Be,e.config.delay&&e.config.delay.hide?e._timeout=setTimeout((function(){e._hoverState===Be&&e.hide()}),e.config.delay.hide):e.hide())},e._isWithActiveTrigger=function(){for(var t in this._activeTrigger)if(this._activeTrigger[t])return!0;return!1},e._getConfig=function(t){var e=i.default(this.element).data();return Object.keys(e).forEach((function(t){-1!==Le.indexOf(t)&&delete e[t]})),"number"==typeof(t=a({},this.constructor.Default,e,"object"==typeof t&&t?t:{})).delay&&(t.delay={show:t.delay,hide:t.delay}),"number"==typeof t.title&&(t.title=t.title.toString()),"number"==typeof t.content&&(t.content=t.content.toString()),u.typeCheckConfig(Ie,t,this.constructor.DefaultType),t.sanitize&&(t.template=ke(t.template,t.whiteList,t.sanitizeFn)),t},e._getDelegateConfig=function(){var t={};if(this.config)for(var e in this.config)this.constructor.Default[e]!==this.config[e]&&(t[e]=this.config[e]);return t},e._cleanTipClass=function(){var t=i.default(this.getTipElement()),e=t.attr("class").match(je);null!==e&&e.length&&t.removeClass(e.join(""))},e._handlePopperPlacementChange=function(t){this.tip=t.instance.popper,this._cleanTipClass(),this.addAttachmentClass(this._getAttachment(t.placement))},e._fixTransition=function(){var t=this.getTipElement(),e=this.config.animation;null===t.getAttribute("x-placement")&&(i.default(t).removeClass(Pe),this.config.animation=!1,this.hide(),this.show(),this.config.animation=e)},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this),o=n.data(Oe),r="object"==typeof e&&e;if((o||!/dispose|hide/.test(e))&&(o||(o=new t(this,r),n.data(Oe,o)),"string"==typeof e)){if("undefined"==typeof o[e])throw new TypeError('No method named "'+e+'"');o[e]()}}))},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"Default",get:function(){return Qe}},{key:"NAME",get:function(){return Ie}},{key:"DATA_KEY",get:function(){return Oe}},{key:"Event",get:function(){return Ue}},{key:"EVENT_KEY",get:function(){return".bs.tooltip"}},{key:"DefaultType",get:function(){return We}}]),t}();i.default.fn.tooltip=Ve._jQueryInterface,i.default.fn.tooltip.Constructor=Ve,i.default.fn.tooltip.noConflict=function(){return i.default.fn.tooltip=xe,Ve._jQueryInterface};var Ye="bs.popover",ze=i.default.fn.popover,Ke=new RegExp("(^|\\s)bs-popover\\S+","g"),Xe=a({},Ve.Default,{placement:"right",trigger:"click",content:"",template:'<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-header"></h3><div class="popover-body"></div></div>'}),Ge=a({},Ve.DefaultType,{content:"(string|element|function)"}),$e={HIDE:"hide.bs.popover",HIDDEN:"hidden.bs.popover",SHOW:"show.bs.popover",SHOWN:"shown.bs.popover",INSERTED:"inserted.bs.popover",CLICK:"click.bs.popover",FOCUSIN:"focusin.bs.popover",FOCUSOUT:"focusout.bs.popover",MOUSEENTER:"mouseenter.bs.popover",MOUSELEAVE:"mouseleave.bs.popover"},Je=function(t){var e,n;function o(){return t.apply(this,arguments)||this}n=t,(e=o).prototype=Object.create(n.prototype),e.prototype.constructor=e,s(e,n);var a=o.prototype;return a.isWithContent=function(){return this.getTitle()||this._getContent()},a.addAttachmentClass=function(t){i.default(this.getTipElement()).addClass("bs-popover-"+t)},a.getTipElement=function(){return this.tip=this.tip||i.default(this.config.template)[0],this.tip},a.setContent=function(){var t=i.default(this.getTipElement());this.setElementContent(t.find(".popover-header"),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(".popover-body"),e),t.removeClass("fade show")},a._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},a._cleanTipClass=function(){var t=i.default(this.getTipElement()),e=t.attr("class").match(Ke);null!==e&&e.length>0&&t.removeClass(e.join(""))},o._jQueryInterface=function(t){return this.each((function(){var e=i.default(this).data(Ye),n="object"==typeof t?t:null;if((e||!/dispose|hide/.test(t))&&(e||(e=new o(this,n),i.default(this).data(Ye,e)),"string"==typeof t)){if("undefined"==typeof e[t])throw new TypeError('No method named "'+t+'"');e[t]()}}))},r(o,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"Default",get:function(){return Xe}},{key:"NAME",get:function(){return"popover"}},{key:"DATA_KEY",get:function(){return Ye}},{key:"Event",get:function(){return $e}},{key:"EVENT_KEY",get:function(){return".bs.popover"}},{key:"DefaultType",get:function(){return Ge}}]),o}(Ve);i.default.fn.popover=Je._jQueryInterface,i.default.fn.popover.Constructor=Je,i.default.fn.popover.noConflict=function(){return i.default.fn.popover=ze,Je._jQueryInterface};var Ze="scrollspy",tn="bs.scrollspy",en=i.default.fn[Ze],nn="active",on="position",rn=".nav, .list-group",an={offset:10,method:"auto",target:""},sn={offset:"number",method:"string",target:"(string|element)"},ln=function(){function t(t,e){var n=this;this._element=t,this._scrollElement="BODY"===t.tagName?window:t,this._config=this._getConfig(e),this._selector=this._config.target+" .nav-link,"+this._config.target+" .list-group-item,"+this._config.target+" .dropdown-item",this._offsets=[],this._targets=[],this._activeTarget=null,this._scrollHeight=0,i.default(this._scrollElement).on("scroll.bs.scrollspy",(function(t){return n._process(t)})),this.refresh(),this._process()}var e=t.prototype;return e.refresh=function(){var t=this,e=this._scrollElement===this._scrollElement.window?"offset":on,n="auto"===this._config.method?e:this._config.method,o=n===on?this._getScrollTop():0;this._offsets=[],this._targets=[],this._scrollHeight=this._getScrollHeight(),[].slice.call(document.querySelectorAll(this._selector)).map((function(t){var e,r=u.getSelectorFromElement(t);if(r&&(e=document.querySelector(r)),e){var a=e.getBoundingClientRect();if(a.width||a.height)return[i.default(e)[n]().top+o,r]}return null})).filter(Boolean).sort((function(t,e){return t[0]-e[0]})).forEach((function(e){t._offsets.push(e[0]),t._targets.push(e[1])}))},e.dispose=function(){i.default.removeData(this._element,tn),i.default(this._scrollElement).off(".bs.scrollspy"),this._element=null,this._scrollElement=null,this._config=null,this._selector=null,this._offsets=null,this._targets=null,this._activeTarget=null,this._scrollHeight=null},e._getConfig=function(t){if("string"!=typeof(t=a({},an,"object"==typeof t&&t?t:{})).target&&u.isElement(t.target)){var e=i.default(t.target).attr("id");e||(e=u.getUID(Ze),i.default(t.target).attr("id",e)),t.target="#"+e}return u.typeCheckConfig(Ze,t,sn),t},e._getScrollTop=function(){return this._scrollElement===window?this._scrollElement.pageYOffset:this._scrollElement.scrollTop},e._getScrollHeight=function(){return this._scrollElement.scrollHeight||Math.max(document.body.scrollHeight,document.documentElement.scrollHeight)},e._getOffsetHeight=function(){return this._scrollElement===window?window.innerHeight:this._scrollElement.getBoundingClientRect().height},e._process=function(){var t=this._getScrollTop()+this._config.offset,e=this._getScrollHeight(),n=this._config.offset+e-this._getOffsetHeight();if(this._scrollHeight!==e&&this.refresh(),t>=n){var i=this._targets[this._targets.length-1];this._activeTarget!==i&&this._activate(i)}else{if(this._activeTarget&&t<this._offsets[0]&&this._offsets[0]>0)return this._activeTarget=null,void this._clear();for(var o=this._offsets.length;o--;)this._activeTarget!==this._targets[o]&&t>=this._offsets[o]&&("undefined"==typeof this._offsets[o+1]||t<this._offsets[o+1])&&this._activate(this._targets[o])}},e._activate=function(t){this._activeTarget=t,this._clear();var e=this._selector.split(",").map((function(e){return e+'[data-target="'+t+'"],'+e+'[href="'+t+'"]'})),n=i.default([].slice.call(document.querySelectorAll(e.join(","))));n.hasClass("dropdown-item")?(n.closest(".dropdown").find(".dropdown-toggle").addClass(nn),n.addClass(nn)):(n.addClass(nn),n.parents(rn).prev(".nav-link, .list-group-item").addClass(nn),n.parents(rn).prev(".nav-item").children(".nav-link").addClass(nn)),i.default(this._scrollElement).trigger("activate.bs.scrollspy",{relatedTarget:t})},e._clear=function(){[].slice.call(document.querySelectorAll(this._selector)).filter((function(t){return t.classList.contains(nn)})).forEach((function(t){return t.classList.remove(nn)}))},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this).data(tn);if(n||(n=new t(this,"object"==typeof e&&e),i.default(this).data(tn,n)),"string"==typeof e){if("undefined"==typeof n[e])throw new TypeError('No method named "'+e+'"');n[e]()}}))},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"Default",get:function(){return an}}]),t}();i.default(window).on("load.bs.scrollspy.data-api",(function(){for(var t=[].slice.call(document.querySelectorAll('[data-spy="scroll"]')),e=t.length;e--;){var n=i.default(t[e]);ln._jQueryInterface.call(n,n.data())}})),i.default.fn[Ze]=ln._jQueryInterface,i.default.fn[Ze].Constructor=ln,i.default.fn[Ze].noConflict=function(){return i.default.fn[Ze]=en,ln._jQueryInterface};var un="bs.tab",fn=i.default.fn.tab,dn="active",cn="fade",hn="show",pn=".active",mn="> li > .active",gn=function(){function t(t){this._element=t}var e=t.prototype;return e.show=function(){var t=this;if(!(this._element.parentNode&&this._element.parentNode.nodeType===Node.ELEMENT_NODE&&i.default(this._element).hasClass(dn)||i.default(this._element).hasClass("disabled")||this._element.hasAttribute("disabled"))){var e,n,o=i.default(this._element).closest(".nav, .list-group")[0],r=u.getSelectorFromElement(this._element);if(o){var a="UL"===o.nodeName||"OL"===o.nodeName?mn:pn;n=(n=i.default.makeArray(i.default(o).find(a)))[n.length-1]}var s=i.default.Event("hide.bs.tab",{relatedTarget:this._element}),l=i.default.Event("show.bs.tab",{relatedTarget:n});if(n&&i.default(n).trigger(s),i.default(this._element).trigger(l),!l.isDefaultPrevented()&&!s.isDefaultPrevented()){r&&(e=document.querySelector(r)),this._activate(this._element,o);var f=function(){var e=i.default.Event("hidden.bs.tab",{relatedTarget:t._element}),o=i.default.Event("shown.bs.tab",{relatedTarget:n});i.default(n).trigger(e),i.default(t._element).trigger(o)};e?this._activate(e,e.parentNode,f):f()}}},e.dispose=function(){i.default.removeData(this._element,un),this._element=null},e._activate=function(t,e,n){var o=this,r=(!e||"UL"!==e.nodeName&&"OL"!==e.nodeName?i.default(e).children(pn):i.default(e).find(mn))[0],a=n&&r&&i.default(r).hasClass(cn),s=function(){return o._transitionComplete(t,r,n)};if(r&&a){var l=u.getTransitionDurationFromElement(r);i.default(r).removeClass(hn).one(u.TRANSITION_END,s).emulateTransitionEnd(l)}else s()},e._transitionComplete=function(t,e,n){if(e){i.default(e).removeClass(dn);var o=i.default(e.parentNode).find("> .dropdown-menu .active")[0];o&&i.default(o).removeClass(dn),"tab"===e.getAttribute("role")&&e.setAttribute("aria-selected",!1)}i.default(t).addClass(dn),"tab"===t.getAttribute("role")&&t.setAttribute("aria-selected",!0),u.reflow(t),t.classList.contains(cn)&&t.classList.add(hn);var r=t.parentNode;if(r&&"LI"===r.nodeName&&(r=r.parentNode),r&&i.default(r).hasClass("dropdown-menu")){var a=i.default(t).closest(".dropdown")[0];if(a){var s=[].slice.call(a.querySelectorAll(".dropdown-toggle"));i.default(s).addClass(dn)}t.setAttribute("aria-expanded",!0)}n&&n()},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this),o=n.data(un);if(o||(o=new t(this),n.data(un,o)),"string"==typeof e){if("undefined"==typeof o[e])throw new TypeError('No method named "'+e+'"');o[e]()}}))},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}}]),t}();i.default(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"], [data-toggle="list"]',(function(t){t.preventDefault(),gn._jQueryInterface.call(i.default(this),"show")})),i.default.fn.tab=gn._jQueryInterface,i.default.fn.tab.Constructor=gn,i.default.fn.tab.noConflict=function(){return i.default.fn.tab=fn,gn._jQueryInterface};var _n="bs.toast",vn=i.default.fn.toast,bn="hide",yn="show",En="showing",wn="click.dismiss.bs.toast",Tn={animation:!0,autohide:!0,delay:500},Cn={animation:"boolean",autohide:"boolean",delay:"number"},Sn=function(){function t(t,e){this._element=t,this._config=this._getConfig(e),this._timeout=null,this._setListeners()}var e=t.prototype;return e.show=function(){var t=this,e=i.default.Event("show.bs.toast");if(i.default(this._element).trigger(e),!e.isDefaultPrevented()){this._clearTimeout(),this._config.animation&&this._element.classList.add("fade");var n=function(){t._element.classList.remove(En),t._element.classList.add(yn),i.default(t._element).trigger("shown.bs.toast"),t._config.autohide&&(t._timeout=setTimeout((function(){t.hide()}),t._config.delay))};if(this._element.classList.remove(bn),u.reflow(this._element),this._element.classList.add(En),this._config.animation){var o=u.getTransitionDurationFromElement(this._element);i.default(this._element).one(u.TRANSITION_END,n).emulateTransitionEnd(o)}else n()}},e.hide=function(){if(this._element.classList.contains(yn)){var t=i.default.Event("hide.bs.toast");i.default(this._element).trigger(t),t.isDefaultPrevented()||this._close()}},e.dispose=function(){this._clearTimeout(),this._element.classList.contains(yn)&&this._element.classList.remove(yn),i.default(this._element).off(wn),i.default.removeData(this._element,_n),this._element=null,this._config=null},e._getConfig=function(t){return t=a({},Tn,i.default(this._element).data(),"object"==typeof t&&t?t:{}),u.typeCheckConfig("toast",t,this.constructor.DefaultType),t},e._setListeners=function(){var t=this;i.default(this._element).on(wn,'[data-dismiss="toast"]',(function(){return t.hide()}))},e._close=function(){var t=this,e=function(){t._element.classList.add(bn),i.default(t._element).trigger("hidden.bs.toast")};if(this._element.classList.remove(yn),this._config.animation){var n=u.getTransitionDurationFromElement(this._element);i.default(this._element).one(u.TRANSITION_END,e).emulateTransitionEnd(n)}else e()},e._clearTimeout=function(){clearTimeout(this._timeout),this._timeout=null},t._jQueryInterface=function(e){return this.each((function(){var n=i.default(this),o=n.data(_n);if(o||(o=new t(this,"object"==typeof e&&e),n.data(_n,o)),"string"==typeof e){if("undefined"==typeof o[e])throw new TypeError('No method named "'+e+'"');o[e](this)}}))},r(t,null,[{key:"VERSION",get:function(){return"4.6.2"}},{key:"DefaultType",get:function(){return Cn}},{key:"Default",get:function(){return Tn}}]),t}();i.default.fn.toast=Sn._jQueryInterface,i.default.fn.toast.Constructor=Sn,i.default.fn.toast.noConflict=function(){return i.default.fn.toast=vn,Sn._jQueryInterface},t.Alert=c,t.Button=b,t.Carousel=O,t.Collapse=W,t.Dropdown=le,t.Modal=Se,t.Popover=Je,t.Scrollspy=ln,t.Tab=gn,t.Toast=Sn,t.Tooltip=Ve,t.Util=u,Object.defineProperty(t,"__esModule",{value:!0})}));diff --git a/admin/vendor/javascript/jquery.min.js b/admin/vendor/javascript/jquery.min.jsdeleted file mode 100644index 7f37b5d991..0000000000--- a/admin/vendor/javascript/jquery.min.js+++ /dev/null@@ -1,2 +0,0 @@-/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}function fe(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}ce.fn=ce.prototype={jquery:t,constructor:ce,length:0,toArray:function(){return ae.call(this)},get:function(e){return null==e?ae.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=ce.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return ce.each(this,e)},map:function(n){return this.pushStack(ce.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(ae.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(ce.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(ce.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:oe.sort,splice:oe.splice},ce.extend=ce.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||v(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(ce.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||ce.isPlainObject(n)?n:{},i=!1,a[t]=ce.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},ce.extend({expando:"jQuery"+(t+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==i.call(e))&&(!(t=r(e))||"function"==typeof(n=ue.call(t,"constructor")&&t.constructor)&&o.call(n)===a)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){m(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(c(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},text:function(e){var t,n="",r=0,i=e.nodeType;if(!i)while(t=e[r++])n+=ce.text(t);return 1===i||11===i?e.textContent:9===i?e.documentElement.textContent:3===i||4===i?e.nodeValue:n},makeArray:function(e,t){var n=t||[];return null!=e&&(c(Object(e))?ce.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:se.call(t,e,n)},isXMLDoc:function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!l.test(t||n&&n.nodeName||"HTML")},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(c(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:le}),"function"==typeof Symbol&&(ce.fn[Symbol.iterator]=oe[Symbol.iterator]),ce.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var pe=oe.pop,de=oe.sort,he=oe.splice,ge="[\\x20\\t\\r\\n\\f]",ve=new RegExp("^"+ge+"+|((?:^|[^\\\\])(?:\\\\.)*)"+ge+"+$","g");ce.contains=function(e,t){var n=t&&t.parentNode;return e===n||!(!n||1!==n.nodeType||!(e.contains?e.contains(n):e.compareDocumentPosition&&16&e.compareDocumentPosition(n)))};var f=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;function p(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e}ce.escapeSelector=function(e){return(e+"").replace(f,p)};var ye=C,me=s;!function(){var e,b,w,o,a,T,r,C,d,i,k=me,S=ce.expando,E=0,n=0,s=W(),c=W(),u=W(),h=W(),l=function(e,t){return e===t&&(a=!0),0},f="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",t="(?:\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",p="\\["+ge+"*("+t+")(?:"+ge+"*([*^$|!~]?=)"+ge+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+t+"))|)"+ge+"*\\]",g=":("+t+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+p+")*)|.*)\\)|)",v=new RegExp(ge+"+","g"),y=new RegExp("^"+ge+"*,"+ge+"*"),m=new RegExp("^"+ge+"*([>+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="<a id='"+S+"' href='' disabled='disabled'></a><select id='"+S+"-\r\\' disabled='disabled'><option selected=''></option></select>",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0<I(t,T,null,[e]).length},I.contains=function(e,t){return(e.ownerDocument||e)!=T&&V(e),ce.contains(e,t)},I.attr=function(e,t){(e.ownerDocument||e)!=T&&V(e);var n=b.attrHandle[t.toLowerCase()],r=n&&ue.call(b.attrHandle,t.toLowerCase())?n(e,t,!C):void 0;return void 0!==r?r:e.getAttribute(t)},I.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},ce.uniqueSort=function(e){var t,n=[],r=0,i=0;if(a=!le.sortStable,o=!le.sortStable&&ae.call(e,0),de.call(e,l),a){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)he.call(e,n[r],1)}return o=null,e},ce.fn.uniqueSort=function(){return this.pushStack(ce.uniqueSort(ae.apply(this)))},(b=ce.expr={cacheLength:50,createPseudo:F,match:D,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(v," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(d,e,t,h,g){var v="nth"!==d.slice(0,3),y="last"!==d.slice(-4),m="of-type"===e;return 1===h&&0===g?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u=v!==y?"nextSibling":"previousSibling",l=e.parentNode,c=m&&e.nodeName.toLowerCase(),f=!n&&!m,p=!1;if(l){if(v){while(u){o=e;while(o=o[u])if(m?fe(o,c):1===o.nodeType)return!1;s=u="only"===d&&!s&&"nextSibling"}return!0}if(s=[y?l.firstChild:l.lastChild],y&&f){p=(a=(r=(i=l[S]||(l[S]={}))[d]||[])[0]===E&&r[1])&&r[2],o=a&&l.childNodes[a];while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if(1===o.nodeType&&++p&&o===e){i[d]=[E,a,p];break}}else if(f&&(p=a=(r=(i=e[S]||(e[S]={}))[d]||[])[0]===E&&r[1]),!1===p)while(o=++a&&o&&o[u]||(p=a=0)||s.pop())if((m?fe(o,c):1===o.nodeType)&&++p&&(f&&((i=o[S]||(o[S]={}))[d]=[E,p]),o===e))break;return(p-=g)===h||p%h==0&&0<=p/h}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||I.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?F(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=se.call(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:F(function(e){var r=[],i=[],s=ne(e.replace(ve,"$1"));return s[S]?F(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:F(function(t){return function(e){return 0<I(t,e).length}}),contains:F(function(t){return t=t.replace(O,P),function(e){return-1<(e.textContent||ce.text(e)).indexOf(t)}}),lang:F(function(n){return A.test(n||"")||I.error("unsupported lang: "+n),n=n.replace(O,P).toLowerCase(),function(e){var t;do{if(t=C?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=ie.location&&ie.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===r},focus:function(e){return e===function(){try{return T.activeElement}catch(e){}}()&&T.hasFocus()&&!!(e.type||e.href||~e.tabIndex)},enabled:z(!1),disabled:z(!0),checked:function(e){return fe(e,"input")&&!!e.checked||fe(e,"option")&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return q.test(e.nodeName)},input:function(e){return N.test(e.nodeName)},button:function(e){return fe(e,"input")&&"button"===e.type||fe(e,"button")},text:function(e){var t;return fe(e,"input")&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:X(function(){return[0]}),last:X(function(e,t){return[t-1]}),eq:X(function(e,t,n){return[n<0?n+t:n]}),even:X(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:X(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:X(function(e,t,n){var r;for(r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:X(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=B(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=_(e);function G(){}function Y(e,t){var n,r,i,o,a,s,u,l=c[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=y.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=m.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(ve," ")}),a=a.slice(n.length)),b.filter)!(r=D[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?I.error(e):c(e,s).slice(0)}function Q(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function J(a,e,t){var s=e.dir,u=e.next,l=u||s,c=t&&"parentNode"===l,f=n++;return e.first?function(e,t,n){while(e=e[s])if(1===e.nodeType||c)return a(e,t,n);return!1}:function(e,t,n){var r,i,o=[E,f];if(n){while(e=e[s])if((1===e.nodeType||c)&&a(e,t,n))return!0}else while(e=e[s])if(1===e.nodeType||c)if(i=e[S]||(e[S]={}),u&&fe(e,u))e=e[s]||e;else{if((r=i[l])&&r[0]===E&&r[1]===f)return o[2]=r[2];if((i[l]=o)[2]=a(e,t,n))return!0}return!1}}function K(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Z(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function ee(d,h,g,v,y,e){return v&&!v[S]&&(v=ee(v)),y&&!y[S]&&(y=ee(y,e)),F(function(e,t,n,r){var i,o,a,s,u=[],l=[],c=t.length,f=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)I(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),p=!d||!e&&h?f:Z(f,u,d,n,r);if(g?g(p,s=y||(e?d:c||v)?[]:t,n,r):s=p,v){i=Z(s,l),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(s[l[o]]=!(p[l[o]]=a))}if(e){if(y||d){if(y){i=[],o=s.length;while(o--)(a=s[o])&&i.push(p[o]=a);y(null,s=[],i,r)}o=s.length;while(o--)(a=s[o])&&-1<(i=y?se.call(e,a):u[o])&&(e[i]=!(t[i]=a))}}else s=Z(s===t?s.splice(c,s.length):s),y?y(null,t,s,r):k.apply(t,s)})}function te(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=J(function(e){return e===i},a,!0),l=J(function(e){return-1<se.call(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!=w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[J(K(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return ee(1<s&&K(c),1<s&&Q(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(ve,"$1"),t,s<n&&te(e.slice(s,n)),n<r&&te(e=e.slice(n)),n<r&&Q(e))}c.push(t)}return K(c)}function ne(e,t){var n,v,y,m,x,r,i=[],o=[],a=u[e+" "];if(!a){t||(t=Y(e)),n=t.length;while(n--)(a=te(t[n]))[S]?i.push(a):o.push(a);(a=u(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=E+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==T||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==T||(V(o),n=!C);while(s=v[a++])if(s(o,t||T,n)){k.call(r,o);break}i&&(E=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=pe.call(r));f=Z(f)}k.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&ce.uniqueSort(r)}return i&&(E=h,w=p),c},m?F(r):r))).selector=e}return a}function re(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&Y(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&C&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(O,P),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=D.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(O,P),H.test(o[0].type)&&U(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&Q(o)))return k.apply(n,r),n;break}}}return(l||ne(e,c))(r,t,!C,n,!t||H.test(e)&&U(t.parentNode)||t),n}G.prototype=b.filters=b.pseudos,b.setFilters=new G,le.sortStable=S.split("").sort(l).join("")===S,V(),le.sortDetached=$(function(e){return 1&e.compareDocumentPosition(T.createElement("fieldset"))}),ce.find=I,ce.expr[":"]=ce.expr.pseudos,ce.unique=ce.uniqueSort,I.compile=ne,I.select=re,I.setDocument=V,I.tokenize=Y,I.escape=ce.escapeSelector,I.getText=ce.text,I.isXML=ce.isXMLDoc,I.selectors=ce.expr,I.support=ce.support,I.uniqueSort=ce.uniqueSort}();var d=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&ce(e).is(n))break;r.push(e)}return r},h=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},b=ce.expr.match.needsContext,w=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1<se.call(n,e)!==r}):ce.filter(n,e,r)}ce.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?ce.find.matchesSelector(r,e)?[r]:[]:ce.find.matches(e,ce.grep(t,function(e){return 1===e.nodeType}))},ce.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(ce(e).filter(function(){for(t=0;t<r;t++)if(ce.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)ce.find(e,i[t],n);return 1<r?ce.uniqueSort(n):n},filter:function(e){return this.pushStack(T(this,e||[],!1))},not:function(e){return this.pushStack(T(this,e||[],!0))},is:function(e){return!!T(this,"string"==typeof e&&b.test(e)?ce(e):e||[],!1).length}});var k,S=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(ce.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&ce(e);if(!b.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&ce.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?ce.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?se.call(ce(e),this[0]):se.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(ce.uniqueSort(ce.merge(this.get(),ce(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),ce.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return d(e,"parentNode")},parentsUntil:function(e,t,n){return d(e,"parentNode",n)},next:function(e){return A(e,"nextSibling")},prev:function(e){return A(e,"previousSibling")},nextAll:function(e){return d(e,"nextSibling")},prevAll:function(e){return d(e,"previousSibling")},nextUntil:function(e,t,n){return d(e,"nextSibling",n)},prevUntil:function(e,t,n){return d(e,"previousSibling",n)},siblings:function(e){return h((e.parentNode||{}).firstChild,e)},children:function(e){return h(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(fe(e,"template")&&(e=e.content||e),ce.merge([],e.childNodes))}},function(r,i){ce.fn[r]=function(e,t){var n=ce.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=ce.filter(t,n)),1<this.length&&(j[r]||ce.uniqueSort(n),E.test(r)&&n.reverse()),this.pushStack(n)}});var D=/[^\x20\t\r\n\f]+/g;function N(e){return e}function q(e){throw e}function L(e,t,n,r){var i;try{e&&v(i=e.promise)?i.call(e).done(t).fail(n):e&&v(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}ce.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},ce.each(e.match(D)||[],function(e,t){n[t]=!0}),n):ce.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){ce.each(e,function(e,t){v(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==x(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return ce.each(arguments,function(e,t){var n;while(-1<(n=ce.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<ce.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},ce.extend({Deferred:function(e){var o=[["notify","progress",ce.Callbacks("memory"),ce.Callbacks("memory"),2],["resolve","done",ce.Callbacks("once memory"),ce.Callbacks("once memory"),0,"resolved"],["reject","fail",ce.Callbacks("once memory"),ce.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return ce.Deferred(function(r){ce.each(o,function(e,t){var n=v(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&v(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,v(t)?s?t.call(e,l(u,o,N,s),l(u,o,q,s)):(u++,t.call(e,l(u,o,N,s),l(u,o,q,s),l(u,o,N,o.notifyWith))):(a!==N&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){ce.Deferred.exceptionHook&&ce.Deferred.exceptionHook(e,t.error),u<=i+1&&(a!==q&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(ce.Deferred.getErrorHook?t.error=ce.Deferred.getErrorHook():ce.Deferred.getStackHook&&(t.error=ce.Deferred.getStackHook()),ie.setTimeout(t))}}return ce.Deferred(function(e){o[0][3].add(l(0,e,v(r)?r:N,e.notifyWith)),o[1][3].add(l(0,e,v(t)?t:N)),o[2][3].add(l(0,e,v(n)?n:q))}).promise()},promise:function(e){return null!=e?ce.extend(e,a):a}},s={};return ce.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=ae.call(arguments),o=ce.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?ae.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(L(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||v(i[t]&&i[t].then)))return o.then();while(t--)L(i[t],a(t),o.reject);return o.promise()}});var H=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;ce.Deferred.exceptionHook=function(e,t){ie.console&&ie.console.warn&&e&&H.test(e.name)&&ie.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},ce.readyException=function(e){ie.setTimeout(function(){throw e})};var O=ce.Deferred();function P(){C.removeEventListener("DOMContentLoaded",P),ie.removeEventListener("load",P),ce.ready()}ce.fn.ready=function(e){return O.then(e)["catch"](function(e){ce.readyException(e)}),this},ce.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--ce.readyWait:ce.isReady)||(ce.isReady=!0)!==e&&0<--ce.readyWait||O.resolveWith(C,[ce])}}),ce.ready.then=O.then,"complete"===C.readyState||"loading"!==C.readyState&&!C.documentElement.doScroll?ie.setTimeout(ce.ready):(C.addEventListener("DOMContentLoaded",P),ie.addEventListener("load",P));var M=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n))for(s in i=!0,n)M(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,v(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(ce(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},R=/^-ms-/,I=/-([a-z])/g;function W(e,t){return t.toUpperCase()}function F(e){return e.replace(R,"ms-").replace(I,W)}var $=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function B(){this.expando=ce.expando+B.uid++}B.uid=1,B.prototype={cache:function(e){var t=e[this.expando];return t||(t={},$(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[F(t)]=n;else for(r in t)i[F(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][F(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(F):(t=F(t))in r?[t]:t.match(D)||[]).length;while(n--)delete r[t[n]]}(void 0===t||ce.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!ce.isEmptyObject(t)}};var _=new B,z=new B,X=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,U=/[A-Z]/g;function V(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(U,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:X.test(i)?JSON.parse(i):i)}catch(e){}z.set(e,t,n)}else n=void 0;return n}ce.extend({hasData:function(e){return z.hasData(e)||_.hasData(e)},data:function(e,t,n){return z.access(e,t,n)},removeData:function(e,t){z.remove(e,t)},_data:function(e,t,n){return _.access(e,t,n)},_removeData:function(e,t){_.remove(e,t)}}),ce.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=z.get(o),1===o.nodeType&&!_.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=F(r.slice(5)),V(o,r,i[r]));_.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){z.set(this,n)}):M(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=z.get(o,n))?t:void 0!==(t=V(o,n))?t:void 0;this.each(function(){z.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){z.remove(this,e)})}}),ce.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=_.get(e,t),n&&(!r||Array.isArray(n)?r=_.access(e,t,ce.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=ce.queue(e,t),r=n.length,i=n.shift(),o=ce._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){ce.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return _.get(e,n)||_.access(e,n,{empty:ce.Callbacks("once memory").add(function(){_.remove(e,[t+"queue",n])})})}}),ce.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?ce.queue(this[0],t):void 0===n?this:this.each(function(){var e=ce.queue(this,t,n);ce._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&ce.dequeue(this,t)})},dequeue:function(e){return this.each(function(){ce.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=ce.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=_.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var G=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,Y=new RegExp("^(?:([+-])=|)("+G+")([a-z%]*)$","i"),Q=["Top","Right","Bottom","Left"],J=C.documentElement,K=function(e){return ce.contains(e.ownerDocument,e)},Z={composed:!0};J.getRootNode&&(K=function(e){return ce.contains(e.ownerDocument,e)||e.getRootNode(Z)===e.ownerDocument});var ee=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&K(e)&&"none"===ce.css(e,"display")};function te(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return ce.css(e,t,"")},u=s(),l=n&&n[3]||(ce.cssNumber[t]?"":"px"),c=e.nodeType&&(ce.cssNumber[t]||"px"!==l&&+u)&&Y.exec(ce.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)ce.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,ce.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ne={};function re(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=_.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ee(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ne[s])||(o=a.body.appendChild(a.createElement(s)),u=ce.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ne[s]=u)))):"none"!==n&&(l[c]="none",_.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}ce.fn.extend({show:function(){return re(this,!0)},hide:function(){return re(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ee(this)?ce(this).show():ce(this).hide()})}});var xe,be,we=/^(?:checkbox|radio)$/i,Te=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="<textarea>x</textarea>",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="<option></option>",le.option=!!xe.lastChild;var ke={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n<r;n++)_.set(e[n],"globalEval",!t||_.get(t[n],"globalEval"))}ke.tbody=ke.tfoot=ke.colgroup=ke.caption=ke.thead,ke.th=ke.td,le.option||(ke.optgroup=ke.option=[1,"<select multiple='multiple'>","</select>"]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))ce.merge(p,o.nodeType?[o]:o);else if(je.test(o)){a=a||f.appendChild(t.createElement("div")),s=(Te.exec(o)||["",""])[1].toLowerCase(),u=ke[s]||ke._default,a.innerHTML=u[1]+ce.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;ce.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<ce.inArray(o,r))i&&i.push(o);else if(l=K(o),a=Se(f.appendChild(o),"script"),l&&Ee(a),n){c=0;while(o=a[c++])Ce.test(o.type||"")&&n.push(o)}return f}var De=/^([^.]*)(?:\.(.+)|)/;function Ne(){return!0}function qe(){return!1}function Le(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Le(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=qe;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return ce().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=ce.guid++)),e.each(function(){ce.event.add(this,t,i,r,n)})}function He(e,r,t){t?(_.set(e,r,!1),ce.event.add(e,r,{namespace:!1,handler:function(e){var t,n=_.get(this,r);if(1&e.isTrigger&&this[r]){if(n)(ce.event.special[r]||{}).delegateType&&e.stopPropagation();else if(n=ae.call(arguments),_.set(this,r,n),this[r](),t=_.get(this,r),_.set(this,r,!1),n!==t)return e.stopImmediatePropagation(),e.preventDefault(),t}else n&&(_.set(this,r,ce.event.trigger(n[0],n.slice(1),this)),e.stopPropagation(),e.isImmediatePropagationStopped=Ne)}})):void 0===_.get(e,r)&&ce.event.add(e,r,Ne)}ce.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.get(t);if($(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&ce.find.matchesSelector(J,i),n.guid||(n.guid=ce.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof ce&&ce.event.triggered!==e.type?ce.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(D)||[""]).length;while(l--)d=g=(s=De.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=ce.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=ce.event.special[d]||{},c=ce.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&ce.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),ce.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=_.hasData(e)&&_.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(D)||[""]).length;while(l--)if(d=g=(s=De.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=ce.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||ce.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)ce.event.remove(e,d+t[l],n,r,!0);ce.isEmptyObject(u)&&_.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=ce.event.fix(e),l=(_.get(this,"events")||Object.create(null))[u.type]||[],c=ce.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=ce.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((ce.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<ce(i,this).index(l):ce.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(ce.Event.prototype,t,{enumerable:!0,configurable:!0,get:v(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[ce.expando]?e:new ce.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click",!0),!1},trigger:function(e){var t=this||e;return we.test(t.type)&&t.click&&fe(t,"input")&&He(t,"click"),!0},_default:function(e){var t=e.target;return we.test(t.type)&&t.click&&fe(t,"input")&&_.get(t,"click")||fe(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},ce.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},ce.Event=function(e,t){if(!(this instanceof ce.Event))return new ce.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ne:qe,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&ce.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[ce.expando]=!0},ce.Event.prototype={constructor:ce.Event,isDefaultPrevented:qe,isPropagationStopped:qe,isImmediatePropagationStopped:qe,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ne,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ne,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ne,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},ce.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},ce.event.addProp),ce.each({focus:"focusin",blur:"focusout"},function(r,i){function o(e){if(C.documentMode){var t=_.get(this,"handle"),n=ce.event.fix(e);n.type="focusin"===e.type?"focus":"blur",n.isSimulated=!0,t(e),n.target===n.currentTarget&&t(n)}else ce.event.simulate(i,e.target,ce.event.fix(e))}ce.event.special[r]={setup:function(){var e;if(He(this,r,!0),!C.documentMode)return!1;(e=_.get(this,i))||this.addEventListener(i,o),_.set(this,i,(e||0)+1)},trigger:function(){return He(this,r),!0},teardown:function(){var e;if(!C.documentMode)return!1;(e=_.get(this,i)-1)?_.set(this,i,e):(this.removeEventListener(i,o),_.remove(this,i))},_default:function(e){return _.get(e.target,r)},delegateType:i},ce.event.special[i]={setup:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i);n||(C.documentMode?this.addEventListener(i,o):e.addEventListener(r,o,!0)),_.set(t,i,(n||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=C.documentMode?this:e,n=_.get(t,i)-1;n?_.set(t,i,n):(C.documentMode?this.removeEventListener(i,o):e.removeEventListener(r,o,!0),_.remove(t,i))}}}),ce.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){ce.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||ce.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),ce.fn.extend({on:function(e,t,n,r){return Le(this,e,t,n,r)},one:function(e,t,n,r){return Le(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,ce(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=qe),this.each(function(){ce.event.remove(this,e,n,t)})}});var Oe=/<script|<style|<link/i,Pe=/checked\s*(?:[^=]|=\s*.checked.)/i,Me=/^\s*<!\[CDATA\[|\]\]>\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)ce.event.add(t,i,s[i][n]);z.hasData(e)&&(o=z.access(e),a=ce.extend({},o),z.set(t,a))}}function $e(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=v(d);if(h||1<f&&"string"==typeof d&&!le.checkClone&&Pe.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),$e(t,r,i,o)});if(f&&(t=(e=Ae(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=ce.map(Se(e,"script"),Ie)).length;c<f;c++)u=e,c!==p&&(u=ce.clone(u,!0,!0),s&&ce.merge(a,Se(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,ce.map(a,We),c=0;c<s;c++)u=a[c],Ce.test(u.type||"")&&!_.access(u,"globalEval")&&ce.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?ce._evalUrl&&!u.noModule&&ce._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):m(u.textContent.replace(Me,""),u,l))}return n}function Be(e,t,n){for(var r,i=t?ce.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||ce.cleanData(Se(r)),r.parentNode&&(n&&K(r)&&Ee(Se(r,"script")),r.parentNode.removeChild(r));return e}ce.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=K(e);if(!(le.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||ce.isXMLDoc(e)))for(a=Se(c),r=0,i=(o=Se(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&we.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||Se(e),a=a||Se(c),r=0,i=o.length;r<i;r++)Fe(o[r],a[r]);else Fe(e,c);return 0<(a=Se(c,"script")).length&&Ee(a,!f&&Se(e,"script")),c},cleanData:function(e){for(var t,n,r,i=ce.event.special,o=0;void 0!==(n=e[o]);o++)if($(n)){if(t=n[_.expando]){if(t.events)for(r in t.events)i[r]?ce.event.remove(n,r):ce.removeEvent(n,r,t.handle);n[_.expando]=void 0}n[z.expando]&&(n[z.expando]=void 0)}}}),ce.fn.extend({detach:function(e){return Be(this,e,!0)},remove:function(e){return Be(this,e)},text:function(e){return M(this,function(e){return void 0===e?ce.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return $e(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Re(this,e).appendChild(e)})},prepend:function(){return $e(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Re(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return $e(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(ce.cleanData(Se(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return ce.clone(this,e,t)})},html:function(e){return M(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Oe.test(e)&&!ke[(Te.exec(e)||["",""])[1].toLowerCase()]){e=ce.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(ce.cleanData(Se(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return $e(this,arguments,function(e){var t=this.parentNode;ce.inArray(this,n)<0&&(ce.cleanData(Se(this)),t&&t.replaceChild(e,this))},n)}}),ce.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){ce.fn[e]=function(e){for(var t,n=[],r=ce(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),ce(r[o])[a](t),s.apply(n,t.get());return this.pushStack(n)}});var _e=new RegExp("^("+G+")(?!px)[a-z%]+$","i"),ze=/^--/,Xe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=ie),t.getComputedStyle(e)},Ue=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ve=new RegExp(Q.join("|"),"i");function Ge(e,t,n){var r,i,o,a,s=ze.test(t),u=e.style;return(n=n||Xe(e))&&(a=n.getPropertyValue(t)||n[t],s&&a&&(a=a.replace(ve,"$1")||void 0),""!==a||K(e)||(a=ce.style(e,t)),!le.pixelBoxStyles()&&_e.test(a)&&Ve.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=n.width,u.width=r,u.minWidth=i,u.maxWidth=o)),void 0!==a?a+"":a}function Ye(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",J.appendChild(u).appendChild(l);var e=ie.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),J.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=C.createElement("div"),l=C.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",le.clearCloneStyle="content-box"===l.style.backgroundClip,ce.extend(le,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=C.createElement("table"),t=C.createElement("tr"),n=C.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="box-sizing:content-box;border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",J.appendChild(e).appendChild(t).appendChild(n),r=ie.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,J.removeChild(e)),a}}))}();var Qe=["Webkit","Moz","ms"],Je=C.createElement("div").style,Ke={};function Ze(e){var t=ce.cssProps[e]||Ke[e];return t||(e in Je?e:Ke[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Qe.length;while(n--)if((e=Qe[n]+t)in Je)return e}(e)||e)}var et=/^(none|table(?!-c[ea]).+)/,tt={position:"absolute",visibility:"hidden",display:"block"},nt={letterSpacing:"0",fontWeight:"400"};function rt(e,t,n){var r=Y.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function it(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0,l=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(l+=ce.css(e,n+Q[a],!0,i)),r?("content"===n&&(u-=ce.css(e,"padding"+Q[a],!0,i)),"margin"!==n&&(u-=ce.css(e,"border"+Q[a]+"Width",!0,i))):(u+=ce.css(e,"padding"+Q[a],!0,i),"padding"!==n?u+=ce.css(e,"border"+Q[a]+"Width",!0,i):s+=ce.css(e,"border"+Q[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u+l}function ot(e,t,n){var r=Xe(e),i=(!le.boxSizingReliable()||n)&&"border-box"===ce.css(e,"boxSizing",!1,r),o=i,a=Ge(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(_e.test(a)){if(!n)return a;a="auto"}return(!le.boxSizingReliable()&&i||!le.reliableTrDimensions()&&fe(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===ce.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===ce.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+it(e,t,n||(i?"border":"content"),o,r,a)+"px"}function at(e,t,n,r,i){return new at.prototype.init(e,t,n,r,i)}ce.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Ge(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,aspectRatio:!0,borderImageSlice:!0,columnCount:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,scale:!0,widows:!0,zIndex:!0,zoom:!0,fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeMiterlimit:!0,strokeOpacity:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=F(t),u=ze.test(t),l=e.style;if(u||(t=Ze(s)),a=ce.cssHooks[t]||ce.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=Y.exec(n))&&i[1]&&(n=te(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(ce.cssNumber[s]?"":"px")),le.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=F(t);return ze.test(t)||(t=Ze(s)),(a=ce.cssHooks[t]||ce.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Ge(e,t,r)),"normal"===i&&t in nt&&(i=nt[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),ce.each(["height","width"],function(e,u){ce.cssHooks[u]={get:function(e,t,n){if(t)return!et.test(ce.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?ot(e,u,n):Ue(e,tt,function(){return ot(e,u,n)})},set:function(e,t,n){var r,i=Xe(e),o=!le.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===ce.css(e,"boxSizing",!1,i),s=n?it(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-it(e,u,"border",!1,i)-.5)),s&&(r=Y.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=ce.css(e,u)),rt(0,t,s)}}}),ce.cssHooks.marginLeft=Ye(le.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Ge(e,"marginLeft"))||e.getBoundingClientRect().left-Ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),ce.each({margin:"",padding:"",border:"Width"},function(i,o){ce.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+Q[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(ce.cssHooks[i+o].set=rt)}),ce.fn.extend({css:function(e,t){return M(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Xe(e),i=t.length;a<i;a++)o[t[a]]=ce.css(e,t[a],!1,r);return o}return void 0!==n?ce.style(e,t,n):ce.css(e,t)},e,t,1<arguments.length)}}),((ce.Tween=at).prototype={constructor:at,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||ce.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(ce.cssNumber[n]?"":"px")},cur:function(){var e=at.propHooks[this.prop];return e&&e.get?e.get(this):at.propHooks._default.get(this)},run:function(e){var t,n=at.propHooks[this.prop];return this.options.duration?this.pos=t=ce.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):at.propHooks._default.set(this),this}}).init.prototype=at.prototype,(at.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=ce.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){ce.fx.step[e.prop]?ce.fx.step[e.prop](e):1!==e.elem.nodeType||!ce.cssHooks[e.prop]&&null==e.elem.style[Ze(e.prop)]?e.elem[e.prop]=e.now:ce.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=at.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},ce.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},ce.fx=at.prototype.init,ce.fx.step={};var st,ut,lt,ct,ft=/^(?:toggle|show|hide)$/,pt=/queueHooks$/;function dt(){ut&&(!1===C.hidden&&ie.requestAnimationFrame?ie.requestAnimationFrame(dt):ie.setTimeout(dt,ce.fx.interval),ce.fx.tick())}function ht(){return ie.setTimeout(function(){st=void 0}),st=Date.now()}function gt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=Q[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function vt(e,t,n){for(var r,i=(yt.tweeners[t]||[]).concat(yt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function yt(o,e,t){var n,a,r=0,i=yt.prefilters.length,s=ce.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=st||ht(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:ce.extend({},e),opts:ce.extend(!0,{specialEasing:{},easing:ce.easing._default},t),originalProperties:e,originalOptions:t,startTime:st||ht(),duration:t.duration,tweens:[],createTween:function(e,t){var n=ce.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=F(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=ce.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=yt.prefilters[r].call(l,o,c,l.opts))return v(n.stop)&&(ce._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return ce.map(c,vt,l),v(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),ce.fx.timer(ce.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}ce.Animation=ce.extend(yt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return te(n.elem,e,Y.exec(t),n),n}]},tweener:function(e,t){v(e)?(t=e,e=["*"]):e=e.match(D);for(var n,r=0,i=e.length;r<i;r++)n=e[r],yt.tweeners[n]=yt.tweeners[n]||[],yt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ee(e),v=_.get(e,"fxshow");for(r in n.queue||(null==(a=ce._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,ce.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ft.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||ce.style(e,r)}if((u=!ce.isEmptyObject(t))||!ce.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=_.get(e,"display")),"none"===(c=ce.css(e,"display"))&&(l?c=l:(re([e],!0),l=e.style.display||l,c=ce.css(e,"display"),re([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===ce.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=_.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&re([e],!0),p.done(function(){for(r in g||re([e]),_.remove(e,"fxshow"),d)ce.style(e,r,d[r])})),u=vt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?yt.prefilters.unshift(e):yt.prefilters.push(e)}}),ce.speed=function(e,t,n){var r=e&&"object"==typeof e?ce.extend({},e):{complete:n||!n&&t||v(e)&&e,duration:e,easing:n&&t||t&&!v(t)&&t};return ce.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in ce.fx.speeds?r.duration=ce.fx.speeds[r.duration]:r.duration=ce.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){v(r.old)&&r.old.call(this),r.queue&&ce.dequeue(this,r.queue)},r},ce.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ee).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=ce.isEmptyObject(t),o=ce.speed(e,n,r),a=function(){var e=yt(this,ce.extend({},t),o);(i||_.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=ce.timers,r=_.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&pt.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||ce.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=_.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=ce.timers,o=n?n.length:0;for(t.finish=!0,ce.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),ce.each(["toggle","show","hide"],function(e,r){var i=ce.fn[r];ce.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(gt(r,!0),e,t,n)}}),ce.each({slideDown:gt("show"),slideUp:gt("hide"),slideToggle:gt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){ce.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),ce.timers=[],ce.fx.tick=function(){var e,t=0,n=ce.timers;for(st=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||ce.fx.stop(),st=void 0},ce.fx.timer=function(e){ce.timers.push(e),ce.fx.start()},ce.fx.interval=13,ce.fx.start=function(){ut||(ut=!0,dt())},ce.fx.stop=function(){ut=null},ce.fx.speeds={slow:600,fast:200,_default:400},ce.fn.delay=function(r,e){return r=ce.fx&&ce.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=ie.setTimeout(e,r);t.stop=function(){ie.clearTimeout(n)}})},lt=C.createElement("input"),ct=C.createElement("select").appendChild(C.createElement("option")),lt.type="checkbox",le.checkOn=""!==lt.value,le.optSelected=ct.selected,(lt=C.createElement("input")).value="t",lt.type="radio",le.radioValue="t"===lt.value;var mt,xt=ce.expr.attrHandle;ce.fn.extend({attr:function(e,t){return M(this,ce.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){ce.removeAttr(this,e)})}}),ce.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?ce.prop(e,t,n):(1===o&&ce.isXMLDoc(e)||(i=ce.attrHooks[t.toLowerCase()]||(ce.expr.match.bool.test(t)?mt:void 0)),void 0!==n?null===n?void ce.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=ce.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!le.radioValue&&"radio"===t&&fe(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(D);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),mt={set:function(e,t,n){return!1===t?ce.removeAttr(e,n):e.setAttribute(n,n),n}},ce.each(ce.expr.match.bool.source.match(/\w+/g),function(e,t){var a=xt[t]||ce.find.attr;xt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=xt[o],xt[o]=r,r=null!=a(e,t,n)?o:null,xt[o]=i),r}});var bt=/^(?:input|select|textarea|button)$/i,wt=/^(?:a|area)$/i;function Tt(e){return(e.match(D)||[]).join(" ")}function Ct(e){return e.getAttribute&&e.getAttribute("class")||""}function kt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(D)||[]}ce.fn.extend({prop:function(e,t){return M(this,ce.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[ce.propFix[e]||e]})}}),ce.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&ce.isXMLDoc(e)||(t=ce.propFix[t]||t,i=ce.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=ce.find.attr(e,"tabindex");return t?parseInt(t,10):bt.test(e.nodeName)||wt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),le.optSelected||(ce.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),ce.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){ce.propFix[this.toLowerCase()]=this}),ce.fn.extend({addClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).addClass(t.call(this,e,Ct(this)))}):(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++)i=e[o],n.indexOf(" "+i+" ")<0&&(n+=i+" ");a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this},removeClass:function(t){var e,n,r,i,o,a;return v(t)?this.each(function(e){ce(this).removeClass(t.call(this,e,Ct(this)))}):arguments.length?(e=kt(t)).length?this.each(function(){if(r=Ct(this),n=1===this.nodeType&&" "+Tt(r)+" "){for(o=0;o<e.length;o++){i=e[o];while(-1<n.indexOf(" "+i+" "))n=n.replace(" "+i+" "," ")}a=Tt(n),r!==a&&this.setAttribute("class",a)}}):this:this.attr("class","")},toggleClass:function(t,n){var e,r,i,o,a=typeof t,s="string"===a||Array.isArray(t);return v(t)?this.each(function(e){ce(this).toggleClass(t.call(this,e,Ct(this),n),n)}):"boolean"==typeof n&&s?n?this.addClass(t):this.removeClass(t):(e=kt(t),this.each(function(){if(s)for(o=ce(this),i=0;i<e.length;i++)r=e[i],o.hasClass(r)?o.removeClass(r):o.addClass(r);else void 0!==t&&"boolean"!==a||((r=Ct(this))&&_.set(this,"__className__",r),this.setAttribute&&this.setAttribute("class",r||!1===t?"":_.get(this,"__className__")||""))}))},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+Tt(Ct(n))+" ").indexOf(t))return!0;return!1}});var St=/\r/g;ce.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=v(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,ce(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=ce.map(t,function(e){return null==e?"":e+""})),(r=ce.valHooks[this.type]||ce.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=ce.valHooks[t.type]||ce.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(St,""):null==e?"":e:void 0}}),ce.extend({valHooks:{option:{get:function(e){var t=ce.find.attr(e,"value");return null!=t?t:Tt(ce.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!fe(n.parentNode,"optgroup"))){if(t=ce(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=ce.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<ce.inArray(ce.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),ce.each(["radio","checkbox"],function(){ce.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<ce.inArray(ce(e).val(),t)}},le.checkOn||(ce.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Et=ie.location,jt={guid:Date.now()},At=/\?/;ce.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new ie.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||ce.error("Invalid XML: "+(n?ce.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Dt=/^(?:focusinfocus|focusoutblur)$/,Nt=function(e){e.stopPropagation()};ce.extend(ce.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||C],d=ue.call(e,"type")?e.type:e,h=ue.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||C,3!==n.nodeType&&8!==n.nodeType&&!Dt.test(d+ce.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[ce.expando]?e:new ce.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:ce.makeArray(t,[e]),c=ce.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!y(n)){for(s=c.delegateType||d,Dt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||C)&&p.push(a.defaultView||a.parentWindow||ie)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(_.get(o,"events")||Object.create(null))[e.type]&&_.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&$(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!$(n)||u&&v(n[d])&&!y(n)&&((a=n[u])&&(n[u]=null),ce.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Nt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Nt),ce.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=ce.extend(new ce.Event,n,{type:e,isSimulated:!0});ce.event.trigger(r,null,t)}}),ce.fn.extend({trigger:function(e,t){return this.each(function(){ce.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return ce.event.trigger(e,t,n,!0)}});var qt=/\[\]$/,Lt=/\r?\n/g,Ht=/^(?:submit|button|image|reset|file)$/i,Ot=/^(?:input|select|textarea|keygen)/i;function Pt(n,e,r,i){var t;if(Array.isArray(e))ce.each(e,function(e,t){r||qt.test(n)?i(n,t):Pt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==x(e))i(n,e);else for(t in e)Pt(n+"["+t+"]",e[t],r,i)}ce.param=function(e,t){var n,r=[],i=function(e,t){var n=v(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!ce.isPlainObject(e))ce.each(e,function(){i(this.name,this.value)});else for(n in e)Pt(n,e[n],t,i);return r.join("&")},ce.fn.extend({serialize:function(){return ce.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=ce.prop(this,"elements");return e?ce.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!ce(this).is(":disabled")&&Ot.test(this.nodeName)&&!Ht.test(e)&&(this.checked||!we.test(e))}).map(function(e,t){var n=ce(this).val();return null==n?null:Array.isArray(n)?ce.map(n,function(e){return{name:t.name,value:e.replace(Lt,"\r\n")}}):{name:t.name,value:n.replace(Lt,"\r\n")}}).get()}});var Mt=/%20/g,Rt=/#.*$/,It=/([?&])_=[^&]*/,Wt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ft=/^(?:GET|HEAD)$/,$t=/^\/\//,Bt={},_t={},zt="*/".concat("*"),Xt=C.createElement("a");function Ut(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(D)||[];if(v(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Vt(t,i,o,a){var s={},u=t===_t;function l(e){var r;return s[e]=!0,ce.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Gt(e,t){var n,r,i=ce.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&ce.extend(!0,e,r),e}Xt.href=Et.href,ce.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":zt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":ce.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Gt(Gt(e,ce.ajaxSettings),t):Gt(ce.ajaxSettings,e)},ajaxPrefilter:Ut(Bt),ajaxTransport:Ut(_t),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=ce.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?ce(y):ce.event,x=ce.Deferred(),b=ce.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Wt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace($t,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(D)||[""],null==v.crossDomain){r=C.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Xt.protocol+"//"+Xt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=ce.param(v.data,v.traditional)),Vt(Bt,v,t,T),h)return T;for(i in(g=ce.event&&v.global)&&0==ce.active++&&ce.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ft.test(v.type),f=v.url.replace(Rt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Mt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(At.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(It,"$1"),o=(At.test(f)?"&":"?")+"_="+jt.guid+++o),v.url=f+o),v.ifModified&&(ce.lastModified[f]&&T.setRequestHeader("If-Modified-Since",ce.lastModified[f]),ce.etag[f]&&T.setRequestHeader("If-None-Match",ce.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+zt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Vt(_t,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=ie.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&ie.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<ce.inArray("script",v.dataTypes)&&ce.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(ce.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(ce.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--ce.active||ce.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return ce.get(e,t,n,"json")},getScript:function(e,t){return ce.get(e,void 0,t,"script")}}),ce.each(["get","post"],function(e,i){ce[i]=function(e,t,n,r){return v(t)&&(r=r||n,n=t,t=void 0),ce.ajax(ce.extend({url:e,type:i,dataType:r,data:t,success:n},ce.isPlainObject(e)&&e))}}),ce.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),ce._evalUrl=function(e,t,n){return ce.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){ce.globalEval(e,t,n)}})},ce.fn.extend({wrapAll:function(e){var t;return this[0]&&(v(e)&&(e=e.call(this[0])),t=ce(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return v(n)?this.each(function(e){ce(this).wrapInner(n.call(this,e))}):this.each(function(){var e=ce(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=v(t);return this.each(function(e){ce(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){ce(this).replaceWith(this.childNodes)}),this}}),ce.expr.pseudos.hidden=function(e){return!ce.expr.pseudos.visible(e)},ce.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},ce.ajaxSettings.xhr=function(){try{return new ie.XMLHttpRequest}catch(e){}};var Yt={0:200,1223:204},Qt=ce.ajaxSettings.xhr();le.cors=!!Qt&&"withCredentials"in Qt,le.ajax=Qt=!!Qt,ce.ajaxTransport(function(i){var o,a;if(le.cors||Qt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Yt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&ie.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),ce.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),ce.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return ce.globalEval(e),e}}}),ce.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),ce.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=ce("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=Tt(e.slice(s)),e=e.slice(0,s)),v(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&ce.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?ce("<div>").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var en=/^[\s\uFEFF\xA0]+|([^\s\uFEFF\xA0])[\s\uFEFF\xA0]+$/g;ce.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),v(e))return r=ae.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(ae.call(arguments)))}).guid=e.guid=e.guid||ce.guid++,i},ce.holdReady=function(e){e?ce.readyWait++:ce.ready(!0)},ce.isArray=Array.isArray,ce.parseJSON=JSON.parse,ce.nodeName=fe,ce.isFunction=v,ce.isWindow=y,ce.camelCase=F,ce.type=x,ce.now=Date.now,ce.isNumeric=function(e){var t=ce.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},ce.trim=function(e){return null==e?"":(e+"").replace(en,"$1")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return ce});var tn=ie.jQuery,nn=ie.$;return ce.noConflict=function(e){return ie.$===ce&&(ie.$=nn),e&&ie.jQuery===ce&&(ie.jQuery=tn),ce},"undefined"==typeof e&&(ie.jQuery=ie.$=ce),ce});diff --git a/core/app/helpers/spree/addresses_helper.rb b/core/app/helpers/spree/addresses_helper.rbindex 1fb227babf..6ce6534001 100644--- a/core/app/helpers/spree/addresses_helper.rb+++ b/core/app/helpers/spree/addresses_helper.rb@@ -23,7 +23,7 @@ module Spreemethod_name = Spree.t(:zipcode)form.label(:zipcode, method_name, id: address_id + '_zipcode_label', class: 'block text-xs text-neutral-600 mb-1') +form.text_field(:zipcode,- class: 'text-input h-full',+ class: 'text-input',placeholder: method_name,required: country&.zipcode_required?,data: { 'address-form-target': 'zipcode', address_autocomplete_target: 'zipcode' },diff --git a/core/lib/spree/testing_support/common_rake.rb b/core/lib/spree/testing_support/common_rake.rbindex c73636d9c9..da93444575 100644--- a/core/lib/spree/testing_support/common_rake.rb+++ b/core/lib/spree/testing_support/common_rake.rb@@ -30,7 +30,6 @@ namespace :common doSpree::DummyGenerator.start dummy_app_argsunless skip_javascript- system('bundle add sprockets-rails') # we need this until we will remove bootstrap/popper_js gemssystem('bundle exec rails importmap:install turbo:install stimulus:install')end@@ -53,11 +52,6 @@ namespace :common do"--authentication=#{args[:authentication]}"]- if !skip_javascript || ENV['LIB_NAME'] == 'spree/emails'- puts 'Precompiling assets...'- system('bundle exec rake assets:precompile > /dev/null 2>&1')- end-unless ENV['NO_MIGRATE']puts 'Setting up dummy database...'system('bundle exec rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')@@ -78,6 +72,13 @@ namespace :common dorescue LoadErrorputs 'Skipping installation no generator to run...'end++ # Precompile assets after all generators have run+ # This ensures CSS entry points (like Spree Admin's Tailwind CSS) are created first+ if !skip_javascript || ENV['LIB_NAME'] == 'spree/emails'+ puts 'Precompiling assets...'+ system('bundle exec rake assets:precompile')+ endendtask :db_setup do |_t|diff --git a/storefront/app/helpers/spree/checkout_helper.rb b/storefront/app/helpers/spree/checkout_helper.rbindex 2cc3ac39d5..b23f49cec4 100644--- a/storefront/app/helpers/spree/checkout_helper.rb+++ b/storefront/app/helpers/spree/checkout_helper.rb@@ -21,10 +21,10 @@ module Spreeendtext = link_to(link_content, link_url)- css_classes << 'text-primary'+ css_classes << 'text-zinc-950'content_tag('li', text, class: css_classes.join(' '))else- content_tag('li', text, class: "breadcrumb-item #{state == @order.state ? 'font-bold' : 'text-text'}")+ content_tag('li', text, class: "breadcrumb-item #{state == @order.state ? 'font-bold' : 'text-gray-950'}")endendcontent_tag('ol', raw(items.join("\n")), class: 'breadcrumb flex items-center py-6 gap-2', id: "checkout-step-#{@order.state}")diff --git a/storefront/app/views/layouts/spree/checkout.html.erb b/storefront/app/views/layouts/spree/checkout.html.erbindex dba0143f0c..7fc0825147 100644--- a/storefront/app/views/layouts/spree/checkout.html.erb+++ b/storefront/app/views/layouts/spree/checkout.html.erb@@ -8,13 +8,13 @@<%= render 'spree/shared/head' %><%= render 'spree/shared/custom_head' %></head>- <body id="checkout-page" class="theme-<%= current_theme.class.name.demodulize.underscore %> w-full bg-background text-text">+ <body id="checkout-page" class="theme-<%= current_theme.class.name.demodulize.underscore %> w-full bg-background text-gray-950"><%= render_storefront_partials(:body_start_partials) %><%= current_store.storefront_custom_code_body_start&.html_safe %><div id="overlay" class="overlay"></div>- <div class="w-full min-h-screen text-muted bg-background" id="checkout-container">+ <div class="w-full min-h-screen text-gray-600 bg-background" id="checkout-container"><headerclass="checkout-mobile-header lg:hidden relative z-[999] bg-background tailwind-container text-center py-3 mx-auto"id="checkout-mobile-header"diff --git a/storefront/app/views/layouts/spree/password.html.erb b/storefront/app/views/layouts/spree/password.html.erbindex 0388e8b235..c9a013f94f 100644--- a/storefront/app/views/layouts/spree/password.html.erb+++ b/storefront/app/views/layouts/spree/password.html.erb@@ -5,7 +5,7 @@<%= render 'spree/shared/custom_head' %><%= current_store.storefront_custom_code_head&.html_safe %></head>- <body class="bg-background w-full text-text">+ <body class="bg-background w-full text-gray-950"><%= render_storefront_partials(:body_start_partials) %><%= current_store.storefront_custom_code_body_start&.html_safe %>diff --git a/storefront/app/views/layouts/spree/storefront.html.erb b/storefront/app/views/layouts/spree/storefront.html.erbindex 659b13b2fd..1cda11970f 100644--- a/storefront/app/views/layouts/spree/storefront.html.erb+++ b/storefront/app/views/layouts/spree/storefront.html.erb@@ -6,7 +6,7 @@<%= render 'spree/shared/json_ld' %><%= current_store.storefront_custom_code_head&.html_safe %></head>- <body class="theme-<%= current_theme.class.name.demodulize.underscore %> bg-background w-full text-text <%= current_page&.slug %>-page <% if current_theme_preview.present? %>inside-page-builder<% end %>">+ <body class="theme-<%= current_theme.class.name.demodulize.underscore %> bg-background w-full text-gray-950 <%= current_page&.slug %>-page <% if current_theme_preview.present? %>inside-page-builder<% end %>"><%= render_storefront_partials(:body_start_partials) %><%= current_store.storefront_custom_code_body_start&.html_safe %>diff --git a/storefront/app/views/spree/checkout/_address.html.erb b/storefront/app/views/spree/checkout/_address.html.erbindex cbfd745ab0..ebd1ac7158 100644--- a/storefront/app/views/spree/checkout/_address.html.erb+++ b/storefront/app/views/spree/checkout/_address.html.erb@@ -74,7 +74,7 @@<% if !already_have_an_account? && defined?(spree_login_path) %><div class="lg:text-right"><span class="text-gray-600 text-sm">- <%= Spree.t('storefront.checkout.already_have_an_account') %> <span class="text-primary"><%= link_to Spree.t(:login), spree_login_path, data: { turbo_frame: '_top' } %></span>+ <%= Spree.t('storefront.checkout.already_have_an_account') %> <span class="text-zinc-950"><%= link_to Spree.t(:login), spree_login_path, data: { turbo_frame: '_top' } %></span></span></div><% end %>@@ -104,7 +104,7 @@<% unless try_spree_current_user %><% if already_have_an_account? %><div class="py-2 text-sm">- <%= Spree.t("storefront.checkout.it_seems_you_already_have_an_account_html", link: link_to(Spree.t(:login), spree_login_path, class: 'text-primary font-semibold')) %>+ <%= Spree.t("storefront.checkout.it_seems_you_already_have_an_account_html", link: link_to(Spree.t(:login), spree_login_path, class: 'text-zinc-950 font-semibold')) %></div><% end %><% end %>@@ -134,7 +134,7 @@<%= render 'spree/checkout/special_instructions', form: form %></div>- <div class="flex justify-end w-full">+ <div class="flex justify-end w-full gap-2"><%= button_tag Spree.t(:save_and_continue),class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',data: {diff --git a/storefront/app/views/spree/checkout/_delivery.html.erb b/storefront/app/views/spree/checkout/_delivery.html.erbindex 7feb79c74f..7e7146ba55 100644--- a/storefront/app/views/spree/checkout/_delivery.html.erb+++ b/storefront/app/views/spree/checkout/_delivery.html.erb@@ -24,8 +24,8 @@</div></div></div>- <div class="flex justify-end w-full mt-5">- <div class="flex justify-end w-full">+ <div class="flex justify-end w-full gap-2 mt-5">+ <div class="flex justify-end w-full gap-2"><%= button_tag Spree.t(:save_and_continue),class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',data: { action: 'click->checkout-delivery#disableShippingRates',diff --git a/storefront/app/views/spree/checkout/_payment_methods.html.erb b/storefront/app/views/spree/checkout/_payment_methods.html.erbindex 5021be9d0b..e781cba748 100644--- a/storefront/app/views/spree/checkout/_payment_methods.html.erb+++ b/storefront/app/views/spree/checkout/_payment_methods.html.erb@@ -11,7 +11,7 @@<%= Spree.t('storefront.checkout.order_already_paid') %></p></div>- <div class="flex justify-end w-full">+ <div class="flex justify-end w-full gap-2"><%= button_tag Spree.t(:place_order),class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',data: { 'turbo-submits-with': (render 'spree/checkout/button_processing', is_hidden: false) } %>@@ -20,7 +20,7 @@<h5 class="mb-3 font-body font-semibold"><%= Spree.t(:payment) %></h5>- <p class="text-muted mb-3 text-neutral-600">+ <p class="text-gray-600 mb-3 text-neutral-600"><%= Spree.t('storefront.checkout.all_transactions_are_secure_and_encrypted') %></p>@@ -39,7 +39,7 @@<%= render 'spree/checkout/terms_and_conditions' %>- <div class="flex justify-end w-full">+ <div class="flex justify-end w-full gap-2"><button type="submit"id="checkout-payment-submit"class="btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4"diff --git a/storefront/app/views/spree/checkout/_terms_and_conditions.html.erb b/storefront/app/views/spree/checkout/_terms_and_conditions.html.erbindex 0961d8be0b..8661e32dd7 100644--- a/storefront/app/views/spree/checkout/_terms_and_conditions.html.erb+++ b/storefront/app/views/spree/checkout/_terms_and_conditions.html.erb@@ -1,5 +1,5 @@<p id="payment-and-conditions" class="text-xs mt-2 mb-4"><%= Spree.t('storefront.checkout.by_placing_this_order_you_agree_to') %>- <%= link_to Spree.t(:terms_of_service), policy_path('terms_of_service'), target: :_blank, class: 'text-primary' %><%= I18n.t('support.array.two_words_connector') %>- <%= link_to Spree.t(:privacy_policy), policy_path('privacy_policy'), target: :_blank, class: 'text-primary' %>.+ <%= link_to Spree.t(:terms_of_service), policy_path('terms_of_service'), target: :_blank, class: 'text-zinc-950' %><%= I18n.t('support.array.two_words_connector') %>+ <%= link_to Spree.t(:privacy_policy), policy_path('privacy_policy'), target: :_blank, class: 'text-zinc-950' %>.</p>\ No newline at end of filediff --git a/storefront/app/views/themes/default/spree/checkout/complete.html.erb b/storefront/app/views/themes/default/spree/checkout/complete.html.erbindex 544b0812f2..bf85f66265 100644--- a/storefront/app/views/themes/default/spree/checkout/complete.html.erb+++ b/storefront/app/views/themes/default/spree/checkout/complete.html.erb@@ -1,4 +1,4 @@-<div id="<%= dom_id(@order) %>" class="text-muted">+<div id="<%= dom_id(@order) %>" class="text-gray-600"><p class="text-sm mb-1 mt-3"><%= Spree.t(:order) %> <strong><%= @order.number %></strong></p>diff --git a/storefront/app/views/themes/default/spree/orders/_line_item.html.erb b/storefront/app/views/themes/default/spree/orders/_line_item.html.erbindex 5f71506f96..14348ade7f 100644--- a/storefront/app/views/themes/default/spree/orders/_line_item.html.erb+++ b/storefront/app/views/themes/default/spree/orders/_line_item.html.erb@@ -13,7 +13,7 @@</div><div class="ml-3 w-full"><div class="flex justify-between">- <%= link_to line_item.name, spree_storefront_resource_url(line_item.product), class: 'font-semibold text-text', data: { 'turbo-frame': '_top' } %>+ <%= link_to line_item.name, spree_storefront_resource_url(line_item.product), class: 'font-semibold text-gray-950', data: { 'turbo-frame': '_top' } %><%= form_for line_item, url: spree.line_item_url(line_item, order_token: line_item.order.token), method: :delete, data: { controller: 'turbo-stream-form' } do |item_form| %><%= button_tag type: :submit, class: 'remove-line-item-button', data: { action: "click->cart#disableCart turbo-stream-form:submit-end->cart#enableCart" } do %>diff --git a/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erb b/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erbindex ae9acfc45d..702220c214 100644--- a/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_breadcrumbs.html.erb@@ -10,7 +10,7 @@<div class="breadcrumb-square opacity-50 <%= 'hidden md:block' if index == taxons.length - 1 %>"></div><% end %>- <li class="hidden lg:block text-text opacity-100"><%= @product.name %></li>+ <li class="hidden lg:block text-gray-950 opacity-100"><%= @product.name %></li></ul><% end %></nav>diff --git a/storefront/app/views/themes/default/spree/page_sections/_footer.html.erb b/storefront/app/views/themes/default/spree/page_sections/_footer.html.erbindex a114f881f1..cf352512aa 100644--- a/storefront/app/views/themes/default/spree/page_sections/_footer.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_footer.html.erb@@ -46,7 +46,7 @@</div></div></div>- <div class="flex justify-end w-full"></div>+ <div class="flex justify-end w-full gap-2"></div></div></div><div class="text-sm" style="color: <%= section.preferred_copyright_text_color %>; background-color: <%= section.preferred_copyright_background_color %>">diff --git a/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erb b/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erbindex 75873d8fc0..af3a2eebcb 100644--- a/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erb+++ b/storefront/app/views/themes/default/spree/page_sections/_main_password_header.html.erb@@ -1,7 +1,7 @@<% logo = section.logo || current_store.logo %><div style='<%= section_styles(section) %>'><div class="page-container">- <div class="bg-background text-text flex flex-col items-center gap-2 md:flex-row justify-between">+ <div class="bg-background text-gray-950 flex flex-col items-center gap-2 md:flex-row justify-between"><% if logo&.attached? && logo.variable? %><%= render 'spree/shared/logo', logo: section.logo, height: section.preferred_desktop_logo_height %><% else %>diff --git a/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erb b/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erbindex 8d88766a91..6ed4ea4a98 100644--- a/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erb+++ b/storefront/app/views/themes/default/spree/products/_breadcrumbs.html.erb@@ -6,7 +6,7 @@<div class="breadcrumb-square opacity-50"></div><% end %>- <li class="text-text opacity-100"><%= product.name %></li>+ <li class="text-gray-950 opacity-100"><%= product.name %></li></ul><!-- mobile -->diff --git a/storefront/app/views/themes/default/spree/shared/_account_pane.html.erb b/storefront/app/views/themes/default/spree/shared/_account_pane.html.erbindex e0f84708e2..afaf6fdd4b 100644--- a/storefront/app/views/themes/default/spree/shared/_account_pane.html.erb+++ b/storefront/app/views/themes/default/spree/shared/_account_pane.html.erb@@ -10,7 +10,7 @@<divid='slideover-account'data-slideover-account-target='menu'- class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-text md:border-l border-default transition ease-in-out duration-300 translate-x-full'+ class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-gray-950 md:border-l border-default transition ease-in-out duration-300 translate-x-full'><div class='p-4 gap-4 shrink-0 flex items-center justify-between border-b border-default z-50'><buttondiff --git a/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb b/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erbindex b218f70813..827921efe7 100644--- a/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb+++ b/storefront/app/views/themes/default/spree/shared/_cart_pane.html.erb@@ -13,7 +13,7 @@<divid='slideover-cart'data-slideover-target='menu'- class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-text md:border-l border-default transition ease-in-out duration-300 translate-x-full'+ class='relative sidebar-pane flex-1 !flex flex-col w-full bg-background text-gray-950 md:border-l border-default transition ease-in-out duration-300 translate-x-full'><div class='p-4 gap-4 shrink-0 flex items-center justify-between border-b border-default z-50'><%= button_tag(diff --git a/storefront/app/views/themes/default/spree/shared/_flash.html.erb b/storefront/app/views/themes/default/spree/shared/_flash.html.erbindex 01ea403f1f..e63a990ed4 100644--- a/storefront/app/views/themes/default/spree/shared/_flash.html.erb+++ b/storefront/app/views/themes/default/spree/shared/_flash.html.erb@@ -2,7 +2,7 @@<div class="pointer-events-none w-full"><div data-controller="alert" data-alert-hide-class="translate-x-[500px] opacity-0" class="ease-in-out duration-500 w-full relative pointer-events-auto <%= tailwind_classes_for(key) %>"><div class="p-2">- <p class="text-sm lg:text-base font-medium text-center uppercase text-text flash-message">+ <p class="text-sm lg:text-base font-medium text-center uppercase text-gray-950 flash-message"><%= value %></p><button data-action="alert#close" class="absolute top-2 right-2 h-[22px] lg:h-6">diff --git a/storefront/app/views/themes/default/spree/shared/_order_details.html.erb b/storefront/app/views/themes/default/spree/shared/_order_details.html.erbindex 3b48d336b7..e709554628 100644--- a/storefront/app/views/themes/default/spree/shared/_order_details.html.erb+++ b/storefront/app/views/themes/default/spree/shared/_order_details.html.erb@@ -36,7 +36,7 @@<% end %><div class="mt-6 bg-accent mb-24">- <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-6 p-4 lg:p-6 text-sm bg-border bg-accent-100">+ <div class="grid grid-cols-1 lg:grid-cols-2 gap-4 lg:gap-6 p-4 lg:p-6 text-sm bg-gray-200 bg-accent-100"><% if order.billing_address.present? %><!-- billing address --><div>