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.

Cleanup SASS variables

Damian Legawiec727daa858345
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
index 22e42ba247..f733654d53 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
@@ -176,6 +176,7 @@ button[disabled] .show-when-enabled { display: none; }
.btn-clipboard {
@extend .btn-light;
+ @extend .btn-sm;
@extend .px-1;
@extend .ml-2;
@extend .font-size-sm;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
index 46d31dcd1a..b56a7d8a31 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
@@ -14,6 +14,7 @@ body.modal-open {
.modal-header {
@extend .align-items-center;
+ border-color: $gray-50;
.modal-title {
margin-bottom: 0;
@@ -28,7 +29,7 @@ body.modal-open {
justify-content: end;
padding: $modal-inner-padding;
background-color: $gray-25;
- border-top: 1px solid $border-color;
+ border-top: 1px solid $gray-50;
.btn {
display: inline-flex ;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
index 3329eda3b2..7ef0fc6ed5 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
@@ -205,3 +205,9 @@ td.actions {
}
}
}
+
+.pagination-container {
+ border-top: 1px solid $gray-50;
+ padding-top: 0.5rem;
+ padding-bottom: 0.5rem;
+}
\ No newline at end of file
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 90df27e962..4ad5b7479c 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss
@@ -181,7 +181,7 @@
display: flex;
gap: 0.25rem;
- border-bottom: 1px solid $border-color;
+ border-bottom: 1px solid $table-border-color;
&.nested {
.column-checkbox,
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index dafd1219f4..8d0c6ddd2c 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -1,8 +1,8 @@
// https://github.com/twbs/bootstrap/blob/v4.6.2/scss/_variables.scss
-$gray-25: #FAFAFA;
+$gray-25: #F8F8F9;
$gray-50: #F3F3F3;
-$gray-100: #EAEAEA !default;
+$gray-100: #E3E3E3 !default;
$gray-200: #D5D5D5 !default;
$gray-300: #B3B3B3 !default;
$gray-400: #999999 !default;
@@ -81,7 +81,7 @@ $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;
+$table-border-color: $gray-50 !default;
$card-border-color: $border-color !default;
$input-btn-focus-width: 0.18rem !default;
diff --git a/admin/app/views/spree/admin/variants/form/_inventory.html.erb b/admin/app/views/spree/admin/variants/form/_inventory.html.erb
index 2201aa36bc..94ab69074c 100644
--- a/admin/app/views/spree/admin/variants/form/_inventory.html.erb
+++ b/admin/app/views/spree/admin/variants/form/_inventory.html.erb
@@ -38,7 +38,7 @@
<% end %>
</tbody>
</table>
- <div class="card-footer border-toptext-center bg-gray-25 text-muted">
+ <div class="card-footer border-top text-center bg-gray-25 text-muted">
<%= Spree.t('admin.variants_form.stock_locations_link', link: spree.admin_stock_locations_path).html_safe %>
</div>
</div>