diff --git a/.gitignore b/.gitignore index 4743da6..88e7194 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ _cache _site +_optim src/archive.org diff --git a/engine/mkrss.sh b/engine/mkrss.sh index 7cf127a..77f804e 100755 --- a/engine/mkrss.sh +++ b/engine/mkrss.sh @@ -4,7 +4,7 @@ cd "$(git rev-parse --show-toplevel)" || exit 1 # Directory -webdir="_site" +webdir="_optim" postsdir="$webdir/posts" rssfile="$webdir/rss.xml" diff --git a/engine/optim-classes.sh b/engine/optim-classes.sh index 7a76240..110e81a 100755 --- a/engine/optim-classes.sh +++ b/engine/optim-classes.sh @@ -3,7 +3,7 @@ #!nix-shell -I nixpkgs="https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz" cd "$(git rev-parse --show-toplevel)" || exit 1 -webdir="_site" +webdir="_optim" retrieve_classes_in_html () { cat $webdir/**/*.html(N) | \ diff --git a/engine/optim-html.sh b/engine/optim-html.sh index 37dcd22..2f3911f 100755 --- a/engine/optim-html.sh +++ b/engine/optim-html.sh @@ -3,7 +3,7 @@ #!nix-shell -I nixpkgs="https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz" cd "$(git rev-parse --show-toplevel)" || exit 1 -webdir="_site" +webdir="_optim" debug () { print -- $* >/dev/null diff --git a/engine/pre-deploy.sh b/engine/pre-deploy.sh index 26cb5ed..b64f0b1 100755 --- a/engine/pre-deploy.sh +++ b/engine/pre-deploy.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash cd "$(git rev-parse --show-toplevel)" || exit 1 +echo "Copying to optim dir" +rm -rf _optim/ && cp -r _site _optim echo "Optim HTML size" ./engine/optim-html.sh # echo "Gen themes clones" diff --git a/engine/serve.sh b/engine/serve.sh index 0696921..2cfcd1b 100755 --- a/engine/serve.sh +++ b/engine/serve.sh @@ -1,4 +1,13 @@ #!/usr/bin/env bash cd "$(git rev-parse --show-toplevel)" || exit 1 -cd _site && sws -d --port 3001 . + +if (( $# == 0 )); then + webdir="_site" +else + webdir="$1" +fi + +cd $webdir && \ +echo "Serving: $webdir" && \ +sws -d --port 3001 . diff --git a/engine/sync.sh b/engine/sync.sh index 62b0399..b5f27c2 100755 --- a/engine/sync.sh +++ b/engine/sync.sh @@ -1,9 +1,13 @@ #!/usr/bin/env zsh cd "$(git rev-parse --show-toplevel)" || exit 1 -rootdir=$PWD -echo $rootdir +webdir="_optim" + +[[ -d $webdir ]] || { echo "no $webdir directory"; exit 1 } echo -n "Uploading website" -rsync --progress --partial -avHe ssh $rootdir/_site/ root@esy.fun:/var/www/her.esy.fun/ --delete +rsync --progress\ + --partial \ + --delete \ + -avHe ssh ${webdir}/ root@esy.fun:/var/www/her.esy.fun/ echo " [done]" diff --git a/engine/update-file-size.sh b/engine/update-file-size.sh index a2058ab..fc49ea0 100755 --- a/engine/update-file-size.sh +++ b/engine/update-file-size.sh @@ -3,7 +3,7 @@ #!nix-shell -I nixpkgs="https://github.com/NixOS/nixpkgs/archive/19.09.tar.gz" cd "$(git rev-parse --show-toplevel)" || exit 1 -webdir="_site" +webdir="_optim" sizeof() { stat --format="%s" "$*" diff --git a/src/css/mk.css b/src/css/mk.css index a217492..54d1ab0 100644 --- a/src/css/mk.css +++ b/src/css/mk.css @@ -279,7 +279,7 @@ figure, .figure { @media (prefers-color-scheme: light) { :root { --bg: var(--b3); - --fg0: var(--b00); + --fg0: var(--b0); --fg: var(--b02); --bg2: var(--b2); --fg2: var(--b01); @@ -308,7 +308,7 @@ figure, .figure { #d:checked ~ .main, #d:checked ~ #labels { --bg: var(--b03); --fg: var(--b1); - --fg0: var(--b2); + --fg0: var(--b00); --bg2: var(--b02); --fg2: var(--b1); --rfg: var(--b1); @@ -322,7 +322,7 @@ figure, .figure { /* Light theme selected */ #l:checked ~ .main, #l:checked ~ #labels { --bg: var(--b3); - --fg0: var(--b00); + --fg0: var(--b0); --fg: var(--b02); --bg2: var(--b2); --fg2: var(--b01);