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.

Improve Admin SASS variable handling

Damian Legawiec39d62e0faa56
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
index 6bed3cf0f4..f6f18688f9 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
@@ -9,6 +9,10 @@ button[disabled] .show-when-enabled { display: none; }
@include button-variant(theme-color('success'), theme-color('success'), theme-color('success') );
}
+.btn {
+ box-shadow: $btn-box-shadow;
+}
+
.btn,
.nav-pills > li > a {
vertical-align: middle;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss b/admin/app/assets/stylesheets/spree/admin/components/_cards.scss
index 52ac16c726..7bd69074ff 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_cards.scss
@@ -35,6 +35,10 @@
}
}
+.card .card {
+ border-radius: $border-radius;
+}
+
.card-header, .card-footer {
background-color: transparent;
}
@@ -60,9 +64,8 @@
}
.card, .card-lg {
- border: 0;
- box-shadow: 0 0 0 1px $card-border-color;
- background-color: $white;
+ box-shadow: $card-box-shadow;
+ background-color: $card-bg;
border-radius: $border-radius-lg;
}
.card-lg {
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
index 2b716569e4..577692bb22 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
@@ -45,6 +45,7 @@
background: transparent;
padding-top: 0.4rem;
padding-bottom: 0.4rem;
+ margin-bottom: 0.15rem;
color: $gray-700;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
index ede7138394..de7ba62c62 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
@@ -32,6 +32,7 @@
justify-content: space-between;
text-align: left;
gap: 0.5rem;
+ box-shadow: none !important;
&:hover {
background-color: $gray-50;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
index 3862109e9c..967e163d3f 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
@@ -50,8 +50,8 @@ table.table {
}
thead {
- background-color: rgba($gray-25, 0.5);
th {
+ background-color: rgba($gray-25, 0.5);
@extend .text-muted;
font-size: $font-size-sm;
font-weight: $font-weight-normal;
@@ -59,6 +59,12 @@ table.table {
padding-top: 0.3rem;
padding-bottom: 0.3rem;
}
+ th:first-child {
+ border-top-left-radius: $border-radius-lg;
+ }
+ th:last-child {
+ border-top-right-radius: $border-radius-lg;
+ }
}
tbody {
@@ -196,3 +202,16 @@ td.actions {
top: 0px;
}
}
+
+.card-lg {
+ table {
+ thead {
+ th:first-child {
+ border-top-left-radius: 0;
+ }
+ th:last-child {
+ border-top-right-radius: 0;
+ }
+ }
+ }
+}
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index 803b4c8628..d112c48bc5 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -2,7 +2,7 @@
$gray-25: #F9F9F9;
$gray-50: #F3F3F3;
-$gray-100: #E6E6E6 !default;
+$gray-100: #E7E5E4 !default;
$gray-200: #D5D5D5 !default;
$gray-300: #B3B3B3 !default;
$gray-400: #999999 !default;
@@ -72,7 +72,6 @@ $line-height-base: 1.5 !default;
$border-radius: 0.5rem !default;
$border-radius-sm: 0.4rem !default;
$border-radius-lg: 0.75rem !default;
-$card-border-radius: $border-radius-lg !default;
$border-color: $gray-100 !default;
$input-border-color: $border-color !default;
$list-group-border-color: $border-color !default;
@@ -95,6 +94,8 @@ $input-placeholder-color: $gray-500;
$input-padding-y: .5rem !default;
$input-disabled-bg: $gray-50 !default;
$input-focus-border-color: $blue !default;
+$input-box-shadow: none !default;
+$btn-box-shadow: $input-box-shadow !default;
$custom-select-disabled-bg: $gray-50 !default;
$text-muted: $gray-400 !default;
@@ -112,6 +113,11 @@ $box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1),0 2px 4px -1px rgba(0, 0, 0, 0.06
$box-shadow-xs: rgba(43, 34, 51, 0.04) 0px 1px 2px !default;
$box-shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;
+$card-border-width: 0px !default;
+$card-box-shadow: 0 0 0 1px $card-border-color, 0 1px 2px 0 rgba(0, 0, 0, 0.05) !default;
+$card-bg: $white !default;
+$card-border-radius: $border-radius-lg !default;
+
$tooltip-border-radius: $border-radius !default;
$tooltip-opacity: 1 !default;
$tooltip-margin: 0.25rem 0 !default;
@@ -162,10 +168,10 @@ $dropdown-box-shadow: rgba(209, 217, 224, 0.8) 0px 0px 0px 1px, rgba(37, 41,
$dropdown-padding-x: 0.25rem !default;
$dropdown-padding-y: 0.25rem !default;
$dropdown-divider-bg: $gray-50 !default;
-$dropdown-divider-margin-y: 0.5rem !default;
+$dropdown-divider-margin-y: 0.25rem !default;
$dropdown-header-color: $gray-500 !default;
-$modal-backdrop-bg: $white !default;
+$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;
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index 0c5c9a211c..73ebccde38 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -672,7 +672,6 @@ div.uppy-Root {
border-bottom-right-radius: $border-radius-lg;
}
-
.turbo-progress-bar {
background-color: theme-color('blue');
}
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
index 5d1868f320..9acd105237 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
@@ -1,6 +1,6 @@
.custom-checkbox .custom-control-label::before {
border-radius: 0.25rem !important;
- border-color: $gray-200;
+ border-color: $input-border-color;
}
label {
@@ -27,6 +27,7 @@ label {
}
.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;
transition-duration: 0.2s;