From ca5da59e35e411a831e6dbb15db02b62134b18bc Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 21 Jan 2014 13:29:12 +0100
Subject: Merge img directive styling: avoid img.img altogether and extend
 captions styling.

---
 style.scss | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/style.scss b/style.scss
index ea1c755..3737c45 100644
--- a/style.scss
+++ b/style.scss
@@ -16,11 +16,17 @@
 @include ikiwiki-debug;
 @include ikiwiki-plugin-highlight;
 @include ikiwiki-plugin-color;
-// from excluded ikiwiki-plugin-img
+// based on ikiwiki-plugin-img
+// - img.img styling
+// + left-aligned
+// + vertical margin
+// + line-height
 .img caption {
+	margin: -1em 0 1.5em;
+	line-height: 175%;
 	font-size: 80%;
 	caption-side: bottom;
-	text-align: center;
+	text-align: left;
 }
 // shell
 // layout
@@ -213,18 +219,6 @@ img {
 	height: auto;
 }
 
-// Override _ikiwiki.style.css
-img.img {
-	margin: 0 1em 1em 0;
-}
-
-.img caption {
-	text-align: left;
-	line-height: 175%;
-	margin-bottom: 1.5em;
-	margin-top: -1em;
-}
-
 #content img.deco {
 	display: block;
 	clear: both;
-- 
cgit v1.2.3