2 files changed, 202 insertions, 43 deletions

diff --git a/default/style.css b/default/_ikiwiki.scss
index fcf39be..c322456 100644
--- a/default/style.css
+++ b/default/_ikiwiki.scss
@@ -1,9 +1,11 @@
+@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,
 header,
@@ -11,7 +13,9 @@ footer,
 nav {
 	display: block;
 }
+}
 
+@mixin ikiwiki-style {
 .header {
 	margin: 0;
 	font-size: 140%;
@@ -33,10 +37,12 @@ nav {
 	height: 1em;
 	list-style-type: none;
 }
+
 .actions li {
 	display: inline;
 	padding: .2em;
 }
+
 .pageheader .actions ul {
 	border-bottom: 1px solid #000;
 }
@@ -50,10 +56,12 @@ nav {
 	padding: 6px;
 	list-style-type: none;
 }
+
 #otherlanguages li {
 	display: inline;
 	padding: .2em .4em;
 }
+
 .pageheader #otherlanguages {
 	border-bottom: 1px solid #000;
 }
@@ -78,7 +86,7 @@ nav {
 }
 
 .inlinepage .tags {
-        display: inline;
+	display: inline;
 }
 
 .mapparent {
@@ -96,11 +104,11 @@ img.img {
 }
 
 .align-left {
-	float:left;
+	float: left;
 }
 
 .align-right {
-	float:right;
+	float: right;
 }
 
 #backlinks {
@@ -138,9 +146,11 @@ div.recentchanges {
 	background: #eee;
 	color: black !important;
 }
+
 .recentchanges .metadata {
 	padding: 0px 0.5em;
 }
+
 .recentchanges .changelog {
 	font-style: italic;
 	clear: both;
@@ -149,29 +159,35 @@ div.recentchanges {
 	background: white !important;
 	color: black !important;
 }
+
 .recentchanges .desc {
 	display: none;
 }
+
 .recentchanges .diff {
 	display: none;
 }
+
 .recentchanges .committer {
 	float: left;
 	margin: 0;
 	width: 40%;
 }
+
 .recentchanges .committype {
 	float: left;
 	margin: 0;
 	width: 5%;
 	font-size: small;
 }
+
 .recentchanges .changedate {
 	float: left;
 	margin: 0;
 	width: 35%;
 	font-size: small;
 }
+
 .recentchanges .pagelinks,
 .recentchanges .revert {
 	float: right;
@@ -179,7 +195,8 @@ div.recentchanges {
 	width: 60%;
 }
 
-.blogform, #blogform {
+.blogform,
+#blogform {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
 	background: #eee;
@@ -224,6 +241,7 @@ hr.poll {
 	background: #eee;
 	border: 2px solid black;
 }
+
 div.poll {
 	margin-top: 1ex;
 	margin-bottom: 1ex;
@@ -240,16 +258,20 @@ span.color {
 	font-style: italic;
 	margin-top: .3em;
 }
+
 .comment .author,
 .microblog .author {
 	font-weight: bold;
 }
+
 .comment-subject {
 	font-weight: bold;
 }
+
 .comment-avatar {
 	float: right;
 }
+
 .comment {
 	border: 1px solid #aaa;
 	padding: 3px;
@@ -264,6 +286,7 @@ div.progress {
 	color: black !important;
 	padding: 1px;
 }
+
 div.progress-done {
 	background: #ea6 !important;
 	color: black !important;
@@ -273,12 +296,30 @@ div.progress-done {
 
 /* things to hide in printouts */
 @media print {
-	.actions { display: none; }
-	.tags { display: none; }
-	.feedbutton { display: none; }
-	#searchform { display: none; }
-	.blogform, #blogform { display: none; }
-	#backlinks { display: none; }
+	.actions {
+		display: none;
+	}
+
+	.tags {
+		display: none;
+	}
+
+	.feedbutton {
+		display: none;
+	}
+
+	#searchform {
+		display: none;
+	}
+
+	.blogform,
+	#blogform {
+		display: none;
+	}
+
+	#backlinks {
+		display: none;
+	}
 }
 
 /* infobox template */
@@ -311,11 +352,13 @@ div.progress-done {
 	border-bottom: 1px dotted #366;
 	color: #366;
 }
+
 .popup .balloon,
 .popup .paren,
 .popup .expand {
 	display: none;
 }
+
 .popup:hover .balloon,
 .popup:focus .balloon {
 	position: absolute;
@@ -332,19 +375,24 @@ fieldset {
 	margin: 1ex 0;
 	border: 1px solid black;
 }
+
 legend {
 	padding: 0 1ex;
 }
+
 .fb_submit {
 	float: left;
 	margin: 2px 0;
 }
-label.block {    
-	display: block;   
+
+label.block {
+	display: block;
 }
-label.inline {    
+
+label.inline {
 	display: inline;
 }
+
 input#openid_identifier {
 	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
 	background-color: #fff;
@@ -352,6 +400,7 @@ input#openid_identifier {
 	color: #000;
 	padding-left: 18px;
 }
+
 input#searchbox {
 	background: url(wikiicons/search-bg.gif) no-repeat;
 	background-color: #fff;
@@ -359,38 +408,90 @@ input#searchbox {
 	color: #000;
 	padding-right: 16px;
 }
+
 /* invalid form fields */
 .fb_invalid {
 	color: red;
 	background: white !important;
 }
+
 /* required form fields */
 .fb_required {
 	font-weight: bold;
 }
 
 /* highlight plugin */
-pre.hl { color:#000000; background-color:#ffffff; }
-.hl.num { color:#2928ff; }
-.hl.esc { color:#ff00ff; }
-.hl.str { color:#ff0000; }
-.hl.dstr { color:#818100; }
-.hl.slc { color:#838183; font-style:italic; }
-.hl.com { color:#838183; font-style:italic; }
-.hl.dir { color:#008200; }
-.hl.sym { color:#000000; }
-.hl.line { color:#555555; }
-.hl.mark { background-color:#ffffbb; }
-.hl.kwa { color:#000000; font-weight:bold; }
-.hl.kwb { color:#830000; }
-.hl.kwc { color:#000000; font-weight:bold; }
-.hl.kwd { color:#010181; }
+pre.hl {
+	color: #000000;
+	background-color: #ffffff;
+}
+
+.hl.num {
+	color: #2928ff;
+}
+
+.hl.esc {
+	color: #ff00ff;
+}
+
+.hl.str {
+	color: #ff0000;
+}
+
+.hl.dstr {
+	color: #818100;
+}
+
+.hl.slc {
+	color: #838183;
+	font-style: italic;
+}
+
+.hl.com {
+	color: #838183;
+	font-style: italic;
+}
+
+.hl.dir {
+	color: #008200;
+}
+
+.hl.sym {
+	color: #000000;
+}
+
+.hl.line {
+	color: #555555;
+}
+
+.hl.mark {
+	background-color: #ffffbb;
+}
+
+.hl.kwa {
+	color: #000000;
+	font-weight: bold;
+}
+
+.hl.kwb {
+	color: #830000;
+}
+
+.hl.kwc {
+	color: #000000;
+	font-weight: bold;
+}
+
+.hl.kwd {
+	color: #010181;
+}
 
 /* calendar plugin */
 .month-calendar-day-this-day,
 .year-calendar-this-month {
 	background-color: #eee;
 }
+
 .month-calendar-day-head,
 .month-calendar-day-nolink,
 .month-calendar-day-link,
@@ -398,6 +499,7 @@ pre.hl { color:#000000; background-color:#ffffff; }
 .month-calendar-day-future {
 	text-align: right;
 }
+
 .month-calendar-arrow A:link,
 .year-calendar-arrow A:link,
 .month-calendar-arrow A:visited,
@@ -408,14 +510,37 @@ pre.hl { color:#000000; background-color:#ffffff; }
 }
 
 /* outlines */
-li.L1 { list-style: upper-roman; }
-li.L2 { list-style: decimal; }
-li.L3 { list-style: lower-alpha; }
-li.L4 { list-style: disc; }
-li.L5 { list-style: square; }
-li.L6 { list-style: circle; }
-li.L7 { list-style: lower-roman; }
-li.L8 { list-style: upper-alpha; }
+li.L1 {
+	list-style: upper-roman;
+}
+
+li.L2 {
+	list-style: decimal;
+}
+
+li.L3 {
+	list-style: lower-alpha;
+}
+
+li.L4 {
+	list-style: disc;
+}
+
+li.L5 {
+	list-style: square;
+}
+
+li.L6 {
+	list-style: circle;
+}
+
+li.L7 {
+	list-style: lower-roman;
+}
+
+li.L8 {
+	list-style: upper-alpha;
+}
 
 /* tag cloud */
 .pagecloud {
@@ -427,11 +552,26 @@ li.L8 { list-style: upper-alpha; }
 	background: #eee;
 	color: black !important;
 }
-.smallestPC { font-size: 70%; }
-.smallPC { font-size: 85%; }
-.normalPC { font-size: 100%; }
-.bigPC { font-size: 115%; }
-.biggestPC { font-size: 130%; }
+
+.smallestPC {
+	font-size: 70%;
+}
+
+.smallPC {
+	font-size: 85%;
+}
+
+.normalPC {
+	font-size: 100%;
+}
+
+.bigPC {
+	font-size: 115%;
+}
+
+.biggestPC {
+	font-size: 130%;
+}
 
 /* orange feed button */
 .feedbutton {
@@ -448,6 +588,7 @@ li.L8 { list-style: upper-alpha; }
 	text-decoration: none;
 	margin-top: 1em;
 }
+
 .feedbutton:hover {
 	color: white !important;
 	background: #ff9900;
@@ -461,35 +602,51 @@ li.L8 { list-style: upper-alpha; }
 #openid_choice {
 	display: none;
 }
+
 #openid_input_area {
 	clear: both;
 	padding: 10px;
 }
-#openid_btns, #openid_btns br {
+
+#openid_btns,
+#openid_btns br {
 	clear: both;
 }
+
 #openid_highlight {
 	background-color: black;
 	float: left;
 }
+
 .openid_large_btn {
 	padding: 1em 1.5em;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
 }
+
 .openid_small_btn {
 	padding: 4px 4px;
 	border: 1px solid #DDD;
 	margin: 3px;
 	float: left;
 }
+
 a.openid_large_btn:focus {
 	outline: none;
 }
+
 a.openid_large_btn:focus {
 	outline-style: none;
 }
+
 .openid_selected {
 	border: 4px solid #DDD;
 }
+}
+
+@mixin ikiwiki {
+	@include ikiwiki-boilerplate;
+	@include ikiwiki-reset;
+	@include ikiwiki-style;
+}
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;