Merge branch 'master' of coreander:/srv/git/source.bynu.biks.dk/bynu/styling

1 files changed, 44 insertions, 15 deletions

diff --git a/style.scss b/style.scss
index 9e40208..5b71a97 100644
--- a/style.scss
+++ b/style.scss
@@ -6,7 +6,49 @@
 // site defaults
 @include h5bp-normalize;
 @include h5bp-main;
-@include ikiwiki-style;
+@include ikiwiki-images;
+@include ikiwiki-pre;
+// generic styles
+@include ikiwiki-lists;
+@include ikiwiki-feedbutton;
+@include ikiwiki-forms;
+@include ikiwiki-alignment;
+@include ikiwiki-debug;
+@include ikiwiki-plugin-highlight;
+@include ikiwiki-plugin-color;
+// 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: left;
+}
+// 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;
@@ -171,24 +213,12 @@ body {
 img {
 	float: left;
 	vertical-align: top;
-	margin: 0 5% 5% 0;
+	margin: 0 1em 1em 0;
 	padding: 0;
 	max-width: 100%;
 	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;
@@ -204,7 +234,6 @@ img.img {
 
 #content img.solo {
 	float: none;
-	margin: 0 5% 5% 0;
 	padding: 0;
 }
 #content img.x2470x3783 {