From 84cbcedf0652bc722def25f3b50c0154afd24257 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 21 Jan 2014 12:57:34 +0100
Subject: Expand to include individual parts of ikiwiki-style.

---
 style.scss | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/style.scss b/style.scss
index c968ec5..0c4a8bc 100644
--- a/style.scss
+++ b/style.scss
@@ -6,7 +6,38 @@
 // site defaults
 @include h5bp-normalize;
 @include h5bp-main;
-@include ikiwiki-style;
+@include ikiwiki-images;
+@include ikiwiki-pre;
+// generic styles
+@include ikiwiki-lists;
+@include ikiwiki-plugin-img;
+@include ikiwiki-feedbutton;
+@include ikiwiki-forms;
+@include ikiwiki-alignment;
+@include ikiwiki-debug;
+@include ikiwiki-plugin-highlight;
+@include ikiwiki-plugin-color;
+// shell
+// layout
+@include ikiwiki-site;
+@include ikiwiki-site-print;
+// modulars
+@include ikiwiki-infobox;
+@include ikiwiki-notebook;
+@include ikiwiki-popup;
+@include ikiwiki-plugin-calendar;
+@include ikiwiki-plugin-progress;
+@include ikiwiki-plugin-map;
+@include ikiwiki-plugin-poll;
+@include ikiwiki-plugin-pagestats;
+@include ikiwiki-plugin-flattr;
+@include ikiwiki-blogform;
+// section/page specific
+@include ikiwiki-archivepage;
+@include ikiwiki-plugin-recentchanges;
+@include ikiwiki-plugin-editpage;
+@include ikiwiki-plugin-attachment;
+@include ikiwiki-plugin-openid;
 
 h1 {
 	font-weight: normal;
-- 
cgit v1.2.3


From 737c3c3140a4cb03b370eb09cc65caac899a2f9d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 21 Jan 2014 13:05:42 +0100
Subject: Avoid general img directive styling (but preserve styling specific of
 captions).

---
 style.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/style.scss b/style.scss
index 0c4a8bc..ea1c755 100644
--- a/style.scss
+++ b/style.scss
@@ -10,13 +10,18 @@
 @include ikiwiki-pre;
 // generic styles
 @include ikiwiki-lists;
-@include ikiwiki-plugin-img;
 @include ikiwiki-feedbutton;
 @include ikiwiki-forms;
 @include ikiwiki-alignment;
 @include ikiwiki-debug;
 @include ikiwiki-plugin-highlight;
 @include ikiwiki-plugin-color;
+// from excluded ikiwiki-plugin-img
+.img caption {
+	font-size: 80%;
+	caption-side: bottom;
+	text-align: center;
+}
 // shell
 // layout
 @include ikiwiki-site;
-- 
cgit v1.2.3


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


From c9c431ffa34f66bcbee9e30be50e00fa5f1dcb7d Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 21 Jan 2014 13:34:47 +0100
Subject: Re-apply % → em change for img, and drop same for img.solo
 (superfluous since ikiwiki img.img dropped).
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 style.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/style.scss b/style.scss
index 3737c45..f3e7e10 100644
--- a/style.scss
+++ b/style.scss
@@ -213,7 +213,7 @@ body {
 img {
 	float: left;
 	vertical-align: top;
-	margin: 0 5% 5% 0;
+	margin: 0 1em 1em 0;
 	padding: 0;
 	max-width: 100%;
 	height: auto;
@@ -234,7 +234,6 @@ img {
 
 #content img.solo {
 	float: none;
-	margin: 0 5% 5% 0;
 	padding: 0;
 }
 #content img.x2470x3783 {
-- 
cgit v1.2.3