Merge branch 'sass' into compass

1 files changed, 186 insertions, 2 deletions

diff --git a/default/_ikiwiki.scss b/default/_ikiwiki.scss
index d00ec96..225b24e 100644
--- a/default/_ikiwiki.scss
+++ b/default/_ikiwiki.scss
@@ -15,7 +15,7 @@ nav {
 }
 }
 
-@mixin ikiwiki-style {
+@mixin ikiwiki-header {
 .header {
 	margin: 0;
 	font-size: 140%;
@@ -23,14 +23,18 @@ nav {
 	line-height: 1em;
 	display: block;
 }
+}
 
+@mixin ikiwiki-inlineheader {
 .inlineheader .author {
 	margin: 0;
 	font-size: 112%;
 	font-weight: bold;
 	display: block;
 }
+}
 
+@mixin ikiwiki-actions {
 .actions ul {
 	margin: 0;
 	padding: 6px .4em;
@@ -50,7 +54,9 @@ nav {
 .inlinepage .actions ul {
 	border-bottom: 0;
 }
+}
 
+@mixin ikiwiki-plugin-po {
 #otherlanguages ul {
 	margin: 0;
 	padding: 6px;
@@ -65,22 +71,30 @@ nav {
 .pageheader #otherlanguages {
 	border-bottom: 1px solid #000;
 }
+}
 
+@mixin ikiwiki-inlinecontent {
 .inlinecontent {
 	margin-top: .4em;
 }
+}
 
+@mixin ikiwiki-footer {
 .pagefooter,
 .inlinefooter,
 .comments {
 	clear: both;
 }
+}
 
+@mixin ikiwiki-pageinfo {
 #pageinfo {
 	margin: 1em 0;
 	border-top: 1px solid #000;
 }
+}
 
+@mixin ikiwiki-tags {
 .tags {
 	margin-top: 1em;
 }
@@ -88,11 +102,15 @@ nav {
 .inlinepage .tags {
 	display: inline;
 }
+}
 
+@mixin ikiwiki-plugin-map {
 .mapparent {
 	text-decoration: none;
 }
+}
 
+@mixin ikiwiki-plugin-img {
 .img caption {
 	font-size: 80%;
 	caption-side: bottom;
@@ -102,7 +120,9 @@ nav {
 img.img {
 	margin: 0.5ex;
 }
+}
 
+@mixin ikiwiki-alignment {
 .align-left {
 	float: left;
 }
@@ -110,16 +130,22 @@ img.img {
 .align-right {
 	float: right;
 }
+}
 
+@mixin ikiwiki-backlinks {
 #backlinks {
 	margin-top: 1em;
 }
+}
 
+@mixin ikiwiki-plugin-search {
 #searchform {
 	display: inline;
 	float: right;
 }
+}
 
+@mixin ikiwiki-plugin-editpage {
 #editcontent {
 	width: 98%;
 }
@@ -128,15 +154,21 @@ img.img {
 	width: auto;
 	overflow: auto;
 }
+}
 
+@mixin ikiwiki-images {
 img {
 	border-style: none;
 }
+}
 
+@mixin ikiwiki-pre {
 pre {
 	overflow: auto;
 }
+}
 
+@mixin ikiwiki-plugin-recentchanges {
 div.recentchanges {
 	border-style: solid;
 	border-width: 1px;
@@ -194,7 +226,9 @@ div.recentchanges {
 	margin: 0;
 	width: 60%;
 }
+}
 
+@mixin ikiwiki-blogform {
 .blogform,
 #blogform {
 	padding: 10px 10px;
@@ -204,13 +238,17 @@ div.recentchanges {
 	width: auto;
 	overflow: auto;
 }
+}
 
+@mixin ikiwiki-inlinepage {
 .inlinepage {
 	padding: 10px 10px;
 	border: 1px solid #aaa;
 	overflow: auto;
 }
+}
 
+@mixin ikiwiki-authorship {
 .pagedate,
 .pagelicense,
 .pagecopyright {
@@ -218,11 +256,15 @@ div.recentchanges {
 	display: block;
 	margin-top: 1em;
 }
+}
 
+@mixin ikiwiki-debug {
 .error {
 	color: #C00;
 }
+}
 
+@mixin ikiwiki-plugin-sidebar {
 .sidebar {
 	width: 20ex;
 	float: right;
@@ -234,7 +276,9 @@ div.recentchanges {
 	border: 1px solid black;
 	color: black !important;
 }
+}
 
+@mixin ikiwiki-plugin-poll {
 hr.poll {
 	height: 10pt;
 	color: white !important;
@@ -248,11 +292,15 @@ div.poll {
 	padding: 1ex 1ex;
 	border: 1px solid #aaa;
 }
+}
 
+@mixin ikiwiki-plugin-color {
 span.color {
 	padding: 2px;
 }
+}
 
+@mixin ikiwiki-plugin-comments {
 .comment-header,
 .microblog-header {
 	font-style: italic;
@@ -276,7 +324,9 @@ span.color {
 	border: 1px solid #aaa;
 	padding: 3px;
 }
+}
 
+@mixin ikiwiki-plugin-progress {
 div.progress {
 	margin-top: 1ex;
 	margin-bottom: 1ex;
@@ -293,7 +343,9 @@ div.progress-done {
 	text-align: center;
 	padding: 1px;
 }
+}
 
+@mixin ikiwiki-print {
 /* things to hide in printouts */
 @media print {
 	.actions {
@@ -321,7 +373,9 @@ div.progress-done {
 		display: none;
 	}
 }
+}
 
+@mixin ikiwiki-infobox {
 /* infobox template */
 .infobox {
 	float: right;
@@ -333,7 +387,9 @@ div.progress-done {
 	background: white;
 	color: black !important;
 }
+}
 
+@mixin ikiwiki-notebook {
 /* notebox template */
 .notebox {
 	float: right;
@@ -346,7 +402,9 @@ div.progress-done {
 	background: white;
 	color: black !important;
 }
+}
 
+@mixin ikiwiki-popup {
 /* popup template and backlinks hiding */
 .popup {
 	border-bottom: 1px dotted #366;
@@ -369,7 +427,9 @@ div.progress-done {
 	background-color: #dee;
 	color: black;
 }
+}
 
+@mixin ikiwiki-forms {
 /* form styling */
 fieldset {
 	margin: 1ex 0;
@@ -419,7 +479,9 @@ input#searchbox {
 .fb_required {
 	font-weight: bold;
 }
+}
 
+@mixin ikiwiki-plugin-highlight {
 /* highlight plugin */
 pre.hl {
 	color: #000000;
@@ -485,7 +547,9 @@ pre.hl {
 .hl.kwd {
 	color: #010181;
 }
+}
 
+@mixin ikiwiki-plugin-calendar {
 /* calendar plugin */
 .month-calendar-day-this-day,
 .year-calendar-this-month {
@@ -508,7 +572,9 @@ pre.hl {
 	font-weight: normal;
 	font-size: 150%;
 }
+}
 
+@mixin ikiwiki-lists {
 /* outlines */
 li.L1 {
 	list-style: upper-roman;
@@ -541,7 +607,9 @@ li.L7 {
 li.L8 {
 	list-style: upper-alpha;
 }
+}
 
+@mixin ikiwiki-plugin-pagestats {
 /* tag cloud */
 .pagecloud {
 	float: right;
@@ -572,7 +640,9 @@ li.L8 {
 .biggestPC {
 	font-size: 130%;
 }
+}
 
+@mixin ikiwiki-feedbutton {
 /* orange feed button */
 .feedbutton {
 	background: #ff6600;
@@ -593,11 +663,15 @@ li.L8 {
 	color: white !important;
 	background: #ff9900;
 }
+}
 
+@mixin ikiwiki-plugin-flattr {
 .FlattrButton {
 	display: none;
 }
+}
 
+@mixin ikiwiki-plugin-openid {
 /* openid selector */
 #openid_choice {
 	display: none;
@@ -643,7 +717,9 @@ a.openid_large_btn:focus {
 .openid_selected {
 	border: 4px solid #DDD;
 }
+}
 
+@mixin ikiwiki-plugin-attachment {
 .fileupload-content .ui-progressbar {
 	width: 200px;
 	height: 20px;
@@ -651,11 +727,119 @@ a.openid_large_btn:focus {
 .fileupload-content .ui-progressbar-value {
 	background: url(ikiwiki/images/pbar-ani.gif);
 }
+}
 
+// all styles in same order as original Ikiwiki stylesheet
+@mixin ikiwiki-style-legacy {
+	@include ikiwiki-header;
+	@include ikiwiki-inlineheader;
+	@include ikiwiki-actions;
+	@include ikiwiki-plugin-po;
+	@include ikiwiki-inlinecontent;
+	@include ikiwiki-footer;
+	@include ikiwiki-pageinfo;
+	@include ikiwiki-tags;
+	@include ikiwiki-plugin-map;
+	@include ikiwiki-plugin-img;
+	@include ikiwiki-alignment;
+	@include ikiwiki-backlinks;
+	@include ikiwiki-plugin-search;
+	@include ikiwiki-plugin-editpage;
+	@include ikiwiki-images;
+	@include ikiwiki-pre;
+	@include ikiwiki-plugin-recentchanges;
+	@include ikiwiki-blogform;
+	@include ikiwiki-inlinepage;
+	@include ikiwiki-authorship;
+	@include ikiwiki-debug;
+	@include ikiwiki-plugin-sidebar;
+	@include ikiwiki-plugin-poll;
+	@include ikiwiki-plugin-color;
+	@include ikiwiki-plugin-comments;
+	@include ikiwiki-plugin-progress;
+	@include ikiwiki-print;
+	@include ikiwiki-infobox;
+	@include ikiwiki-notebook;
+	@include ikiwiki-popup;
+	@include ikiwiki-forms;
+	@include ikiwiki-plugin-highlight;
+	@include ikiwiki-plugin-calendar;
+	@include ikiwiki-lists;
+	@include ikiwiki-plugin-pagestats;
+	@include ikiwiki-feedbutton;
+	@include ikiwiki-plugin-flattr;
+	@include ikiwiki-plugin-openid;
+	@include ikiwiki-plugin-attachment;
+}
+
+@mixin ikiwiki-style-basic {
+}
+@mixin ikiwiki-style-site {
+	@include ikiwiki-header;
+	@include ikiwiki-inlineheader;
+	@include ikiwiki-actions;
+	@include ikiwiki-inlinecontent;
+	@include ikiwiki-footer;
+	@include ikiwiki-pageinfo;
+	@include ikiwiki-tags;
+	@include ikiwiki-backlinks;
+	@include ikiwiki-blogform;
+	@include ikiwiki-inlinepage;
+	@include ikiwiki-authorship;
+}
+@mixin ikiwiki-typography {
+	@include ikiwiki-pre;
+}
+@mixin ikiwiki-links {
+}
+@mixin ikiwiki-buttons {
+	@include ikiwiki-feedbutton;
+}
+@mixin ikiwiki-tabs {
+}
+@mixin ikiwiki-misc {
+	@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-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-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;
 }
 
 @mixin ikiwiki {
 	@include ikiwiki-boilerplate;
 	@include ikiwiki-reset;
-	@include ikiwiki-style;
+	@include ikiwiki-style-legacy;
 }