cdransf/coryd.dev-eleventy
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: resolve conflict

Browse source
This commit is contained in:
Cory Dransfeldt 2024-03-17 16:41:46 -07:00
parent 50717ef665
commit 249f0fc75c
No known key found for this signature in database
9 changed files with 8 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/assets/styles/partials/fonts.css
View file

@ -1,13 +0,0 @@
@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;
}

3
src/assets/styles/partials/vars.css
View file

@ -56,7 +56,7 @@
--sun: #ffa700;
/* fonts */
--font-sans: "Poppins", -apple-system, BlinkMacSystemFont, avenir next, avenir, segoe ui, helvetica neue, helvetica, Cantarell, Ubuntu, roboto, noto, arial, sans-serif;
--font-sans: -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,6 +83,7 @@
--font-weight-base: 400;
--font-weight-bold: 700;
--font-weight-heavy: 900;
/* spacing */
--sizing-xs: .25rem;