Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Admin: SASS variables cleanup
Damian Legawiecff7f0afa353f
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scssindex 9a9a1557e0..0614e82348 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss@@ -38,13 +38,13 @@.dropdown-item {margin-bottom: 0.25rem;- border-radius: $border-radius;+ border-radius: $dropdown-inner-border-radius;display: flex;align-items: center;justify-content: flex-start;background: transparent;- padding-top: 0.4rem;- padding-bottom: 0.4rem;+ padding-top: 0.45rem;+ padding-bottom: 0.45rem;transition-property: background-color, color;transition-duration: 0.01s;diff --git a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss b/admin/app/assets/stylesheets/spree/admin/components/_filters.scssindex 097d41ed3f..996808eff3 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_filters.scss@@ -6,8 +6,8 @@top: $header-height;z-index: 1000;background-color: $card-bg;- border-top-left-radius: $border-radius-lg;- border-top-right-radius: $border-radius-lg;+ border-top-left-radius: $card-border-radius;+ border-top-right-radius: $card-border-radius;.btn {height: 2.125rem;diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scssindex 3f0f503566..4a50176632 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss@@ -42,10 +42,10 @@ table.table {padding-bottom: 0.3rem;}th:first-child {- border-top-left-radius: $border-radius-lg;+ border-top-left-radius: $card-border-radius;}th:last-child {- border-top-right-radius: $border-radius-lg;+ border-top-right-radius: $card-border-radius;}}@@ -85,10 +85,10 @@ table.table {tr:last-child {td:first-child {- border-bottom-left-radius: $border-radius-lg;+ border-bottom-left-radius: $card-border-radius;}td:last-child {- border-bottom-right-radius: $border-radius-lg;+ border-bottom-right-radius: $card-border-radius;}}}@@ -209,8 +209,8 @@ td.actions {bottom: 0;background-color: $card-bg;z-index: 100;- border-bottom-left-radius: $border-radius-lg;- border-bottom-right-radius: $border-radius-lg;+ border-bottom-left-radius: $card-border-radius;+ border-bottom-right-radius: $card-border-radius;.page-link {@extend .btn;diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssindex 6438ad27ee..09dfef195a 100644--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss@@ -116,7 +116,7 @@ $btn-font-weight: 500 !default;$card-border-width: 1px !default;$card-bg: $white !default;-$card-border-radius: $border-radius-lg !default;+$card-border-radius: 1rem !default;$tooltip-border-radius: $border-radius !default;$tooltip-opacity: 1 !default;@@ -163,7 +163,8 @@ $display4-weight: 400 !default;$dropdown-bg: $white !default;$dropdown-border-width: 0px !default;-$dropdown-border-radius: $border-radius-lg !default;+$dropdown-border-radius: 1rem !default;+$dropdown-inner-border-radius: 0.75rem !default;$dropdown-link-hover-bg: rgba($gray-100, 0.5) !default;$dropdown-box-shadow: 0px 0px 0px 1px $border-color, 0px 6px 12px -3px $gray-100, 0px 6px 18px 0px $gray-100 !default;$dropdown-padding-x: 0.25rem !default;@@ -226,4 +227,7 @@ $btn-border-radius: $border-radius-lg !default;$btn-border-radius-lg: $border-radius-lg !default;$btn-border-radius-sm: $border-radius !default;-$nav-pills-border-radius: $border-radius-lg !default;\ No newline at end of file+$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/views/spree/admin/shared/_calendar_range_picker.html.erb b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erbindex 6daaf196d8..e8fcb4eac8 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@@ -19,7 +19,7 @@<% end %></div></div>- <div class="dropdown-menu dropdown-menu-<%= dropdown_direction %> pb-0 pr-0 pl-1 pt-1" onclick="event.stopPropagation()">+ <div class="dropdown-menu dropdown-menu-<%= dropdown_direction %> pt-2 px-2 pb-1" onclick="event.stopPropagation()"><div data-calendar-range-target="picker" class="d-none"></div></div>