summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-07-05 14:04:49 -0400
committerJoey Hess <joey@kitenet.net>2010-07-05 14:04:49 -0400
commitf6db10df21f04df83e109924647b07672050dbf3 (patch)
treea8fed8399efad1853b5c8a715b3c8f4fefc5aedc
parent527c169ab2a6617138da2c4b817e452db65f80bf (diff)
img: Add a margin around images displayed by this directive.
Particularly important for floating images, which could before be placed uncomfortably close to text.
-rw-r--r--IkiWiki/Plugin/img.pm7
-rw-r--r--debian/changelog6
-rw-r--r--doc/style.css4
3 files changed, 17 insertions, 0 deletions
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;
}