From a90bb04458ecd68b7c2ca8442e3042d802701bed Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Wed, 15 Mar 2023 02:57:54 +0900 Subject: Add another page --- 06/index.xml | 2 +- 07/berries-1.jpg | Bin 0 -> 4721786 bytes 07/berries-2.jpg | Bin 0 -> 8608615 bytes 07/berries-3.jpg | Bin 0 -> 5948297 bytes 07/bread-n-wine.jpg | Bin 0 -> 4878797 bytes 07/doggoes.jpg | Bin 0 -> 4977534 bytes 07/index.xml | 35 +++++++++++++++++++++++++++++++++++ 07/ngu.jpg | Bin 0 -> 11847927 bytes 07/penthouse.jpg | Bin 0 -> 3888942 bytes 07/stone-clock.jpg | Bin 0 -> 3409970 bytes 07/wave-0.jpg | Bin 0 -> 5935192 bytes 07/wave-1.jpg | Bin 0 -> 6634659 bytes Makefile | 4 ++-- README.md | 4 ++-- atom.xslt | 22 ++++++++-------------- page.xslt | 1 + style.css | 19 ++----------------- 17 files changed, 51 insertions(+), 36 deletions(-) create mode 100644 07/berries-1.jpg create mode 100644 07/berries-2.jpg create mode 100644 07/berries-3.jpg create mode 100644 07/bread-n-wine.jpg create mode 100644 07/doggoes.jpg create mode 100644 07/index.xml create mode 100644 07/ngu.jpg create mode 100644 07/penthouse.jpg create mode 100644 07/stone-clock.jpg create mode 100644 07/wave-0.jpg create mode 100644 07/wave-1.jpg diff --git a/06/index.xml b/06/index.xml index b936f13..943630b 100644 --- a/06/index.xml +++ b/06/index.xml @@ -1,6 +1,6 @@ - + diff --git a/07/berries-1.jpg b/07/berries-1.jpg new file mode 100644 index 0000000..f7d2ff9 Binary files /dev/null and b/07/berries-1.jpg differ diff --git a/07/berries-2.jpg b/07/berries-2.jpg new file mode 100644 index 0000000..0bddc3d Binary files /dev/null and b/07/berries-2.jpg differ diff --git a/07/berries-3.jpg b/07/berries-3.jpg new file mode 100644 index 0000000..8f1dee6 Binary files /dev/null and b/07/berries-3.jpg differ diff --git a/07/bread-n-wine.jpg b/07/bread-n-wine.jpg new file mode 100644 index 0000000..71d8ddd Binary files /dev/null and b/07/bread-n-wine.jpg differ diff --git a/07/doggoes.jpg b/07/doggoes.jpg new file mode 100644 index 0000000..f8af17b Binary files /dev/null and b/07/doggoes.jpg differ diff --git a/07/index.xml b/07/index.xml new file mode 100644 index 0000000..d9eadac --- /dev/null +++ b/07/index.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2023 + diff --git a/07/ngu.jpg b/07/ngu.jpg new file mode 100644 index 0000000..5be4a15 Binary files /dev/null and b/07/ngu.jpg differ diff --git a/07/penthouse.jpg b/07/penthouse.jpg new file mode 100644 index 0000000..f0abbf2 Binary files /dev/null and b/07/penthouse.jpg differ diff --git a/07/stone-clock.jpg b/07/stone-clock.jpg new file mode 100644 index 0000000..53b6433 Binary files /dev/null and b/07/stone-clock.jpg differ diff --git a/07/wave-0.jpg b/07/wave-0.jpg new file mode 100644 index 0000000..72fe692 Binary files /dev/null and b/07/wave-0.jpg differ diff --git a/07/wave-1.jpg b/07/wave-1.jpg new file mode 100644 index 0000000..8361664 Binary files /dev/null and b/07/wave-1.jpg differ diff --git a/Makefile b/Makefile index 7f69823..275d1cd 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ all: $(OUTPUTS) %.small.jpg: %.jpg epeg -w 1024 -p -q 80 $< $@ -index.xml: 06/index.xml +index.xml: 07/index.xml ln -fs $< $@ %.xhtml: %.xml page.xslt @@ -36,7 +36,7 @@ $(PREFIX)/%: % install: all $(addprefix $(PREFIX)/,$(ALL)) uninstall: - rm -fr $(PREFIX) + rm -fr $(PREFIX)/* live: $(THUMBNAILS) index.xml atom.xml diff --git a/README.md b/README.md index 0b70043..c4d8547 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ has to be manually regenerated with `make atom.xml` however. ## Deployment ```sh -rsync -avh --delete --checksum\ +rsync -avh --delete\ $(nix-build -E 'with import {}; callPackage ./. {}')/\ - loang:/var/lib/www/px.cnx.gdn/ + loang:/mnt/nas/www/px.cnx.gdn/ ``` Nix builds are reproducible which helps minimize the amount of file transfer. diff --git a/atom.xslt b/atom.xslt index f54924b..d984a7a 100644 --- a/atom.xslt +++ b/atom.xslt @@ -47,20 +47,14 @@ mcsinyx@disroot.org CC BY-SA 4.0 - - - - - - - - - - - - - - + + + + + + + + 2023-02-16T17:38:00Z diff --git a/page.xslt b/page.xslt index 0cbc2bc..f2f0f25 100644 --- a/page.xslt +++ b/page.xslt @@ -6,6 +6,7 @@ + diff --git a/style.css b/style.css index b719ddf..a8719cb 100644 --- a/style.css +++ b/style.css @@ -1,20 +1,5 @@ -@media (prefers-color-scheme: dark) { - :root { - --bg: #1c1b19; - --fg: #fce8c3; - } -} -@media (prefers-color-scheme: light) { - :root { - --bg: white; - --fg: #2e3436; - } -} - html { - background-color: var(--bg); box-sizing: border-box; - color: var(--fg); font-size: clamp(100%, 3vw, 150%); margin: auto; max-width: calc(1024px + 2ch); @@ -22,7 +7,7 @@ html { } body { margin: 0 1ch } a[href] { - color: var(--fg); + color: CanvasText; font-weight: bold; text-decoration: none; } @@ -35,7 +20,7 @@ img { article + article { margin-top: 1rem } nav { align-items: center; - background-color: var(--bg); + background-color: Canvas; display: flex; justify-content: space-between; position: sticky; -- cgit 1.4.1