From 1b157582357a0a6612ff59b49fb46116bd1c3a44 Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Wed, 18 Nov 2020 06:36:19 +0000
Subject: clean-ups for web page generation

---
 doc/web/makefile   | 12 +++++-------
 doc/web/xmobar.css |  4 +++-
 readme.md          |  9 +++++----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/doc/web/makefile b/doc/web/makefile
index eb6b212..e9596d7 100644
--- a/doc/web/makefile
+++ b/doc/web/makefile
@@ -2,7 +2,8 @@ index.src = ../../readme.md
 index = readme.md
 releases = ../../changelog.md
 css = xmobar.css
-images = ../xmobar-sawfish.png ../xmobar-xmonad.png
+images = ../screenshots/xmobar-bottom.png ../screenshots/xmobar-top.png \
+         ../screenshots/xmobar-exwm.png
 remote = root@xmobar.org:/var/www/xmobar.org/
 htmls = index.html releases.html
 title = % xmobar - a minimalistic status bar
@@ -13,18 +14,15 @@ $(index): $(index.src)
 	@tail -n+3 $(index.src) | sed "1s/^/$(title)\n/" > $(index)
 
 index.html: releases.html $(index) $(css)
-	pandoc -f markdown -t html -c $(css) --toc -N -s \
+	pandoc -f markdown -t html -c $(css) -N -s \
                $(index) > index.html
 
 releases.html: $(releases) $(css)
 	pandoc -f markdown -t html -c $(css) -s \
                $(releases) > releases.html
 
-imgs:
-	cp $(images) .
-
-upload-images: imgs
-	rsync -zav $(images) $(remote)
+upload-images:
+	rsync -zav $(images) $(remote)/doc/screenshots
 
 upload-pages: $(htmls)
 	scp $(htmls) $(css) $(remote)
diff --git a/doc/web/xmobar.css b/doc/web/xmobar.css
index 531a146..7946c3a 100644
--- a/doc/web/xmobar.css
+++ b/doc/web/xmobar.css
@@ -11,6 +11,9 @@ body {
     line-height: 140%;
     color: #333;
 }
+img {
+    width: 95%;
+}
 pre {
     border: 1px dotted gray;
     background-color: #fafafa;
@@ -85,4 +88,3 @@ a:active {
     color: gray;
     text-align: center;
 }
-
diff --git a/readme.md b/readme.md
index e673952..b87a751 100644
--- a/readme.md
+++ b/readme.md
@@ -97,13 +97,14 @@ status bar, and supports similar features, like dynamic color
 management, icons, output templates, and extensibility through
 plugins.
 
-These are two xmobar instances using the author's configuration:
+These are some xmobar [screenshots](doc/screenshots) using the
+author's configuration:
 
-![top](doc/screenshots/xmobar-top.png)
+![top](doc/screenshots/xmobar-top.png)\
 
-![bottom](doc/screenshots/xmobar-bottom.png)
+![bottom](doc/screenshots/xmobar-bottom.png)\
 
-![exwm](doc/screenshots/xmobar-exwm.png)
+![exwm](doc/screenshots/xmobar-exwm.png)\
 
 # Installation
 
-- 
cgit v1.2.3