From e86f5f4c3c86f9ce4baef6240b705e8d47cd8d81 Mon Sep 17 00:00:00 2001 From: Harvey Tindall Date: Tue, 4 Jan 2022 21:13:09 +0000 Subject: [PATCH] site: use tailwind --- .gitignore | 1 + scripts/missing-colors.js | 12 +- site/Makefile | 16 +- site/base.css | 4 - site/index.html | 42 +- site/package-lock.json | 1806 +++++++++++++++++++++++++++++++++++-- site/package.json | 3 +- site/tailwind.config.js | 26 + site/ts/main.ts | 2 + site/ts/repo.ts | 10 +- 10 files changed, 1812 insertions(+), 110 deletions(-) create mode 100644 site/tailwind.config.js diff --git a/.gitignore b/.gitignore index fd2b94f..03f01d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ node_modules/ site/node_modules/ site/out/ +site/tempts/ mail/*.html dist/ build/ diff --git a/scripts/missing-colors.js b/scripts/missing-colors.js index 568a66d..de1153c 100644 --- a/scripts/missing-colors.js +++ b/scripts/missing-colors.js @@ -48,9 +48,13 @@ const fixHTML = (infile, outfile) => { let inpath = process.argv[process.argv.length-2]; let outpath = process.argv[process.argv.length-1]; -let files = fs.readdirSync(inpath); -for (let i = 0; i < files.length; i++) { - if (files[i].indexOf(".html")>=0) { - fixHTML(path.join(inpath, files[i]), path.join(outpath, files[i])); +if (fs.statSync(inpath).isDirectory()) { + let files = fs.readdirSync(inpath); + for (let i = 0; i < files.length; i++) { + if (files[i].indexOf(".html")>=0) { + fixHTML(path.join(inpath, files[i]), path.join(outpath, files[i])); + } } +} else { + fixHTML(inpath, outpath); } diff --git a/site/Makefile b/site/Makefile index 404aaeb..942dc79 100644 --- a/site/Makefile +++ b/site/Makefile @@ -1,9 +1,14 @@ all: -mkdir -p out - cp index.html ../css/modal.css out/ + cp ../css/modal.css out/ + node ../scripts/missing-colors.js index.html out/index.html cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 out/ - npx esbuild --bundle ts/main.ts --outfile=out/main.js --minify + -rm -r tempts + cp -r ts tempts + ../scripts/dark-variant.sh tempts + npx esbuild --bundle tempts/main.ts --outfile=out/main.js --minify npx esbuild --bundle base.css --outfile=out/bundle.css --external:remixicon.css --external:modal.css --minify + npx tailwindcss -i out/bundle.css -o out/bundle.css cd out && npx uncss index.html --stylesheets bundle.css > _bundle.css; cd .. mv out/_bundle.css out/bundle.css cd out && npx uncss index.html --stylesheets remixicon.css > _remixicon.css; cd .. @@ -13,10 +18,15 @@ all: debug: -mkdir -p out - cp index.html out/ + cp ../css/modal.css out/ + node ../scripts/missing-colors.js index.html out/index.html cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 out/ + -rm -r tempts + cp -r ts tempts + ../scripts/dark-variant.sh tempts npx esbuild --bundle base.css --outfile=out/bundle.css --external:remixicon.css --minify npx esbuild --bundle ts/main.ts --sourcemap --outfile=out/main.js --minify + npx tailwindcss -i out/bundle.css -o out/bundle.css cp ../static/* out/ monitor: diff --git a/site/base.css b/site/base.css index aca464d..012dd0d 100644 --- a/site/base.css +++ b/site/base.css @@ -11,7 +11,3 @@ body { background: #AA5CC3; background: linear-gradient(90deg, #AA5CC3 0%, #00A4DC 100%) !important; } - -.text-center { - text-align: center; -} diff --git a/site/index.html b/site/index.html index 0c8f3ba..6733286 100644 --- a/site/index.html +++ b/site/index.html @@ -19,7 +19,7 @@