From 05adaf31c1333ad57d2286e0eee8377370a9f9f7 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 25 Sep 2013 11:42:29 +0200
Subject: Override and extend style.css (instead of adding local.css).

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

diff --git a/local.scss b/local.scss
deleted file mode 100644
index f516aa6..0000000
--- a/local.scss
+++ /dev/null
@@ -1,281 +0,0 @@
-h1 {
-	color: DarkRed;
-	font-size: 2em;
-}
-
-h2 {
-	font-size: 1.4em;
-}
-
-h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	line-height: 1.6em;
-}
-
-h1,
-h2,
-h3 {
-	margin-bottom: 0.1em;
-}
-
-h4,
-h5,
-h6 {
-	text-decoration: blink;
-}
-
-a {
-	color: darkblue;
-	font-weight: normal;
-	text-decoration: none;
-	&:hover {
-		text-decoration: underline;
-	}
-}
-
-p {
-	margin-top: 0.2em;
-	margin-bottom: 1.2em;
-}
-
-em {
-	font-weight: bold;
-}
-
-ol, ul {
-	list-style: disc inside none;
-}
-
-body {
-	margin: 0;
-	background-color: white;
-	font-size: 100%;
-	font-family: Helvetica, Verdana, Sans-serif;
-	line-height: 1.5;
-}
-
-div.header {
-	padding: 0.5em 0 0 1.5em;
-	background-color: LightBlue;
-	color: LightBlue;
-}
-
-span.author,
-div.recentchanges,
-span.committype,
-div#footer {
-	font-size: 80%;
-}
-
-div.pageheader span.title {
-	color: white;
-	font-size: 1.2em;
-}
-
-span.parentlinks {
-	display: none;
-}
-
-FORM#searchform {
-	margin: 0 2em 0 0;
-}
-
-div.pageheader div.actions {
-	background-color: LightBlue;
-	ul {
-		border-bottom: none;
-	}
-}
-
-div.actions ul {
-	padding: 1em 0 0.5em 2em;
-	a {
-	color: Lightblue;
-		&:hover {
-		color: white;
-		}
-	}
-}
-
-div#topbar,
-div.topbar {
-	height: 60px;
-	margin: 0;
-	padding: 20px 0;
-	background-color: LightBlue;
-	text-align: center;
-	text-transform: uppercase;
-	letter-spacing: 1px;
-	p {
-		float: left;
-	}
-	a {
-		font-weight: bold;
-	}
-	ul {
-		list-style-type:none;
-		margin: 0;
-		padding: 0;
-		li {
-			display:inline;
-			margin: 0 20px;
-		}
-	}
-}
-
-div#topbar li,
-div#topbar ul,
-div#topbar ul li,
-div#topbar ol,
-div#topbar ol li,
-div.topbar li,
-div.topbar ul,
-div.topbar ul li,
-div.topbar ol,
-div.topbar ol li {
-	font-size: 1.1em;
-	line-height: 2em;
-}
-
-div#topbar img,
-div.topbar img {
-	margin: 0 20px;
-}
-
-div#wrapper,
-div#pagebody {
-	float: left;
-	width: 100%;
-}
-
-div#content {
-	min-height: 480px;
-	max-width: 48em;
-	margin: 2% 40% 2% 20%;
-	padding: 0;
-	text-align: left;
-	background-color: none;
-}
-
-div#content IMG {
-	display: block;
-	clear: both;
-	float: right;
-	width: 50%;
-	max-width: 200px;
-	margin-right: -50%;
-	padding: 0 5% 5%;
-	background-color: none;
-}
-
-div.inlinepage {
-	border: 0;
-	padding: 1em;
-	margin: 0 -1em;
-	background-color: LightYellow;
-}
-
-div.inlinepage SPAN.header a {
-	font-size: 0.9em;
-	font-weight: normal;
-	color: DarkRed;
-}
-
-div.inlinefooter {
-	display: none;
-}
-
-div#sidebar,
-div.sidebar {
-	float: left;
-	min-height: 480px;
-	width: 14%;
-	padding: 1%;
-	margin-top: 2%;
-	margin-left: -98%;
-	margin-bottom: 2%;
-	border: none;
-	background-color: LightBlue;
-	text-align: left;
-}
-
-div#sidebar ul,
-div.sidebar ul {
-	padding-left: 0.5em;
-	margin-bottom:0;
-	margin-top:0;
-}
-
-div#sidebar ul li,
-div.sidebar ul li {
-	list-style-type: none;
-	padding: 0;
-}
-
-div#sidebar ul li,
-div.sidebar ul li,
-div#sidebar ul li p,
-div.sidebar ul li p {
-	margin-bottom: 0;
-	line-height: 1.5em;
-}
-
-div#sidebar ul li a,
-div.sidebar ul li a {
-	font-weight: normal;
-	color: black;
-	&:hover {
-		color: white;
-	}
-}
-
-div#sidebar ul li SPAN.selflink,
-div.sidebar ul li SPAN.selflink {
-	color: white;
-	font-weight: bold;
-}
-
-div#farbar,
-div.farbar {
-	float: left;
-	min-height: 480px;
-	width: 14%;
-	margin-top: 2%;
-	margin-left: -18%;
-	margin-bottom: 2%;
-	padding: 1%;
-	background-color: LightBlue;
-	text-align: left;
-}
-
-div.tags {
-	display: none;
-}
-
-div#backlinks {
-	display: none;
-}
-
-div#footer {
-	clear: left;
-	width: 100%;
-	margin: 2% 0 0;
-}
-
-div#pageinfo {
-	margin: 0;
-	border-top: 0;
-	padding:1em 1em 1em 20px;
-	background-color: LightBlue;
-}
-
-div.pagedate {
-	margin-top: 0;
-}
-
-div.pagecopyright,
-div.pagecopyright P {
-	margin-top: 0;
-	margin-bottom: 0;
-}
diff --git a/style.scss b/style.scss
new file mode 100644
index 0000000..f00cb7c
--- /dev/null
+++ b/style.scss
@@ -0,0 +1,284 @@
+@import "compass/reset";
+@import "../shared/themes/default/style";
+
+h1 {
+	color: DarkRed;
+	font-size: 2em;
+}
+
+h2 {
+	font-size: 1.4em;
+}
+
+h3 {
+	font-size: 1.1em;
+	font-weight: bold;
+	line-height: 1.6em;
+}
+
+h1,
+h2,
+h3 {
+	margin-bottom: 0.1em;
+}
+
+h4,
+h5,
+h6 {
+	text-decoration: blink;
+}
+
+a {
+	color: darkblue;
+	font-weight: normal;
+	text-decoration: none;
+	&:hover {
+		text-decoration: underline;
+	}
+}
+
+p {
+	margin-top: 0.2em;
+	margin-bottom: 1.2em;
+}
+
+em {
+	font-weight: bold;
+}
+
+ol, ul {
+	list-style: disc inside none;
+}
+
+body {
+	margin: 0;
+	background-color: white;
+	font-size: 100%;
+	font-family: Helvetica, Verdana, Sans-serif;
+	line-height: 1.5;
+}
+
+div.header {
+	padding: 0.5em 0 0 1.5em;
+	background-color: LightBlue;
+	color: LightBlue;
+}
+
+span.author,
+div.recentchanges,
+span.committype,
+div#footer {
+	font-size: 80%;
+}
+
+div.pageheader span.title {
+	color: white;
+	font-size: 1.2em;
+}
+
+span.parentlinks {
+	display: none;
+}
+
+FORM#searchform {
+	margin: 0 2em 0 0;
+}
+
+div.pageheader div.actions {
+	background-color: LightBlue;
+	ul {
+		border-bottom: none;
+	}
+}
+
+div.actions ul {
+	padding: 1em 0 0.5em 2em;
+	a {
+	color: Lightblue;
+		&:hover {
+		color: white;
+		}
+	}
+}
+
+div#topbar,
+div.topbar {
+	height: 60px;
+	margin: 0;
+	padding: 20px 0;
+	background-color: LightBlue;
+	text-align: center;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+	p {
+		float: left;
+	}
+	a {
+		font-weight: bold;
+	}
+	ul {
+		list-style-type:none;
+		margin: 0;
+		padding: 0;
+		li {
+			display:inline;
+			margin: 0 20px;
+		}
+	}
+}
+
+div#topbar li,
+div#topbar ul,
+div#topbar ul li,
+div#topbar ol,
+div#topbar ol li,
+div.topbar li,
+div.topbar ul,
+div.topbar ul li,
+div.topbar ol,
+div.topbar ol li {
+	font-size: 1.1em;
+	line-height: 2em;
+}
+
+div#topbar img,
+div.topbar img {
+	margin: 0 20px;
+}
+
+div#wrapper,
+div#pagebody {
+	float: left;
+	width: 100%;
+}
+
+div#content {
+	min-height: 480px;
+	max-width: 48em;
+	margin: 2% 40% 2% 20%;
+	padding: 0;
+	text-align: left;
+	background-color: none;
+}
+
+div#content IMG {
+	display: block;
+	clear: both;
+	float: right;
+	width: 50%;
+	max-width: 200px;
+	margin-right: -50%;
+	padding: 0 5% 5%;
+	background-color: none;
+}
+
+div.inlinepage {
+	border: 0;
+	padding: 1em;
+	margin: 0 -1em;
+	background-color: LightYellow;
+}
+
+div.inlinepage SPAN.header a {
+	font-size: 0.9em;
+	font-weight: normal;
+	color: DarkRed;
+}
+
+div.inlinefooter {
+	display: none;
+}
+
+div#sidebar,
+div.sidebar {
+	float: left;
+	min-height: 480px;
+	width: 14%;
+	padding: 1%;
+	margin-top: 2%;
+	margin-left: -98%;
+	margin-bottom: 2%;
+	border: none;
+	background-color: LightBlue;
+	text-align: left;
+}
+
+div#sidebar ul,
+div.sidebar ul {
+	padding-left: 0.5em;
+	margin-bottom:0;
+	margin-top:0;
+}
+
+div#sidebar ul li,
+div.sidebar ul li {
+	list-style-type: none;
+	padding: 0;
+}
+
+div#sidebar ul li,
+div.sidebar ul li,
+div#sidebar ul li p,
+div.sidebar ul li p {
+	margin-bottom: 0;
+	line-height: 1.5em;
+}
+
+div#sidebar ul li a,
+div.sidebar ul li a {
+	font-weight: normal;
+	color: black;
+	&:hover {
+		color: white;
+	}
+}
+
+div#sidebar ul li SPAN.selflink,
+div.sidebar ul li SPAN.selflink {
+	color: white;
+	font-weight: bold;
+}
+
+div#farbar,
+div.farbar {
+	float: left;
+	min-height: 480px;
+	width: 14%;
+	margin-top: 2%;
+	margin-left: -18%;
+	margin-bottom: 2%;
+	padding: 1%;
+	background-color: LightBlue;
+	text-align: left;
+}
+
+div.tags {
+	display: none;
+}
+
+div#backlinks {
+	display: none;
+}
+
+div#footer {
+	clear: left;
+	width: 100%;
+	margin: 2% 0 0;
+}
+
+div#pageinfo {
+	margin: 0;
+	border-top: 0;
+	padding:1em 1em 1em 20px;
+	background-color: LightBlue;
+}
+
+div.pagedate {
+	margin-top: 0;
+}
+
+div.pagecopyright,
+div.pagecopyright P {
+	margin-top: 0;
+	margin-bottom: 0;
+}
-- 
cgit v1.2.3