From 115c4cddded6594fc29f1469ae29f277057628c9 Mon Sep 17 00:00:00 2001
From: Siri Reiter <siri@jones.dk>
Date: Sun, 1 Dec 2013 22:11:54 +0100
Subject: Use h5bp, and tidy misc. details.

---
 local.scss               | 264 ----------------------------------------------
 partials/_base-h5bp.scss |   5 +
 partials/_base.scss      |  10 ++
 style.scss               | 265 +++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 280 insertions(+), 264 deletions(-)
 delete mode 100644 local.scss
 create mode 100644 partials/_base-h5bp.scss
 create mode 100644 partials/_base.scss
 create mode 100644 style.scss

diff --git a/local.scss b/local.scss
deleted file mode 100644
index 4b5227b..0000000
--- a/local.scss
+++ /dev/null
@@ -1,264 +0,0 @@
-h1 {
-	color: DarkRed;
-}
-
-h1,
-h2,
-h3 {
-	margin-bottom: 0.1em;
-}
-
-h4,
-h5,
-h6 {
-	text-decoration: blink;
-}
-
-h2 {
-	font-size: 1.4em;
-}
-
-h3 {
-	font-size: 1.1em;
-	font-weight: bold;
-	line-height: 1.6em;
-}
-
-a {
-	color: darkblue;
-	font-weight: normal;
-}
-
-p {
-	margin-top: 0.2em;
-	margin-bottom: 1.2em;
-}
-
-body {
-	margin: 0;
-	background-color: white;
-	font-family: sans-serif;
-}
-
-.header {
-	padding: 0;
-	background-color: LightBlue;
-	color: LightBlue;
-}
-
-.header,
-.author,
-.recentchanges,
-.committype,
-#footer {
-	font-size: 80%;
-}
-
-.pageheader .title {
-	display: none;
-}
-
-.parentlinks {
-	display: none;
-}
-
-#searchform {
-	margin: 20px;
-}
-
-.pageheader .actions {
-	background-color: LightBlue;
-}
-
-.actions ul {
-	border-bottom: 0;
-	padding:0 0 0 15px;
-}
-
-.topbar {
-	height: 60px;
-	margin: 0;
-	padding: 20px 0;
-	background-color: LightBlue;
-	text-align: center;
-	text-transform: uppercase;
-	letter-spacing: 1px;
-}
-
-.topbar p {
-	float: left;
-}
-
-.topbar a {
-	font-weight: bold;
-}
-
-.topbar ul {
-	list-style-type:none;
-	margin: 0;
-	padding: 0;
-}
-
-.topbar ul li {
-	display:inline;
-	margin: 0 20px;
-}
-
-.topbar li,
-.topbar ul,
-.topbar ul li,
-.topbar ol,
-.topbar ol li {
-	font-size: 1.1em;
-	line-height: 2em;
-}
-
-.topbar img {
-	margin: 0 20px;
-}
-
-#wrapper,
-#pagebody {
-	float: left;
-	width: 100%;
-}
-
-#content {
-	min-height: 480px;
-	max-width: 48em;
-	margin: 2% 40% 2% 20%;
-	padding: 0;
-	text-align: left;
-	background-color: none;
-}
-
-#content img {
-	display: block;
-	clear: both;
-	float: right;
-	width: 50%;
-	max-width: 200px;
-	margin-right: -50%;
-	padding: 0 5% 5%;
-	background-color: none;
-}
-
-#content img.solo {
-	float: left;
-	margin: 0 5% 5% 0;
-	padding: 0;
-}
-#content img.x2470x3783 {
-	height:3783px;
-	width: 2470px;
-	max-width: 2470px;
-}
-#content img.x1000x750 {
-	height: 750px;
-	width: 1000px;
-	max-width: 1000px;
-}
-#content img.x108x132 {
-	height: 132px;
-	width: 108px;
-	max-width: 108px;
-}
-
-.inlinepage {
-	border: 0;
-	padding: 1em;
-	margin: 0 -1em;
-	background-color: LightYellow;
-}
-
-.inlinepage .header a {
-	font-size: 0.9em;
-	font-weight: normal;
-	color: DarkRed;
-}
-
-.inlinefooter {
-	display: none;
-}
-
-.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;
-}
-
-.sidebar ul {
-	padding-left: 0.5em;
-	margin-bottom:0;
-	margin-top:0;
-}
-
-.sidebar ul li {
-	list-style-type: none;
-	padding: 0;
-}
-
-.sidebar ul li,
-.sidebar ul li p {
-	margin-bottom: 0;
-	line-height: 1em;
-}
-
-.sidebar ul li a {
-	font-weight: normal;
-}
-
-.sidebar ul li .selflink {
-	color: DarkBlue;
-	font-weight: bold;
-}
-
-.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;
-}
-
-.tags {
-	display: none;
-}
-
-#backlinks {
-	display: none;
-}
-
-#footer {
-	clear: left;
-	width: 100%;
-	margin: 2% 0 0;
-}
-
-#pageinfo {
-	margin: 0;
-	border-top: 0;
-	padding:1em 1em 1em 20px;
-	background-color: LightBlue;
-}
-
-.pagedate {
-	margin-top: 0;
-}
-
-.pagecopyright,
-.pagecopyright P {
-	margin-top: 0;
-	margin-bottom: 0;
-}
diff --git a/partials/_base-h5bp.scss b/partials/_base-h5bp.scss
new file mode 100644
index 0000000..c9ab66b
--- /dev/null
+++ b/partials/_base-h5bp.scss
@@ -0,0 +1,5 @@
+// Compass integration
+//
+// No styleguide reference.
+$font-size: $baseFontSize;
+$line-height: $baseLineHeight;
diff --git a/partials/_base.scss b/partials/_base.scss
new file mode 100644
index 0000000..6302f0a
--- /dev/null
+++ b/partials/_base.scss
@@ -0,0 +1,10 @@
+// Typography
+//
+// No styleguide reference.
+$baseFontSize: 12px;
+$baseLineHeight: ($baseFontSize * 2);
+
+// Framework integrations
+//
+// No styleguide reference.
+@import "base-h5bp";
diff --git a/style.scss b/style.scss
new file mode 100644
index 0000000..7338d71
--- /dev/null
+++ b/style.scss
@@ -0,0 +1,265 @@
+@import "partials/base";
+@import "h5bp";
+@import "compass/typography/links";
+@import "../shared/themes/default/ikiwiki";
+
+// site defaults
+@include h5bp-normalize;
+@include h5bp-main;
+@include ikiwiki-style;
+
+h1 {
+	font-weight: normal;
+	color: DarkRed;
+}
+
+h1,
+h2,
+h3 {
+	margin-bottom: 0.1em;
+}
+
+h4,
+h5,
+h6 {
+	text-decoration: blink;
+}
+
+h2 {
+	font-weight: normal;
+	font-size: 1.4em;
+}
+
+h3 {
+	font-size: 1.1em;
+	font-weight: bold;
+	line-height: 1.6em;
+}
+
+a {
+	@include hover-link;
+	color: darkblue;
+	font-weight: normal;
+}
+
+p {
+	margin-top: 0.2em;
+	margin-bottom: 1.2em;
+}
+
+body {
+	margin: 0;
+	background-color: white;
+	font-family: sans-serif;
+}
+
+.pageheader .title {
+	display: none;
+}
+
+.parentlinks {
+	display: none;
+}
+
+#searchform {
+	margin: 20px;
+}
+
+.pageheader .actions {
+	background-color: LightBlue;
+}
+
+.actions ul {
+	border-bottom: 0;
+	padding:0 0 0 15px;
+}
+
+.topbar {
+	height: 60px;
+	margin: 0;
+	padding: 20px 0;
+	background-color: LightBlue;
+	text-align: center;
+	text-transform: uppercase;
+	letter-spacing: 1px;
+}
+
+.topbar p {
+	float: left;
+}
+
+.topbar a {
+	font-weight: bold;
+}
+
+.topbar ul {
+	list-style-type:none;
+	margin: 0;
+	padding: 0;
+}
+
+.topbar ul li {
+	display:inline;
+	margin: 0 20px;
+}
+
+.topbar li,
+.topbar ul,
+.topbar ul li,
+.topbar ol,
+.topbar ol li {
+	font-size: 1.1em;
+	line-height: 2em;
+}
+
+.topbar img {
+	margin: 0 20px;
+}
+
+#wrapper,
+#pagebody {
+	float: left;
+	width: 100%;
+}
+
+#content {
+	min-height: 480px;
+	max-width: 48em;
+	margin: 2% 40% 2% 20%;
+	padding: 0;
+	text-align: left;
+	background-color: none;
+}
+
+#content img {
+	display: block;
+	clear: both;
+	float: right;
+	width: 50%;
+	max-width: 200px;
+	margin-right: -50%;
+	padding: 0 5% 5%;
+	background-color: none;
+}
+
+#content img.solo {
+	float: left;
+	margin: 0 5% 5% 0;
+	padding: 0;
+}
+#content img.x2470x3783 {
+	height:3783px;
+	width: 2470px;
+	max-width: 2470px;
+}
+#content img.x1000x750 {
+	height: 750px;
+	width: 1000px;
+	max-width: 1000px;
+}
+#content img.x108x132 {
+	height: 132px;
+	width: 108px;
+	max-width: 108px;
+}
+
+.inlinepage {
+	border: 0;
+	padding: 1em;
+	margin: 0 -1em;
+	background-color: LightYellow;
+}
+
+.inlinepage .header a {
+	font-weight: normal;
+	color: DarkRed;
+}
+
+.inlinefooter {
+	display: none;
+}
+
+.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;
+}
+
+.sidebar ul {
+	padding-left: 0.5em;
+	margin-bottom:0;
+	margin-top:0;
+	p {
+		margin: 1em 0;
+	}
+}
+
+.sidebar ul li {
+	list-style-type: none;
+	padding: 0;
+}
+
+.sidebar ul li,
+.sidebar ul li p {
+	margin-bottom: 0;
+	line-height: 1em;
+}
+
+.sidebar ul li a {
+	font-weight: normal;
+}
+
+.sidebar ul li .selflink {
+	color: DarkBlue;
+	font-weight: bold;
+}
+
+.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;
+}
+
+.tags {
+	display: none;
+}
+
+#backlinks {
+	display: none;
+}
+
+#footer {
+	clear: left;
+	width: 100%;
+	margin: 2% 0 0;
+}
+
+#pageinfo {
+	margin: 0;
+	border-top: 0;
+	padding:1em 1em 1em 20px;
+	background-color: LightBlue;
+}
+
+.pagedate {
+	margin-top: 0;
+}
+
+.pagecopyright,
+.pagecopyright P {
+	margin-top: 0;
+	margin-bottom: 0;
+}
-- 
cgit v1.2.3