Skip to content

Commit 39e0f16

Browse files
authored
Merge pull request #29 from moiSentineL/fonts
font revamp
2 parents 2eaf36a + bcec035 commit 39e0f16

File tree

4 files changed

+37
-11
lines changed

4 files changed

+37
-11
lines changed

src/_layouts/base.njk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@
4141
href="https://unpkg.com/littlefoot/dist/littlefoot.css"
4242
/> #}
4343
<link rel="stylesheet" href="/css/css.css">
44-
<link rel="preload" href="/css/IBMPlexMono-Regular.ttf" as="font" crossorigin>
44+
{# <link rel="preload" href="/css/IBMPlexMono-Regular.ttf" as="font" crossorigin> #}
45+
46+
<link rel="preconnect" href="https://fonts.googleapis.com">
47+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
48+
{# <link href="https://fonts.googleapis.com/css2?family=Recursive:wght,[email protected],0.5&display=swap" rel="stylesheet"> #}
49+
<link href="https://fonts.googleapis.com/css2?family=Manrope:[email protected]&display=swap" rel="stylesheet">
50+
<link href="https://fonts.googleapis.com/css2?family=Playfair+Display:ital,wght@0,400..900;1,400..900&display=swap" rel="stylesheet">
4551

4652
<link rel="dns-prefetch" href="https://www.googletagmanager.com">
4753
<link rel="dns-prefetch" href="https://www.google-analytics.com">

src/_layouts/homebase.njk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
<meta name="theme-color" content="#000000">
3232

3333
<link rel="stylesheet" href="/css/home.css">
34-
<link rel="preload" href="/css/IBMPlexMono-Regular.ttf" as="font" crossorigin>
34+
{# <link rel="preload" href="/css/IBMPlexMono-Regular.ttf" as="font" crossorigin> #}
35+
36+
<link rel="preconnect" href="https://fonts.googleapis.com">
37+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
3538

3639
<link rel="dns-prefetch" href="https://www.googletagmanager.com">
3740
<link rel="dns-prefetch" href="https://www.google-analytics.com">

src/styles/css.scss

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
font-display: swap;
55
}
66

7-
@font-face {
8-
font-family: Recursive;
9-
src: url("https://fonts.googleapis.com/css2?family=Recursive:wght,[email protected],0.5&display=swap");
10-
}
7+
// @import url('https://fonts.googleapis.com/css2?family=Recursive:CRSV,MONO@1,0.75&display=swap');
8+
9+
@import url('https://fonts.googleapis.com/css2?family=Inconsolata:wdth,wght@90,200..900;100,200..900&display=swap');
10+
11+
1112

1213
$transwhite: #e0e0e0;
1314
$pale-azure: #70d6ffff;
@@ -39,8 +40,8 @@ html {
3940
justify-content: center;
4041
margin: auto;
4142
line-height: 1.5;
42-
font-size: 1.3em;
43-
font-family: Recursive, monospace;
43+
font-size: 1.2em;
44+
font-family: Inconsolata, monospace;
4445
}
4546

4647
.excerpt {
@@ -116,6 +117,15 @@ mjx-container {
116117
}
117118
pre,
118119
code {
120+
}
121+
}
122+
123+
@include theme(light) {
124+
html {
125+
color: black;
126+
}
127+
::selection {
128+
background: #c8fffd;
119129
background: #e0e0e0;
120130
}
121131
blockquote {
@@ -170,6 +180,8 @@ h3,
170180
h4,
171181
h5,
172182
h6 {
183+
font-family: Inconsolata;
184+
font-variation-settings: "wdth" 90;
173185
margin: 1em 0 0.5em;
174186
}
175187
.title {
@@ -196,10 +208,14 @@ ol {
196208
padding-right: 0.5em;
197209

198210
@include theme(light) {
199-
box-shadow: 0px 3px 0px black, 4px 0px 0px 0px black;
211+
box-shadow:
212+
0px 3px 0px black,
213+
4px 0px 0px 0px black;
200214
}
201215
@include theme(dark) {
202-
box-shadow: 0px 3px 0px #e0e0e0, 4px 0px 0px 0px #e0e0e0;
216+
box-shadow:
217+
0px 3px 0px #e0e0e0,
218+
4px 0px 0px 0px #e0e0e0;
203219
}
204220
}
205221

src/styles/home.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
font-display: swap;
55
}
66

7+
78
@font-face {
89
font-family: Recursive;
910
src: url('https://fonts.googleapis.com/css2?family=Recursive:wght,[email protected],0.5&display=swap')
@@ -16,7 +17,7 @@ html {
1617
justify-content: center;
1718
margin: auto;
1819
line-height: 1.6;
19-
font-size: 1.3em;
20+
font-size: 1.1em;
2021
font-family: Recursive, monospace;
2122
align-items: center;
2223
}

0 commit comments

Comments
 (0)