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 typography fixes

Damian Legawiec5c33a412613e
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss b/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss
index 3216dd9642..dd7f3860d5 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_alerts.scss
@@ -17,7 +17,7 @@
}
a {
- font-weight: $font-weight-bold;
+ font-weight: $font-weight-medium;
color: theme-color('primary');
}
}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss b/admin/app/assets/stylesheets/spree/admin/components/_cards.scss
index 91799c349d..3be9f14013 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_cards.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_cards.scss
@@ -51,7 +51,6 @@
.card-title {
margin-bottom: 0;
font-size: $font-size-plus;
- font-weight: $font-weight-bold;
font-family: $font-family-sans-serif;
}
}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss b/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss
index 9b3d41adc0..5908ff8861 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_dialogs.scss
@@ -150,7 +150,7 @@ dialog:open {
.dialog-title {
margin-bottom: 0;
- font-weight: $font-weight-bold;
+ font-weight: $font-weight-medium;
}
.alerts-container {
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
index da6f41823d..12bcc4c89b 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
@@ -26,14 +26,14 @@
box-shadow: $dropdown-box-shadow;
.dropdown-item, .dropdown-header {
- padding-top: $input-btn-padding-y;
- padding-bottom: $input-btn-padding-y;
- padding-left: 0.65rem;
- padding-right: 0.65rem;
+ padding-top: $dropdown-item-padding-y;
+ padding-bottom: $dropdown-item-padding-y;
+ padding-left: $dropdown-item-padding-x;
+ padding-right: $dropdown-item-padding-x;
}
.dropdown-header {
- padding-left: 0.65rem;
- padding-right: 0.5rem;
+ margin-bottom: 0.25rem;
+ margin-top: 0.25rem;
}
.dropdown-item {
@@ -43,8 +43,6 @@
align-items: center;
justify-content: flex-start;
background: transparent;
- padding-top: 0.45rem;
- padding-bottom: 0.45rem;
transition-property: background-color, color;
transition-duration: 0.01s;
@@ -93,6 +91,7 @@
}
.dropdown-header {
font-weight: $font-weight-base;
+ font-size: $font-size-base;
}
.dropdown-item:last-child {
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss b/admin/app/assets/stylesheets/spree/admin/components/_filters.scss
index 996808eff3..595d724a74 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_filters.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_filters.scss
@@ -1,7 +1,7 @@
.filter-wrap {
- padding: 0.5rem;
+ padding: 0.55rem;
border-bottom: 1px solid $table-border-color;
- gap: 0.5rem;
+ gap: 0.55rem;
position: sticky;
top: $header-height;
z-index: 1000;
@@ -69,7 +69,7 @@ i.js-delete-filter {
}
&.asc, &.desc {
- font-weight: $font-weight-bold;
+ font-weight: $font-weight-medium;
svg {
color: $gray-600 !important;
}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
index bab64357a3..d8c0513d57 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
@@ -184,7 +184,7 @@
color: theme-color('primary');
background-color: $white;
box-shadow: rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0) 0px 0px 0px 0px, rgba(0, 0, 0, 0.04) 0px 0px 0px 1px, rgba(0, 0, 0, 0.04) 0px 1px 2px -1px, rgba(0, 0, 0, 0.02) 0px 2px 4px 0px;
- font-weight: 500;
+ font-weight: $font-weight-medium;
.ti {
background-color: theme-color('primary');
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
index feb3acf13d..0eea2bbd36 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
@@ -18,7 +18,7 @@ body.modal-open {
.modal-title {
margin-bottom: 0;
- font-weight: $font-weight-bold;
+ font-weight: $font-weight-medium;
}
.btn-close {
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
index 4a50176632..2c7b6a012a 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss
@@ -35,11 +35,11 @@ table.table {
th {
background-color: $light;
@extend .text-muted;
- font-size: $font-size-sm;
+ font-size: $font-size-base;
font-weight: $font-weight-normal;
vertical-align: middle;
- padding-top: 0.3rem;
- padding-bottom: 0.3rem;
+ padding-top: 0.45rem;
+ padding-bottom: 0.45rem;
}
th:first-child {
border-top-left-radius: $card-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 7a1b13d1cb..391f51dc56 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_variants_form.scss
@@ -32,7 +32,7 @@
.label {
margin-bottom: 0.5rem;
- font-weight: 500;
+ font-weight: $font-weight-medium;
display: inline-block;
}
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index aaf82c5199..d79e5f904a 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -60,12 +60,13 @@ $body-bg: $white !default;
$enable-shadows: false;
$enable-responsive-font-sizes: true;
$font-family-sans-serif: Inter, sans-serif !default;
-$font-size-base: 0.813rem !default;
+$font-size-base: 0.8125rem !default;
$font-size-plus: 0.875rem !default;
$font-size-sm: 0.75rem !default;
$font-size-lg: 1rem !default;
$font-weight-normal: 400 !default;
-$font-weight-bold: 600 !default;
+$font-weight-medium: 500 !default;
+$font-weight-bold: 600 !default;
$headings-font-family: $font-family-sans-serif;
$line-height-base: 1.5 !default;
$border-radius: 0.5rem !default;
@@ -112,7 +113,7 @@ $box-shadow-lg: rgba(0, 5, 13, 0.5) 0px 4px 8px 2px;
$input-box-shadow: $box-shadow-xs !default;
$btn-box-shadow: $input-box-shadow !default;
-$btn-font-weight: 500 !default;
+$btn-font-weight: $font-weight-medium !default;
$card-border-width: 1px !default;
$card-bg: $white !default;
@@ -173,6 +174,9 @@ $dropdown-padding-y: 0.25rem !default;
$dropdown-divider-bg: $gray-50 !default;
$dropdown-divider-margin-y: 0.25rem !default;
$dropdown-header-color: $text-muted !default;
+$dropdown-item-padding-y: 0.45rem !default;
+$dropdown-item-padding-x: 0.65rem !default;
+
$zindex-dropdown: 1050;
$modal-backdrop-bg: $body-bg !default;
@@ -218,7 +222,7 @@ $list-group-bg: transparent !default;
$list-group-item-padding-x: 1rem !default;
$header-bg: $body-bg !default;
-$header-height: 60px !default;
+$header-height: 54px !default;
$sidebar-width: 220px !default;
$sidebar-bg: $light !default;
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index ad958097a1..d19e1307fc 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -2,6 +2,8 @@
html {
min-height: 100%;
letter-spacing: normal;
+ text-rendering: optimizeLegibility;
+ text-size-adjust: 100%;
}
body {
@extend .h-100;
@@ -23,7 +25,7 @@ strong {
}
.font-weight-semibold {
- font-weight: 500 !important;
+ font-weight: $font-weight-medium !important;
}
.text-size-lg, .font-size-lg {
@@ -517,7 +519,7 @@ turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {
@extend .rounded-pill;
@extend .text-uppercase;
font-size: 0.875rem;
- font-weight: 500;
+ font-weight: $font-weight-medium;
padding: 5px 16px ;
letter-spacing: 2.24px;
border: 1px solid $gray-200;
@@ -685,7 +687,7 @@ div.uppy-Root {
background-color: $gray-200;
color: $gray-500;
font-size: $font-size-base;
- font-weight: 500;
+ font-weight: $font-weight-medium;
display: flex;
align-items: center;
justify-content: center;
@@ -695,6 +697,7 @@ div.uppy-Root {
gap: 0.5rem;
align-items: center;
color: $text-muted;
+ font-weight: $font-weight-medium;
li {
a {
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
index 2718863fbb..43c5dddf2f 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
@@ -4,7 +4,7 @@
}
label {
- font-weight: 500;
+ font-weight: $font-weight-medium;
font-size: 100%;
&:hover {
diff --git a/admin/app/views/spree/admin/imports/show.html.erb b/admin/app/views/spree/admin/imports/show.html.erb
index 8fc7b6ed0a..5b12af3f5c 100644
--- a/admin/app/views/spree/admin/imports/show.html.erb
+++ b/admin/app/views/spree/admin/imports/show.html.erb
@@ -9,7 +9,7 @@
<% end %>
<% if @import.status == 'mapping' %>
- <div class="d-flex justify-content-between align-items-center bg-light border-top border-bottom text-muted mt-3 sticky-top font-size-sm">
+ <div class="d-flex justify-content-between align-items-center bg-light border-top border-bottom text-muted mt-3 sticky-top">
<div class="w-10 p-2 text-center">
<%= Spree.t('admin.imports.field_required') %>
</div>
@@ -30,7 +30,7 @@
<%= turbo_stream_from "import_#{@import.id}_footer" %>
<%= turbo_stream_from "import_#{@import.id}_loader" %>
- <div class="d-flex justify-content-between align-items-center bg-light border-top border-bottom text-muted mt-3 sticky-top font-size-sm">
+ <div class="d-flex justify-content-between align-items-center bg-light border-top border-bottom text-muted mt-3 sticky-top">
<div class="w-10 p-2 text-center">
<%= I18n.t('activerecord.attributes.spree/import_row.row_number') %>
</div>
diff --git a/admin/app/views/spree/admin/shared/_index_table_options.html.erb b/admin/app/views/spree/admin/shared/_index_table_options.html.erb
index 6f469617bc..d5a2d3b14f 100644
--- a/admin/app/views/spree/admin/shared/_index_table_options.html.erb
+++ b/admin/app/views/spree/admin/shared/_index_table_options.html.erb
@@ -11,7 +11,7 @@
<div class="col-6 col-lg-3">
<%= per_page_dropdown %>
</div>
- <div class="d-none d-lg-block col-lg-6 text-center text-muted small">
+ <div class="d-none d-lg-block col-lg-6 text-center text-muted">
<%= page_entries_info(collection, entry_name: entry_name) %>
</div>
<div class="col-6 col-lg-3 text-right pr-lg-2">