From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 18:04:54 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
X-Git-Tag: 3.20100722~78
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/819e2a567aa8e528b95cc6e146d5ee92fd486cc8?hp=cddb39cbf5d385273645f62f15bdf29b7607aac2

Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
---

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index eb1b68124..2375ead89 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -156,6 +156,13 @@ sub preprocess (@) {
 		$imgurl="$config{url}/$imglink";
 	}
 
+	if (exists $params{class}) {
+		$params{class}.=" img";
+	}
+	else {
+		$params{class}="img";
+	}
+
 	my $attrs='';
 	foreach my $attr (qw{alt title class id hspace vspace}) {
 		if (exists $params{$attr}) {
diff --git a/debian/changelog b/debian/changelog
index 9f1a33f2f..d426be019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100705) UNRELEASED; urgency=low
+
+  * img: Add a margin around images displayed by this directive.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
+
 ikiwiki (3.20100704) unstable; urgency=low
 
   * Changes to avoid display of ugly google openids, by displaying
diff --git a/doc/style.css b/doc/style.css
index bf000dae1..8dd3b1c15 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -91,6 +91,10 @@ nav {
 	text-align: center;
 }
 
+img.img {
+	margin: 0.5ex;
+}
+
 .align-left {
 	float:left;
 }