clean-ups for web page generation

2 files changed, 8 insertions, 8 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;
 }
-