From 768851e8fe422b23956ff2b39fc7ca9a791f5c4a Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 10 Mar 2012 20:21:14 +0100 Subject: Fix mixin names ikiwiki-basic and ikiwiki-site. --- default/_ikiwiki.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss index 225b24e..619aa41 100644 --- a/default/_ikiwiki.scss +++ b/default/_ikiwiki.scss @@ -772,9 +772,9 @@ a.openid_large_btn:focus { @include ikiwiki-plugin-attachment; } -@mixin ikiwiki-style-basic { +@mixin ikiwiki-basic { } -@mixin ikiwiki-style-site { +@mixin ikiwiki-site { @include ikiwiki-header; @include ikiwiki-inlineheader; @include ikiwiki-actions; -- cgit v1.2.3 From ee5cc3491b0423e5581e27fbbcf07db9313f97e6 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sun, 11 Mar 2012 19:45:52 +0100 Subject: Rename mixin ikiwiki-print to ikiwiki-site-print, and include after ikiwiki-site in ikiwiki-style. --- default/_ikiwiki.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss index 619aa41..a5a3b18 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; @@ -826,6 +826,7 @@ a.openid_large_btn:focus { @mixin ikiwiki-style { @include ikiwiki-basic; @include ikiwiki-site; + @include ikiwiki-site-print; @include ikiwiki-typography; @include ikiwiki-links; @include ikiwiki-lists; @@ -835,7 +836,6 @@ a.openid_large_btn:focus { @include ikiwiki-forms; @include ikiwiki-misc; @include ikiwiki-plugins; - @include ikiwiki-print; } @mixin ikiwiki { -- cgit v1.2.3 From 4c117ea7a308e6ce30788e8d1546d0159edc0b57 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 24 Mar 2012 01:05:13 +0100 Subject: Restructure and simplify into only ikiwiki-site and ikiwiki-style. --- default/_ikiwiki.scss | 81 +++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 45 deletions(-) diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss index a5a3b18..a3e748a 100644 --- a/default/_ikiwiki.scss +++ b/default/_ikiwiki.scss @@ -772,70 +772,61 @@ a.openid_large_btn:focus { @include ikiwiki-plugin-attachment; } -@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; + // 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-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 { -- cgit v1.2.3