Skip to content

Commit c30fad7

Browse files
authored
fix: issues for fonts and icons (#141)
* fix: issues for fonts and icons
1 parent 465c73a commit c30fad7

File tree

3 files changed

+38
-8
lines changed

3 files changed

+38
-8
lines changed

scripts/scss-typography-generator.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,12 @@ ${utility ? '.' : '%'}${prefix}-${scale}-${textType}-${getShortSize(size)}{
7171
--db-base-icon-font-size: #{$${prefix}-typography-${scale}-mobile-${textType}-${size}-font-size};
7272
--db-base-icon-font-family: #{get-icon-family($${prefix}-typography-${scale}-mobile-${textType}-${size}-font-size,
7373
$${prefix}-typography-${scale}-mobile-${textType}-${size}-line-height)};
74+
--db-type-body-font-size-${getShortSize(
75+
size
76+
)}: #{$${prefix}-typography-${scale}-mobile-${textType}-${size}-font-size};
77+
--db-type-body-line-height-${getShortSize(
78+
size
79+
)}: #{$${prefix}-typography-${scale}-mobile-${textType}-${size}-line-height};
7480
`;
7581
}
7682

@@ -83,6 +89,12 @@ ${utility ? '.' : '%'}${prefix}-${scale}-${textType}-${getShortSize(size)}{
8389
--db-base-icon-font-size: #{$${prefix}-typography-${scale}-tablet-${textType}-${size}-font-size};
8490
--db-base-icon-font-family: #{get-icon-family($${prefix}-typography-${scale}-tablet-${textType}-${size}-font-size,
8591
$${prefix}-typography-${scale}-tablet-${textType}-${size}-line-height)};
92+
--db-type-body-font-size-${getShortSize(
93+
size
94+
)}: #{$${prefix}-typography-${scale}-tablet-${textType}-${size}-font-size};
95+
--db-type-body-line-height-${getShortSize(
96+
size
97+
)}: #{$${prefix}-typography-${scale}-tablet-${textType}-${size}-line-height};
8698
`;
8799
}
88100

@@ -97,6 +109,12 @@ ${utility ? '.' : '%'}${prefix}-${scale}-${textType}-${getShortSize(size)}{
97109
--db-base-icon-font-size: #{$${prefix}-typography-${scale}-desktop-${textType}-${size}-font-size};
98110
--db-base-icon-font-family: #{get-icon-family($${prefix}-typography-${scale}-desktop-${textType}-${size}-font-size,
99111
$${prefix}-typography-${scale}-desktop-${textType}-${size}-line-height)};
112+
--db-type-body-font-size-${getShortSize(
113+
size
114+
)}: #{$${prefix}-typography-${scale}-desktop-${textType}-${size}-font-size};
115+
--db-type-body-line-height-${getShortSize(
116+
size
117+
)}: #{$${prefix}-typography-${scale}-desktop-${textType}-${size}-line-height};
100118
`;
101119
}
102120

scss/_variables.global.scss

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ $db-spacing-responsive-md: var(--db-spacing-responsive-md);
1717
$db-spacing-responsive-lg: var(--db-spacing-responsive-lg);
1818
$db-spacing-responsive-xl: var(--db-spacing-responsive-xl);
1919

20-
$db-type-font-size-lg: var(--db-type-body-lg);
21-
$db-type-font-size-md: var(--db-type-body-md);
22-
$db-type-font-size-sm: var(--db-type-body-sm);
20+
$db-type-font-size-2xl: var(--db-type-body-font-size-2xl);
21+
$db-type-font-size-xl: var(--db-type-body-font-size-xl);
22+
$db-type-font-size-lg: var(--db-type-body-font-size-lg);
23+
$db-type-font-size-md: var(--db-type-body-font-size-md);
24+
$db-type-font-size-sm: var(--db-type-body-font-size-sm);
25+
$db-type-font-size-xs: var(--db-type-body-font-size-xs);
26+
$db-type-font-size-2xs: var(--db-type-body-font-size-2xs);
27+
28+
$db-type-line-height-2xl: var(--db-type-body-line-height-2xl);
29+
$db-type-line-height-xl: var(--db-type-body-line-height-xl);
30+
$db-type-line-height-lg: var(--db-type-body-line-height-lg);
31+
$db-type-line-height-md: var(--db-type-body-line-height-md);
32+
$db-type-line-height-sm: var(--db-type-body-line-height-sm);
33+
$db-type-line-height-xs: var(--db-type-body-line-height-xs);
34+
$db-type-line-height-2xs: var(--db-type-body-line-height-2xs);

scss/icon/_icon-family-calc.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ $all-icon-sizes: (
1515
$icon-size: (math.div($font-size, 1rem) * 16 * $line-height);
1616
$valid-sizes: "";
1717

18-
@if ($icon-size<18) {
18+
@if ($icon-size<20) {
1919
$valid-sizes: append($valid-sizes, map.get($all-icon-sizes, 16));
2020
}
21-
@if ($icon-size<22) {
21+
@if ($icon-size<24) {
2222
$valid-sizes: append($valid-sizes, map.get($all-icon-sizes, 20));
2323
}
24-
@if ($icon-size<28) {
24+
@if ($icon-size<32) {
2525
$valid-sizes: append($valid-sizes, map.get($all-icon-sizes, 24));
2626
}
27-
@if ($icon-size<40) {
27+
@if ($icon-size<48) {
2828
$valid-sizes: append($valid-sizes, map.get($all-icon-sizes, 32));
2929
}
30-
@if ($icon-size<56) {
30+
@if ($icon-size<64) {
3131
$valid-sizes: append($valid-sizes, map.get($all-icon-sizes, 48));
3232
}
3333
$valid-sizes: append($valid-sizes, map.get($all-icon-sizes, 64));

0 commit comments

Comments
 (0)