Skip to content

armgit / spree

Public Imported from GitHub
0

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.

Admin: small UI fixes

Damian Legawiec5b120bef01dc
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss b/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss
index dd7f3860d5..374ad1e7ab 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss
@@ -63,7 +63,7 @@
.alert {
border-width: 1px;
- box-shadow: $box-shadow-xs;
+ box-shadow: $box-shadow-sm;
border-radius: $border-radius-lg;
}
}
\ No newline at end of file
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
index 6055beed93..6b0cc609bc 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
@@ -10,11 +10,13 @@ button[disabled] .show-when-enabled { display: none; }
}
.btn {
- box-shadow: $btn-box-shadow;
-
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;
@@ -33,7 +35,6 @@ button[disabled] .show-when-enabled { display: none; }
.ti {
font-size: 120%;
vertical-align: middle;
- line-height: 120%;
}
.btn {
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
index 67bb607876..5ad98e3d90 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
@@ -72,6 +72,9 @@
&.btn {
font-weight: $font-weight-base !important;
}
+ &.btn-danger {
+ box-shadow: none;
+ }
}
.dropdown-item.active {
color: theme-color('black') !important;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
index c1a6905cec..7f7df25a4a 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
@@ -158,17 +158,17 @@
border-radius: $border-radius-lg;
display: flex;
align-items: center;
- padding-left: 0.3rem;
- padding-right: 0.3rem;
- padding-top: 0.3rem;
- padding-bottom: 0.3rem;
+ padding-left: 0.25rem;
+ padding-right: 0.25rem;
+ padding-top: 0.25rem;
+ padding-bottom: 0.25rem;
color: inherit;
transition: background-color 0.1s ease-in-out;
.ti {
margin-right: 0.5rem;
- border-radius: $border-radius-sm;
+ border-radius: $border-radius;
padding: 0.2rem 0.2rem;
}
@@ -193,6 +193,7 @@
.badge:not(.badge-info) {
@extend .badge-light;
+ border-radius: $border-radius;
}
}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss b/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss
index 391f51dc56..70ac4fd30f 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss
@@ -80,8 +80,7 @@
.new_option_button {
@extend .btn;
@extend .btn-secondary;
- @extend .py-3;
- @extend .mt-2;
+ @extend .py-2;
width: 100%;
justify-content: flex-start;
}
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index b8c67e0ec8..870352e321 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -60,9 +60,9 @@ $body-bg: $white !default;
$enable-shadows: false;
$enable-responsive-font-sizes: true;
$font-family-sans-serif: Inter, sans-serif !default;
-$font-size-base: 0.8125rem !default;
+$font-size-base: 0.875rem !default;
$font-size-plus: 0.875rem !default;
-$font-size-sm: 0.75rem !default;
+$font-size-sm: 0.8125rem !default;
$font-size-lg: 1rem !default;
$font-weight-normal: 400 !default;
$font-weight-medium: 500 !default;
@@ -91,7 +91,7 @@ $card-spacer-x: 1.25rem !default;
$component-active-bg: $blue !default;
$input-placeholder-color: $gray-500;
-$input-padding-y: .55rem !default;
+$input-padding-y: .5rem !default;
$input-disabled-bg: $gray-25 !default;
$input-focus-border-color: $blue !default;
$custom-select-disabled-bg: $gray-50 !default;
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index 5f74c44f9a..afd12bb14b 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -4,6 +4,7 @@ html {
letter-spacing: normal;
text-rendering: optimizeLegibility;
text-size-adjust: 100%;
+ line-height: 1;
}
body {
@extend .h-100;
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
index deb0fb0d41..0160e9ad57 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
@@ -23,7 +23,7 @@ label {
}
.form-text {
- font-size: $font-size-sm;
+ font-size: $font-size-base;
color: $text-muted;
margin-top: 0;
}
@@ -72,11 +72,6 @@ input[type="file"] {
border-radius: $input-border-radius;
padding-right: 2.5rem;
}
-.custom-select, .form-control, .ts-control {
- &:hover:not(:focus):not(:active):not(.active):not(:focus-visible):not(:focus-within) {
- border: 1px solid $gray-300;
- }
-}
.ts-control>input {
min-width: auto !important;
diff --git a/admin/app/views/spree/admin/products/form/_status.html.erb b/admin/app/views/spree/admin/products/form/_status.html.erb
index e6c26919aa..dcb214f4ea 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,4 @@
<div class="card mb-4">
- <div class="card-header">
- <h5 class="card-title"><%= Spree.t(:status) %></h5>
- </div>
<div class="card-body">
<div class="row mb-3">
<div class="col-6">
diff --git a/admin/app/views/spree/admin/products/form/_variants.html.erb b/admin/app/views/spree/admin/products/form/_variants.html.erb
index 824d1fca40..61c57eba68 100644
--- a/admin/app/views/spree/admin/products/form/_variants.html.erb
+++ b/admin/app/views/spree/admin/products/form/_variants.html.erb
@@ -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">
+ <div class="variants-table__footer font-size-sm">
<%= 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/stores/form/_checkout.html.erb b/admin/app/views/spree/admin/stores/form/_checkout.html.erb
index e720bce2f2..8b6393032f 100644
--- a/admin/app/views/spree/admin/stores/form/_checkout.html.erb
+++ b/admin/app/views/spree/admin/stores/form/_checkout.html.erb
@@ -9,10 +9,10 @@
<div class="card-body">
<%= f.spree_select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { label: Spree.t(:shipping_zone), autocomplete: true } %>
- <small class="form-text mb-3">
+ <span class="form-text mb-3">
<%= Spree.t(:shipping_zone_help) %>
<%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %>
- </small>
+ </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) } %>