diff --git a/app/.gitignore b/app/.gitignore index 6635cf5..69ea94c 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -8,3 +8,4 @@ node_modules !.env.example vite.config.js.timestamp-* vite.config.ts.timestamp-* +nerdfonts.* diff --git a/app/Makefile b/app/Makefile index 8ff4f7a..5dcb8d1 100644 --- a/app/Makefile +++ b/app/Makefile @@ -1,10 +1,25 @@ -all: +NF_CSS = static/css/nerdfonts.css +NF_WOFF = static/assets/nerdfonts.woff2 + +all: $(NF_CSS) npm run build +$(NF_CSS): $(NF_WOFF) + wget "https://www.nerdfonts.com/assets/css/webfont.css" -O $@ + sed 's/\.\.\/fonts\/Symbols-2048-em Nerd Font Complete\.woff2/\/assets\/nerdfonts\.woff2/g' -i $@ + +$(NF_WOFF): + wget "https://www.nerdfonts.com/assets/fonts/Symbols-2048-em%20Nerd%20Font%20Complete.woff2" -O $@ + +run: $(NF_CSS) + npm run dev + format: npm run format -run: - npm run dev +clean: + rm -rf build + rm $(NF_CSS) + rm $(NF_WOFF) -.PHONY: format +.PHONY: format run clean diff --git a/app/static/css/font.css b/app/static/css/font.css index 0de41b6..32d2074 100644 --- a/app/static/css/font.css +++ b/app/static/css/font.css @@ -1,6 +1,3 @@ -/* im using nerd fonts btw */ -@import "https://www.nerdfonts.com/assets/css/webfont.css"; - @font-face { font-family: "Ubuntu"; font-style: normal; diff --git a/app/static/css/global.css b/app/static/css/global.css index d47cac5..6b1872b 100644 --- a/app/static/css/global.css +++ b/app/static/css/global.css @@ -1,4 +1,12 @@ +/* + + * animations.css: stuff like the cursor animation + * webfont.css: webfont dumped from https://www.nerdfonts.com/assets/css/webfont.css + * font.css: the main font (Ubuntu) + +*/ @import "./animations.css"; +@import "./nerdfonts.css"; @import "./font.css"; :root {