From 14e6ec969ae256a233ac8b7fa7f01068c74219d5 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 12 Oct 2013 18:50:55 +0200
Subject: provide default styling as mixin 2/2: wrap styling into mixins, and
 re-add style.scss

---
 default/_ikiwiki.scss | 16 ++++++++++++++++
 default/style.scss    |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 default/style.scss

diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index 2ebbc20..4d73124 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -1,13 +1,19 @@
+@mixin ikiwiki-boilerplate {
 /* ikiwiki style sheet */
 /* Note that instead of modifying this style sheet, you can instead edit
  * local.css and use it to override or change settings in this one.
  */
+}
+
+@mixin ikiwiki-reset {
 /* html5 compat */
 article, aside, details, figcaption, figure,
 footer, header, hgroup, menu, nav, section {
 	display: block;
 }
+}
 
+@mixin ikiwiki-style-legacy {
 div.header, header.header {
 	margin: 0;
 	font-size: 140%;
@@ -692,7 +698,9 @@ a.login_large_btn:focus {
 .trailsep {
 	display: none;
 }
+}
 
+@mixin ikiwiki-flexbox {
 /* mobile/small-screen-friendly layout */
 @media (max-width: 600px) {
 	.sidebar {
@@ -735,3 +743,11 @@ a.login_large_btn:focus {
 		padding: 4px 4px;
 	}
 }
+}
+
+@mixin ikiwiki {
+	@include ikiwiki-boilerplate;
+	@include ikiwiki-reset;
+	@include ikiwiki-style-legacy;
+	@include ikiwiki-flexbox;
+}
diff --git a/default/style.scss b/default/style.scss
new file mode 100644
index 0000000..a23d692
--- /dev/null
+++ b/default/style.scss
@@ -0,0 +1,2 @@
+@import "ikiwiki";
+@include ikiwiki;
-- 
cgit v1.2.3