diff options
| -rw-r--r-- | 06/index.xml | 2 | ||||
| -rw-r--r-- | 07/berries-1.jpg | bin | 0 -> 4721786 bytes | |||
| -rw-r--r-- | 07/berries-2.jpg | bin | 0 -> 8608615 bytes | |||
| -rw-r--r-- | 07/berries-3.jpg | bin | 0 -> 5948297 bytes | |||
| -rw-r--r-- | 07/bread-n-wine.jpg | bin | 0 -> 4878797 bytes | |||
| -rw-r--r-- | 07/doggoes.jpg | bin | 0 -> 4977534 bytes | |||
| -rw-r--r-- | 07/index.xml | 35 | ||||
| -rw-r--r-- | 07/ngu.jpg | bin | 0 -> 11847927 bytes | |||
| -rw-r--r-- | 07/penthouse.jpg | bin | 0 -> 3888942 bytes | |||
| -rw-r--r-- | 07/stone-clock.jpg | bin | 0 -> 3409970 bytes | |||
| -rw-r--r-- | 07/wave-0.jpg | bin | 0 -> 5935192 bytes | |||
| -rw-r--r-- | 07/wave-1.jpg | bin | 0 -> 6634659 bytes | |||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | atom.xslt | 22 | ||||
| -rw-r--r-- | page.xslt | 1 | ||||
| -rw-r--r-- | style.css | 19 |
17 files changed, 51 insertions, 36 deletions
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 @@ <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet href="/page.xslt" type="text/xsl"?> -<page prev="05" curr="06"> +<page prev="05" curr="06" next="07"> <post title="half-life" lang="en"> <picture filename="half-alive-brick" desc="tiny plant bush emerged from brick ground, half withered"/> diff --git a/07/berries-1.jpg b/07/berries-1.jpg new file mode 100644 index 0000000..f7d2ff9 --- /dev/null +++ b/07/berries-1.jpg Binary files differdiff --git a/07/berries-2.jpg b/07/berries-2.jpg new file mode 100644 index 0000000..0bddc3d --- /dev/null +++ b/07/berries-2.jpg Binary files differdiff --git a/07/berries-3.jpg b/07/berries-3.jpg new file mode 100644 index 0000000..8f1dee6 --- /dev/null +++ b/07/berries-3.jpg Binary files differdiff --git a/07/bread-n-wine.jpg b/07/bread-n-wine.jpg new file mode 100644 index 0000000..71d8ddd --- /dev/null +++ b/07/bread-n-wine.jpg Binary files differdiff --git a/07/doggoes.jpg b/07/doggoes.jpg new file mode 100644 index 0000000..f8af17b --- /dev/null +++ b/07/doggoes.jpg Binary files differdiff --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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="/page.xslt" type="text/xsl"?> +<page prev="06" curr="07"> + <post title="sóng bắt đầu từ gió" lang="vi"> + <picture filename="wave-0" desc="sóng to vỗ bờ bắc đảo 제주"/> + <picture filename="wave-1" desc="sóng to vỗ bờ bắc đảo 제주"/> + <time>2023-01-22T14:58:02Z</time> + </post> + <post title="never give up" lang="en"> + <picture filename="ngu" desc="60°-leaning pine tree"/> + <time>2023-01-24T11:38:38Z</time> + </post> + <post title="penthouse" lang="en"> + <picture filename="penthouse" desc="bird nest on a treetop"/> + <time>2023-01-26T11:11:14Z</time> + </post> + <post title="together?" lang="en"> + <picture filename="berries-1" desc="some purplish red berries"/> + <picture filename="berries-2" desc="some red berries"/> + <picture filename="berries-3" desc="some reddish orange berries"/> + <time>2023-02-10T12:45:26Z</time> + </post> + <post title="souvenirs" lang="en"> + <picture filename="bread-n-wine" + desc="bread bag clips stack beside wine corks, under a seashell"/> + <picture filename="doggoes" + desc="pub in cup in front of doge cards, all are kings"/> + <time>2023-02-25T10:11:12Z</time> + </post> + <post title="time is of the essence" lang="en"> + <picture filename="stone-clock" desc="stone statue of an analog clock"/> + <time>2023-03-04T01:23:45Z</time> + </post> + <year>2023</year> +</page> diff --git a/07/ngu.jpg b/07/ngu.jpg new file mode 100644 index 0000000..5be4a15 --- /dev/null +++ b/07/ngu.jpg Binary files differdiff --git a/07/penthouse.jpg b/07/penthouse.jpg new file mode 100644 index 0000000..f0abbf2 --- /dev/null +++ b/07/penthouse.jpg Binary files differdiff --git a/07/stone-clock.jpg b/07/stone-clock.jpg new file mode 100644 index 0000000..53b6433 --- /dev/null +++ b/07/stone-clock.jpg Binary files differdiff --git a/07/wave-0.jpg b/07/wave-0.jpg new file mode 100644 index 0000000..72fe692 --- /dev/null +++ b/07/wave-0.jpg Binary files differdiff --git a/07/wave-1.jpg b/07/wave-1.jpg new file mode 100644 index 0000000..8361664 --- /dev/null +++ b/07/wave-1.jpg Binary files differdiff --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 <nixpkgs> {}; 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 @@ <email>mcsinyx@disroot.org</email> </author> <rights>CC BY-SA 4.0</rights> - <xsl:apply-templates select="document('00/index.xml')/page"> - </xsl:apply-templates> - <xsl:apply-templates select="document('01/index.xml')/page"> - </xsl:apply-templates> - <xsl:apply-templates select="document('02/index.xml')/page"> - </xsl:apply-templates> - <xsl:apply-templates select="document('03/index.xml')/page"> - </xsl:apply-templates> - <xsl:apply-templates select="document('04/index.xml')/page"> - </xsl:apply-templates> - <xsl:apply-templates select="document('05/index.xml')/page"> - </xsl:apply-templates> - <xsl:apply-templates select="document('06/index.xml')/page"> - </xsl:apply-templates> + <xsl:apply-templates select="document('00/index.xml')/page"/> + <xsl:apply-templates select="document('01/index.xml')/page"/> + <xsl:apply-templates select="document('02/index.xml')/page"/> + <xsl:apply-templates select="document('03/index.xml')/page"/> + <xsl:apply-templates select="document('04/index.xml')/page"/> + <xsl:apply-templates select="document('05/index.xml')/page"/> + <xsl:apply-templates select="document('06/index.xml')/page"/> + <xsl:apply-templates select="document('07/index.xml')/page"/> <updated>2023-02-16T17:38:00Z</updated> </feed> </xsl:template> diff --git a/page.xslt b/page.xslt index 0cbc2bc..f2f0f25 100644 --- a/page.xslt +++ b/page.xslt @@ -6,6 +6,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" lang="en"> <head> <meta name="viewport" content="width=device-width,initial-scale=1.0"/> + <meta name="color-scheme" content="dark light"/> <link rel="alternate" type="application/atom+xml" href="/atom.xml"/> <link rel="icon" href="/favicon.png"/> <link rel="stylesheet" href="/style.css"/> 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; |
