Skip to content

Commit c10a594

Browse files
committed
docs 增加 fonts
1 parent ae885b6 commit c10a594

File tree

6 files changed

+49
-21
lines changed

6 files changed

+49
-21
lines changed

dist/acss-helper.css

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ html {
4141
/* 1 */
4242
line-height: 1.5;
4343
/* 2 */
44+
margin: 0;
45+
}
46+
47+
body {
48+
margin: 0;
4449
}
4550

4651
*,
@@ -2666,27 +2671,27 @@ video {
26662671
}
26672672

26682673
.text-xl {
2669-
font-size: 4rem;
2674+
font-size: 1.25rem;
26702675
}
26712676

26722677
.text-2xl {
2673-
font-size: 3rem;
2678+
font-size: 1.5rem;
26742679
}
26752680

26762681
.text-3xl {
2677-
font-size: 2.25rem;
2682+
font-size: 1.875rem;
26782683
}
26792684

26802685
.text-4xl {
2681-
font-size: 1.875rem;
2686+
font-size: 2.25rem;
26822687
}
26832688

26842689
.text-5xl {
2685-
font-size: 1.5rem;
2690+
font-size: 3rem;
26862691
}
26872692

26882693
.text-6xl {
2689-
font-size: 1.25rem;
2694+
font-size: 4rem;
26902695
}
26912696

26922697
.font-hairline {

docs/css/acss-helper.css

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ html {
4141
/* 1 */
4242
line-height: 1.5;
4343
/* 2 */
44+
margin: 0;
45+
}
46+
47+
body {
48+
margin: 0;
4449
}
4550

4651
*,
@@ -2666,27 +2671,27 @@ video {
26662671
}
26672672

26682673
.text-xl {
2669-
font-size: 4rem;
2674+
font-size: 1.25rem;
26702675
}
26712676

26722677
.text-2xl {
2673-
font-size: 3rem;
2678+
font-size: 1.5rem;
26742679
}
26752680

26762681
.text-3xl {
2677-
font-size: 2.25rem;
2682+
font-size: 1.875rem;
26782683
}
26792684

26802685
.text-4xl {
2681-
font-size: 1.875rem;
2686+
font-size: 2.25rem;
26822687
}
26832688

26842689
.text-5xl {
2685-
font-size: 1.5rem;
2690+
font-size: 3rem;
26862691
}
26872692

26882693
.text-6xl {
2689-
font-size: 1.25rem;
2694+
font-size: 4rem;
26902695
}
26912696

26922697
.font-hairline {

docs/index.html

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,22 @@ <h2 id="paddings" class="border-b-1 border-b-solid border-gray-200 py-5 font-bol
8585
</div>
8686
</div>
8787

88+
<!-- Font -->
89+
<h2 id="font" class="border-b-1 border-b-solid border-gray-200 py-5 font-bold">Font</h2>
90+
<div class="row pt-5">
91+
<div class="col-12 mb-5">
92+
<div v-for="item in fonts">
93+
<div :class="`text-${item}`">
94+
<p>text-{{item}}</p>
95+
<div>和我一起用ACSS搭建页面</div>
96+
</div>
97+
</div>
98+
</div>
99+
</div>
100+
88101
</div>
89102
<div class="sidebar col-3">
90-
<h3 class="font-bold pl-2 text-xl mt-5">Category</h3>
103+
<h3 class="font-bold pl-2 text-2xl mt-5">Category</h3>
91104
<ul>
92105
<li v-for="item in menus" class="p-2 border-b border-gray-200">
93106
<a :href="`#${item.toLowerCase()}`">{{item}}</a>
@@ -232,7 +245,8 @@ <h3 class="font-bold pl-2 text-xl mt-5">Category</h3>
232245
}
233246
},
234247
paddings: ['pt-8', 'pr-8', 'pb-8', 'pl-8', 'px-8', 'py-8'],
235-
margins: ['mt-8', 'mr-8', 'mb-8', 'ml-8', 'mx-8', 'my-8']
248+
margins: ['mt-8', 'mr-8', 'mb-8', 'ml-8', 'mx-8', 'my-8'],
249+
fonts: ['xs', 'sm', 'base', 'lg', 'xl', '2xl', '3xl', '4xl', '5xl', '6xl']
236250
}
237251
})
238252
</script>

src/_resize.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ ul {
4444
html {
4545
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; /* 1 */
4646
line-height: 1.5; /* 2 */
47+
margin: 0
48+
}
49+
body {
50+
margin: 0
4751
}
4852

4953

src/_typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
}
2121

22-
// color
22+
// font - color
2323
@each $colorListKey, $colorListVal in $font-colors {
2424
.text-#{$colorListKey}{
2525
color: $colorListKey;

src/_variables.scss

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ $font-size: (
209209
sm: 0.875rem,
210210
base: 1rem,
211211
lg: 1.125rem,
212-
xl: 4rem,
213-
'2xl': 3rem,
214-
'3xl': 2.25rem,
215-
'4xl': 1.875rem,
216-
'5xl': 1.5rem,
217-
'6xl': 1.25rem,
212+
xl: 1.25rem,
213+
'2xl': 1.5rem,
214+
'3xl': 1.875rem,
215+
'4xl': 2.25rem,
216+
'5xl': 3rem,
217+
'6xl': 4rem,
218218
);
219219

220220
$font-weight: (

0 commit comments

Comments
 (0)