Merge Ikiwiki and local styling (i.e. list each Ikiwiki piece right above corresponding local stuff).

1 files changed, 57 insertions, 51 deletions

diff --git a/style.scss b/style.scss
index b2772b9..04f0b08 100644
--- a/style.scss
+++ b/style.scss
@@ -2,57 +2,6 @@
 @import "../shared/themes/default/ikiwiki";
 
 // site defaults
-@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
-// layout - main content
-@include ikiwiki-inlinepage;
-@include ikiwiki-inlinecontent;
-@include ikiwiki-inlineheader;
-@include ikiwiki-plugin-comments;
-// layout - header
-@include ikiwiki-header;
-@include ikiwiki-plugin-search;
-@include ikiwiki-actions;
-@include ikiwiki-plugin-po;
-// layout - footer
-@include ikiwiki-footer;
-@include ikiwiki-pageinfo;
-@include ikiwiki-tags;
-@include ikiwiki-backlinks;
-@include ikiwiki-authorship;
-@include ikiwiki-plugin-trail;
-// layout - aside
-@include ikiwiki-plugin-sidebar;
-// layout - print styles
-@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-plugin-recentchanges;
-@include ikiwiki-plugin-editpage;
-@include ikiwiki-plugin-attachment;
-@include ikiwiki-plugin-openid;
-
 @import "compass/typography/vertical_rhythm";
 
 @include h5bp-normalize;
@@ -107,6 +56,21 @@ body {
 	font-family: Helvetica, Verdana, Sans-serif;
 }
 
+@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
+// layout - main content
 div#wrapper,
 div#pagebody {
 	float: left;
@@ -133,6 +97,7 @@ div#content IMG {
 	background-color: none;
 }
 
+@include ikiwiki-inlinepage;
 div.inlinepage {
 	border: 0;
 	padding: rhythm(.5);
@@ -140,6 +105,9 @@ div.inlinepage {
 	background-color: LightYellow;
 }
 
+@include ikiwiki-inlinecontent;
+
+@include ikiwiki-inlineheader;
 div.inlinepage SPAN.header a {
 	@include adjust-font-size-to(14px);
 	font-weight: normal;
@@ -150,6 +118,14 @@ div.inlinefooter {
 	display: none;
 }
 
+@include ikiwiki-plugin-comments;
+
+// layout - header
+@include ikiwiki-header;
+@include ikiwiki-plugin-search;
+@include ikiwiki-actions;
+@include ikiwiki-plugin-po;
+
 div.header {
 	padding: rhythm(.5) 0 0 1em;
 	background-color: LightBlue;
@@ -237,12 +213,16 @@ div.topbar img {
 	margin: 0 20px;
 }
 
+
+// layout - footer
+@include ikiwiki-footer;
 div#footer {
 	clear: left;
 	width: 100%;
 	margin: rhythm() 0 0;
 }
 
+@include ikiwiki-pageinfo;
 div#pageinfo {
 	margin: 0;
 	border-top: 0;
@@ -254,20 +234,26 @@ div.pagedate {
 	margin-top: 0;
 }
 
+@include ikiwiki-tags;
 div.tags {
 	display: none;
 }
 
+@include ikiwiki-backlinks;
 div#backlinks {
 	display: none;
 }
 
+@include ikiwiki-authorship;
 div.pagecopyright,
 div.pagecopyright P {
 	margin-top: 0;
 	margin-bottom: 0;
 }
 
+@include ikiwiki-plugin-trail;
+// layout - aside
+@include ikiwiki-plugin-sidebar;
 div#sidebar,
 div.sidebar {
 	float: left;
@@ -329,3 +315,23 @@ div.farbar {
 	background-color: LightBlue;
 	text-align: left;
 }
+
+
+// layout - print styles
+@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-plugin-recentchanges;
+@include ikiwiki-plugin-editpage;
+@include ikiwiki-plugin-attachment;
+@include ikiwiki-plugin-openid;