Skip to content

Commit 0828219

Browse files
committed
Added alternative font
1 parent 9452f66 commit 0828219

File tree

9 files changed

+21
-11
lines changed

9 files changed

+21
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"private": true,
33
"name": "website-frontend",
44
"description": "My website's frontend.",
5-
"version": "3.0.3",
5+
"version": "3.0.4",
66
"license": "UNLICENSED",
77
"author": "Steven Vachon <[email protected]> (https://svachon.com)",
88
"repository": "github:stevenvachon/website-frontend",

src/layouts/main.njk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
<link rel="icon" href="/images/favicon.png" type="image/png">
3030
<link rel="icon" href="/images/favicon.svg" type="image/svg+xml">
3131
<link rel="license" href="//creativecommons.org/licenses/by-nc-nd/4.0/deed.en">
32+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
33+
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Merriweather+Sans:ital,wght@0,300..800;1,300..800&display=swap">
3234
<link rel="stylesheet" href="/styles.css" media="screen">
3335
<script src="/scripts.js"></script>
3436
{% if 'blog-post' in (tags or []) %}

src/styles/blog-post.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@
2323

2424
.-blog-post--title {
2525
color: var(--yellow);
26+
font-family: var(--alternative-font);
2627
font-size: 1.5rem;
27-
font-weight: bold;
28-
font-variant: small-caps;
28+
font-style: italic;
29+
font-weight: 800;
30+
text-transform: uppercase;
2931

3032
a:any-link {
3133
text-decoration: underline;

src/styles/blog.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
var(--site-padding);
3838

3939
.-blog--secondary-organizing-title {
40+
font-family: var(--alternative-font);
41+
font-weight: 800;
4042
margin-bottom: 2rem;
4143
text-transform: uppercase;
4244
}

src/styles/btn.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
box-shadow: 0 0 var(--blue-glow-size) 0 var(--blue-glow-off);
99
color: var(--yellow);
1010
cursor: pointer;
11+
font-family: var(--alternative-font);
1112
font-size: var(--btn-font-size);
1213
font-style: inherit;
13-
font-weight: bold;
14+
font-weight: 800;
1415
letter-spacing: 0.025em; // Relative size
1516
padding: var(--btn-padding);
1617
padding-right: var(--btn-padding-italic-space);

src/styles/contact.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@
127127
var(--overlay-shadow-offset) var(----overlay-shadow-blur);
128128
box-sizing: border-box;
129129
color: var(--yellow);
130+
font-family: var(--alternative-font);
130131
font-size: 1.5rem;
131-
font-weight: bold;
132+
font-weight: 800;
132133
left: 50%;
133134
min-height: calc(
134135
1em + (var(--padding) * 2)

src/styles/content.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,11 @@
9797
h5,
9898
h6 {
9999
color: var(--yellow);
100-
font-variant: small-caps;
101-
font-weight: bold;
100+
font-family: var(--alternative-font);
101+
font-style: italic;
102+
font-weight: 800;
102103
margin-bottom: 0.7rem;
104+
text-transform: uppercase;
103105
}
104106

105107
h2 {

src/styles/header.scss

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
&::after {
2525
color: var(--medium-grey);
2626
content: 'Home' / '';
27-
font-family: var(--body-font);
2827
font-size: 0.65rem;
2928
font-weight: normal;
3029
left: 100%;
@@ -81,8 +80,10 @@
8180
}
8281

8382
.-header--nav-main {
83+
font-family: var(--alternative-font);
8484
order: 1; // Display last
8585
position: relative; // For pseudo-element
86+
text-transform: uppercase;
8687

8788
&::before {
8889
background-image: linear-gradient(
@@ -99,7 +100,6 @@
99100
padding: var(--btn-padding);
100101
padding-right: var(--btn-padding-italic-space);
101102
text-shadow: none;
102-
text-transform: uppercase;
103103
}
104104

105105
ul {
@@ -125,8 +125,7 @@
125125

126126
a:any-link {
127127
color: var(--yellow);
128-
font-weight: bold;
129-
text-transform: uppercase;
128+
font-weight: 800;
130129

131130
&:not(:active, :focus, :hover) {
132131
transition: color var(--link-duration-out);

src/styles/variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
--projectileColor8: #9a9a9a;
4343

4444
// Fonts
45+
--alternative-font: 'Merriweather Sans', sans-serif;
4546
--body-font: Helvetica, Arial, sans-serif;
4647

4748
// Transitions

0 commit comments

Comments
 (0)