summaryrefslogtreecommitdiff
path: root/default
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-03-24 01:05:13 +0100
committerJonas Smedegaard <dr@jones.dk>2013-10-12 22:18:37 +0200
commit8c5296c794372218f3e54f27aa69575fc3347414 (patch)
treef7de4f4a6490055986b51513151c3503bb2ae769 /default
parent2f4e872db11c252c7db4d1d4eaf5513ca74209ec (diff)
Restructure and simplify into only ikiwiki-site and ikiwiki-style.
Diffstat (limited to 'default')
-rw-r--r--default/_ikiwiki.scss85
1 files changed, 38 insertions, 47 deletions
diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index af6887d..855878d 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -830,72 +830,63 @@ a.openid_large_btn:focus {
@include ikiwiki-plugin-trail;
}
-@mixin ikiwiki-basic {
-}
@mixin ikiwiki-site {
- @include ikiwiki-header;
+ // 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;
- @include ikiwiki-archivepage;
+ // aside
+ @include ikiwiki-plugin-sidebar;
+ @include ikiwiki-plugin-trail;
}
-@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-archivepage;
+ @include ikiwiki-plugin-recentchanges;
+ @include ikiwiki-plugin-editpage;
@include ikiwiki-plugin-attachment;
- @include ikiwiki-plugin-trail;
-}
-@mixin ikiwiki-style {
- @include ikiwiki-basic;
- @include ikiwiki-site;
- @include ikiwiki-site-print;
- @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-plugin-openid;
}
@mixin ikiwiki {