Skip to content

Commit 87b2d3c

Browse files
committed
fonts sorted
1 parent 0c58cfd commit 87b2d3c

File tree

3 files changed

+65
-64
lines changed

3 files changed

+65
-64
lines changed

sass/styles/settings/settings.color.scss

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,20 @@ $dark-grey-list: #999;
167167
$light-grey-list: #f3f3f3;
168168
$white-list: #fff;
169169

170+
//Border Card
171+
$border-card-border-color: #e8e8e8;
172+
173+
//Tags
174+
$tag-dashed-border-color: $salmon;
175+
$tag-dashed-text-color: $salmon;
176+
177+
//Pills
178+
$pill-dashed-border-color: $salmon;
179+
$pill-dashed-text-color: $salmon;
180+
181+
//Form Input
182+
$input-text-background-color: $hover-grey;
183+
170184
//Background Colors
171185
$bg-color-list: (
172186
"orange": $orange,
@@ -234,17 +248,3 @@ $gradient-map: (
234248
hi-purple: $hi-gradient-purple-lr,
235249
violet-bt: linear-gradient(to top, #692fdc, #452ba3),
236250
);
237-
238-
//Border Card
239-
$border-card-border-color: #e8e8e8;
240-
241-
//Tags
242-
$tag-dashed-border-color: $salmon;
243-
$tag-dashed-text-color: $salmon;
244-
245-
//Pills
246-
$pill-dashed-border-color: $salmon;
247-
$pill-dashed-text-color: $salmon;
248-
249-
//Form Input
250-
$input-text-background-color: $hover-grey;

sass/styles/settings/settings.font.scss

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,55 @@ $bold: 700;
88
$extra-bold: 800;
99

1010
//Size
11-
12-
$font-xs: 1rem; // 14px
13-
$font-sm: 1.143rem; // 16px
14-
$font-mds: 1.286rem; // 18px
15-
$font-md: 1.428rem; // 20px
16-
$font-lg: 1.57rem; // 22px
17-
$font-xl: 1.713rem; // 24px
11+
$font-xs: 1rem; // 14px
12+
$font-sm: 1.143rem; // 16px
13+
$font-mds: 1.286rem; // 18px
14+
$font-md: 1.428rem; // 20px
15+
$font-lg: 1.57rem; // 22px
16+
$font-xl: 1.713rem; // 24px
1817
$font-mdxl: 2.286rem; // 32px
1918

20-
$font-xxl: 3.214rem; // 45px
19+
$font-xxl: 3.214rem; // 45px
2120

22-
$card-md: 0.875rem; // 12px
23-
$card-mds: 0.812rem; // 11px
24-
$card-sm: 0.75rem; // 10px
25-
$card-sms: 0.625rem; // 9px
26-
$card-xs: 0.5rem; // 7px
21+
$card-md: 0.875rem; // 12px
22+
$card-mds: 0.812rem; // 11px
23+
$card-sm: 0.75rem; // 10px
24+
$card-sms: 0.625rem; // 9px
25+
$card-xs: 0.5rem; // 7px
2726

2827
@font-face {
29-
font-family: 'Muli';
30-
src: url('https://unpkg.com/@coding-blocks/motley@1.0.1/dist/font/Muli.ttf');
28+
font-family: "Muli";
29+
src: url("https://unpkg.com/@coding-blocks/motley@1.0.1/dist/font/Muli.ttf");
3130
}
3231

3332
@font-face {
34-
font-family: 'Muli';
33+
font-family: "Muli";
3534
font-style: italic;
36-
src: url('https://unpkg.com/@coding-blocks/motley@1.0.1/dist/font/Muli-Italic.ttf');
35+
src: url("https://unpkg.com/@coding-blocks/motley@1.0.1/dist/font/Muli-Italic.ttf");
3736
}
37+
38+
$text-size-list: (
39+
"font-xs": $font-xs,
40+
"font-sm": $font-sm,
41+
"font-mds": $font-mds,
42+
"font-md": $font-md,
43+
"font-lg": $font-lg,
44+
"font-xl": $font-xl,
45+
"font-mdxl": $font-mdxl,
46+
"font-xxl": $font-xxl,
47+
"card-md": $card-md,
48+
"card-mds": $card-mds,
49+
"card-sm": $card-sm,
50+
"card-sms": $card-sms,
51+
"card-xs": $card-xs,
52+
);
53+
54+
$text-weight-list: (
55+
"light": $light,
56+
"normal": $font-normal,
57+
"medium": $font-medium,
58+
"regular": $regular,
59+
"semi-bold": $semi-bold,
60+
"bold": $bold,
61+
"extra-bold": $extra-bold,
62+
);

sass/styles/utilities/font.scss

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,18 @@
1-
// FONT SIZE
2-
3-
$list: (font-xs, $font-xs) (font-sm, $font-sm) (font-mds, $font-mds) (font-md, $font-md) (font-lg, $font-lg)
4-
(font-xl, $font-xl) (font-mdxl, $font-mdxl) (font-xxl, $font-xxl) (card-md, $card-md) (card-mds, $card-mds)
5-
(card-sm, $card-sm) (card-sms, $card-sms) (card-xs, $card-xs);
6-
7-
@each $type, $size in $list {
1+
// Font Size
2+
@each $type, $size in $text-size-list {
83
.#{$type} {
94
font-size: $size !important;
105
}
116
}
127

13-
// FONT STYLE
8+
// Font Weight
9+
@each $type, $weight in $text-weight-list {
10+
.#{$type} {
11+
font-weight: $weight !important;
12+
}
13+
}
1414

15+
// Font Style
1516
.i {
1617
font-style: italic !important;
1718
}
18-
19-
.normal {
20-
font-weight: $font-normal !important;
21-
}
22-
23-
// FONT WEIGHT
24-
.light {
25-
font-weight: $light !important;
26-
}
27-
28-
.regular {
29-
font-weight: $regular !important;
30-
}
31-
32-
.semi-bold {
33-
font-weight: $semi-bold !important;
34-
}
35-
36-
.bold {
37-
font-weight: $bold !important;
38-
}
39-
40-
.extra-bold {
41-
font-weight: $extra-bold !important;
42-
}

0 commit comments

Comments
 (0)