Merge branch 'sass' into compass

1 files changed, 39 insertions, 48 deletions

diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index 225b24e..a3e748a 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -345,7 +345,7 @@ div.progress-done {
 }
 }
 
-@mixin ikiwiki-print {
+@mixin ikiwiki-site-print {
 /* things to hide in printouts */
 @media print {
 	.actions {
@@ -757,7 +757,7 @@ a.openid_large_btn:focus {
 	@include ikiwiki-plugin-color;
 	@include ikiwiki-plugin-comments;
 	@include ikiwiki-plugin-progress;
-	@include ikiwiki-print;
+	@include ikiwiki-site-print;
 	@include ikiwiki-infobox;
 	@include ikiwiki-notebook;
 	@include ikiwiki-popup;
@@ -772,70 +772,61 @@ a.openid_large_btn:focus {
 	@include ikiwiki-plugin-attachment;
 }
 
-@mixin ikiwiki-style-basic {
-}
-@mixin ikiwiki-style-site {
-	@include ikiwiki-header;
+@mixin ikiwiki-site {
+	// main content
+	@include ikiwiki-inlinepage;
 	@include ikiwiki-inlineheader;
-	@include ikiwiki-actions;
 	@include ikiwiki-inlinecontent;
+	@include ikiwiki-plugin-comments;
+	// header
+	@include ikiwiki-header;
+	@include ikiwiki-plugin-search;
+	@include ikiwiki-actions;
+	@include ikiwiki-plugin-po;
+	// footer
 	@include ikiwiki-footer;
 	@include ikiwiki-pageinfo;
 	@include ikiwiki-tags;
 	@include ikiwiki-backlinks;
-	@include ikiwiki-blogform;
-	@include ikiwiki-inlinepage;
 	@include ikiwiki-authorship;
+	// aside
+	@include ikiwiki-plugin-sidebar;
 }
-@mixin ikiwiki-typography {
+
+// http://www.louddog.com/2008/create-maintainable-code-with-a-css-styleguide/
+@mixin ikiwiki-style {
+	// site defaults
+	@include ikiwiki-images;
 	@include ikiwiki-pre;
-}
-@mixin ikiwiki-links {
-}
-@mixin ikiwiki-buttons {
+	// generic styles
+	@include ikiwiki-lists;
+	@include ikiwiki-plugin-img;
 	@include ikiwiki-feedbutton;
-}
-@mixin ikiwiki-tabs {
-}
-@mixin ikiwiki-misc {
+	@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-alignment;
-	@include ikiwiki-debug;
-}
-@mixin ikiwiki-plugins {
-	@include ikiwiki-plugin-recentchanges;
-	@include ikiwiki-plugin-po;
+	@include ikiwiki-plugin-calendar;
+	@include ikiwiki-plugin-progress;
 	@include ikiwiki-plugin-map;
-	@include ikiwiki-plugin-img;
-	@include ikiwiki-plugin-search;
-	@include ikiwiki-plugin-editpage;
-	@include ikiwiki-plugin-sidebar;
 	@include ikiwiki-plugin-poll;
-	@include ikiwiki-plugin-color;
-	@include ikiwiki-plugin-comments;
-	@include ikiwiki-plugin-progress;
-	@include ikiwiki-plugin-highlight;
-	@include ikiwiki-plugin-calendar;
 	@include ikiwiki-plugin-pagestats;
 	@include ikiwiki-plugin-flattr;
-	@include ikiwiki-plugin-openid;
+	@include ikiwiki-blogform;
+	// section/page specific
+	@include ikiwiki-plugin-recentchanges;
+	@include ikiwiki-plugin-editpage;
 	@include ikiwiki-plugin-attachment;
-}
-@mixin ikiwiki-style {
-	@include ikiwiki-basic;
-	@include ikiwiki-site;
-	@include ikiwiki-typography;
-	@include ikiwiki-links;
-	@include ikiwiki-lists;
-	@include ikiwiki-images;
-	@include ikiwiki-buttons;
-	@include ikiwiki-tabs;
-	@include ikiwiki-forms;
-	@include ikiwiki-misc;
-	@include ikiwiki-plugins;
-	@include ikiwiki-print;
+	@include ikiwiki-plugin-openid;
 }
 
 @mixin ikiwiki {