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
[Skip CI] Admin UX improvements (media form, inputs, tom select)
Damian Legawiecd3a88bd1149a
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_media_form.scssindex da2681c663..208d7f28f6 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_media_form.scss@@ -13,9 +13,15 @@color: $gray-500;&:hover {- background-color: $gray-25;- border-color: $gray-100;- color: $gray-700;+ background-color: $action;+ border-color: rgba($blue, 0.5);+ color: rgba($blue, 0.8);+ }++ &:active {+ background-color: $action;+ border-color: rgba($blue, 0.5);+ box-shadow: 0 0 0 2px $white, 0 0 0 4px $blue !important;}}@@ -55,6 +61,10 @@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;@@ -78,9 +88,11 @@display: inline !important;}- & img {- opacity: 0.5;- }+ 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 {diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssindex e58f2f600a..7911077e66 100644--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss@@ -77,7 +77,7 @@ $thumbnail-border-color: $gray-100 !default;$hr-border-color: $border-color !default;$table-border-color: $gray-50 !default;$card-border-color: $border-color !default;-$input-btn-focus-width: 0.15rem !default;+$input-btn-focus-width: 0.18rem !default;$card-spacer-y: .75rem !default;$card-spacer-x: 1rem !default;@@ -87,6 +87,7 @@ $component-active-bg: $blue !default;$input-placeholder-color: $gray-500;$input-padding-y: .5rem !default;$input-disabled-bg: $gray-50 !default;+$input-focus-border-color: $blue !default;$custom-select-disabled-bg: $gray-50 !default;$text-muted: $gray-400 !default;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.scssindex 5d2d726e8f..415ed33d12 100644--- a/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap4.scss+++ b/admin/app/assets/stylesheets/spree/admin/plugins/tom-select.bootstrap4.scss@@ -29,9 +29,9 @@ $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-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;@@ -67,8 +67,9 @@ $select-arrow-offset: calc(#{$select-padding-x} + 5px) !default;z-index: $zindex-dropdown;background: $select-color-dropdown;border: 1px solid $dropdown-border-color; //$dropdown-fallback-border- border-radius: $border-radius;+ border-radius: $border-radius-lg;box-shadow: 0 6px 12px rgba(0,0,0,.175);+ top: 110%;}.#{$select-ns}-dropdown {diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scssindex 139d7a933f..2c1552c30d 100644--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss@@ -27,6 +27,9 @@ label {}.form-control, .text-input, .trix-container, .ts-control, trix-toolbar .trix-dialog .trix-input, .custom-select, .input-group-text, .custom-file-label {+ transition-property: box-shadow;+ transition-duration: 0.2s;+&:disabled, &[readonly] {@extend .shadow-none;@extend .text-muted;diff --git a/admin/app/views/spree/admin/integrations/index.html.erb b/admin/app/views/spree/admin/integrations/index.html.erbindex 37749bd42b..158e2ff6e8 100644--- a/admin/app/views/spree/admin/integrations/index.html.erb+++ b/admin/app/views/spree/admin/integrations/index.html.erb@@ -14,7 +14,7 @@<div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div><% end %>- <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">+ <div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 mb-4"><% integrations.each do |integration| %><%= render 'spree/admin/integrations/integration', integration_class: integration %><% end %>diff --git a/admin/app/views/spree/admin/variants/form/_media_asset.html.erb b/admin/app/views/spree/admin/variants/form/_media_asset.html.erbindex 530cd761f2..c0bddc551e 100644--- a/admin/app/views/spree/admin/variants/form/_media_asset.html.erb+++ b/admin/app/views/spree/admin/variants/form/_media_asset.html.erb@@ -1,4 +1,4 @@-<div id="<%= spree_dom_id(asset) %>" class="media-form__image border border-gray-200" data-sortable-update-url="<%= spree.admin_asset_path(asset) %>">+<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"><%= 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>