diff --git a/package-lock.json b/package-lock.json index ed9bc2d6..b232c55f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "7.10.7", + "version": "7.10.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "7.10.7", + "version": "7.10.10", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.2.2", diff --git a/package.json b/package.json index 06df31a9..aa100470 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "7.10.10", + "version": "7.11.10", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_includes/base.liquid b/src/_includes/base.liquid index 5a0a71db..f96c6f99 100644 --- a/src/_includes/base.liquid +++ b/src/_includes/base.liquid @@ -8,7 +8,10 @@ {{ pageTitle }} + + {% capture css %} + {% render "../assets/styles/partials/fonts.css" %} {% render "../assets/styles/partials/vars.css" %} {% render "../assets/styles/partials/animations.css" %} {% render "../assets/styles/index.css" %} diff --git a/src/assets/fonts/Poppins-Bold.woff2 b/src/assets/fonts/Poppins-Bold.woff2 new file mode 100644 index 00000000..fd7e21b3 Binary files /dev/null and b/src/assets/fonts/Poppins-Bold.woff2 differ diff --git a/src/assets/fonts/Poppins-Regular.woff2 b/src/assets/fonts/Poppins-Regular.woff2 new file mode 100644 index 00000000..bd4e3bd7 Binary files /dev/null and b/src/assets/fonts/Poppins-Regular.woff2 differ diff --git a/src/assets/styles/components/pagefind.css b/src/assets/styles/components/pagefind.css index 5724dad0..ee1c7ebc 100644 --- a/src/assets/styles/components/pagefind.css +++ b/src/assets/styles/components/pagefind.css @@ -34,7 +34,7 @@ color: var(--accent-color); font-size: var(--font-size-2xl); line-height: var(--line-height-2xl); - font-weight: var(--font-weight-heavy); + font-weight: var(--font-weight-bold); margin: 0; transition-property: color; transition-timing-function: var(--transition-ease-in-out); @@ -111,5 +111,5 @@ .pagefind__placeholder { height: 42px !important; - font-weight: var(--font-weight-heavy); + font-weight: var(--font-weight-bold); } \ No newline at end of file diff --git a/src/assets/styles/index.css b/src/assets/styles/index.css index 3eaf3609..347b4f2c 100644 --- a/src/assets/styles/index.css +++ b/src/assets/styles/index.css @@ -90,7 +90,7 @@ a:active, /* headers */ h1, h2, h3, h4, h5, h6 { - font-weight: var(--font-weight-heavy); + font-weight: var(--font-weight-bold); } h1 { font-size: var(--font-size-3xl) } diff --git a/src/assets/styles/partials/fonts.css b/src/assets/styles/partials/fonts.css new file mode 100644 index 00000000..847c1050 --- /dev/null +++ b/src/assets/styles/partials/fonts.css @@ -0,0 +1,13 @@ +@font-face { + font-family: Poppins; + src: url('/assets/fonts/Poppins-Bold.woff2') format("woff2"); + font-weight: 700; + font-display: swap; +} + +@font-face { + font-family: Poppins; + src: url('/assets/fonts/Poppins-Regular.woff2') format("woff2"); + font-weight: 400; + font-display: swap; +} \ No newline at end of file diff --git a/src/assets/styles/partials/vars.css b/src/assets/styles/partials/vars.css index 8ffe49a0..eb326eb4 100644 --- a/src/assets/styles/partials/vars.css +++ b/src/assets/styles/partials/vars.css @@ -56,7 +56,7 @@ --sun: #ffa700; /* fonts */ - --font-sans: -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif; + --font-sans: "Poppins", -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif; --font-mono: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console, ui-monospace, monospace; /* text */ @@ -83,7 +83,6 @@ --font-weight-base: 400; --font-weight-bold: 700; - --font-weight-heavy: 900; /* spacing */ --sizing-xs: .25rem;