From 550972a99a27b2061d5564c3951cd08f589f7676 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 6 Mar 2012 02:15:54 +0100
Subject: Merge local.css into style.css.

---
 local.scss | 121 -----------------------------------------------------------
 style.scss | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 121 deletions(-)
 delete mode 100644 local.scss
 create mode 100644 style.scss

diff --git a/local.scss b/local.scss
deleted file mode 100644
index 25a2209..0000000
--- a/local.scss
+++ /dev/null
@@ -1,121 +0,0 @@
-/* ikiwiki local style sheet */
-
-BODY {
-	background-color: #84854c;
-}
-A {
-	font-weight: normal;
-}
-A:hover,
-A:visited {
-	color: #660000;
-}
-A:link {
-	color: #9c0000;
-}
-DIV.page {
-	margin: 3% 5%;
-}
-DIV.branding {
-	font-size: x-large;
-}
-DIV.branding-logo,
-DIV.branding-tagline,
-DIV.pagecopyright P,
-DIV.pagelicense P {
-	display: inline;
-}
-DIV.branding-logo a {
-	color: white;
-	font-weight: bold;
-}
-DIV.header,
-DIV.pagedate {
-	font-size: 14px;
-}
-DIV.header,
-DIV.header FORM#searchform {
-	position: absolute;
-	top: .5em;
-}
-DIV.header {
-	width: 90%;
-}
-DIV.header FORM#searchform {
-	right: 0;
-}
-DIV.pageheader DIV.actions {
-	position: absolute;
-}
-DIV.pageheader DIV.actions UL,
-DIV.pageheader DIV#otherlanguages {
-	border-bottom: inherit;
-}
-DIV.topbar,
-DIV.pagerights,
-DIV.pagedate {
-	margin-top: 0;
-	padding: 0 .3em;
-	background: #9c9c63;
-	text-align: right;
-}
-DIV.topbar,
-DIV.pagerights {
-	font-size: small;
-}
-DIV.topbar P,
-DIV.pagerights P,
-DIV.pagedate P {
-	line-height: 1.2em;
-}
-DIV.topbar UL {
-	list-style-type: none;
-	padding: 0;
-}
-DIV.topbar UL LI {
-	display: inline;
-}
-DIV#pagebody {
-	float: left;
-	width: 100%;
-	background-image: url(pictoman_big.gif);
-	background-attachment: fixed;
-	background-repeat: no-repeat;
-	background-position: 80% 150px;
-}
-DIV#content {
-	margin: 0 11% 0 16%;
-}
-DIV.sidebar {
-	float: left;
-	background-color: inherit;
-	width: 15%;
-	border: none;
-	margin-top: 5em;
-	margin-left: -100%;
-	padding: 0;
-	text-align: right;
-}
-DIV.sidebar P {
-	margin: 2em 0;
-}
-DIV.farbar {
-	float: left;
-	width: 10%;
-	margin-left: -10%;
-}
-DIV#pageinfo {
-	border-top: 0 none;
-}
-DIV#backlinks {
-	display: none;
-}
-DIV.pagecopyright,
-DIV.pagelicense,
-DIV.pagedate {
-	margin-top: 0;
-}
-DIV.pagecopyright P,
-DIV.pagelicense P {
-	display: inline;
-}
diff --git a/style.scss b/style.scss
new file mode 100644
index 0000000..b399835
--- /dev/null
+++ b/style.scss
@@ -0,0 +1,124 @@
+@import "compass/reset";
+@import "../shared/themes/default/ikiwiki";
+
+@include ikiwiki-style;
+
+BODY {
+	background-color: #84854c;
+}
+A {
+	font-weight: normal;
+}
+A:hover,
+A:visited {
+	color: #660000;
+}
+A:link {
+	color: #9c0000;
+}
+DIV.page {
+	margin: 3% 5%;
+}
+DIV.branding {
+	font-size: x-large;
+}
+DIV.branding-logo,
+DIV.branding-tagline,
+DIV.pagecopyright P,
+DIV.pagelicense P {
+	display: inline;
+}
+DIV.branding-logo a {
+	color: white;
+	font-weight: bold;
+}
+DIV.header,
+DIV.pagedate {
+	font-size: 14px;
+}
+DIV.header,
+DIV.header FORM#searchform {
+	position: absolute;
+	top: .5em;
+}
+DIV.header {
+	width: 90%;
+}
+DIV.header FORM#searchform {
+	right: 0;
+}
+DIV.pageheader DIV.actions {
+	position: absolute;
+}
+DIV.pageheader DIV.actions UL,
+DIV.pageheader DIV#otherlanguages {
+	border-bottom: inherit;
+}
+DIV.topbar,
+DIV.pagerights,
+DIV.pagedate {
+	margin-top: 0;
+	padding: 0 .3em;
+	background: #9c9c63;
+	text-align: right;
+}
+DIV.topbar,
+DIV.pagerights {
+	font-size: small;
+}
+DIV.topbar P,
+DIV.pagerights P,
+DIV.pagedate P {
+	line-height: 1.2em;
+}
+DIV.topbar UL {
+	list-style-type: none;
+	padding: 0;
+}
+DIV.topbar UL LI {
+	display: inline;
+}
+DIV#pagebody {
+	float: left;
+	width: 100%;
+	background-image: url(pictoman_big.gif);
+	background-attachment: fixed;
+	background-repeat: no-repeat;
+	background-position: 80% 150px;
+}
+DIV#content {
+	margin: 0 11% 0 16%;
+}
+DIV.sidebar {
+	float: left;
+	background-color: inherit;
+	width: 15%;
+	border: none;
+	margin-top: 5em;
+	margin-left: -100%;
+	padding: 0;
+	text-align: right;
+}
+DIV.sidebar P {
+	margin: 2em 0;
+}
+DIV.farbar {
+	float: left;
+	width: 10%;
+	margin-left: -10%;
+}
+DIV#pageinfo {
+	border-top: 0 none;
+}
+DIV#backlinks {
+	display: none;
+}
+DIV.pagecopyright,
+DIV.pagelicense,
+DIV.pagedate {
+	margin-top: 0;
+}
+DIV.pagecopyright P,
+DIV.pagelicense P {
+	display: inline;
+}
-- 
cgit v1.2.3