Tighten SCSS to use cascading internally, and ise Compass floats and inline-list.

1 files changed, 23 insertions, 26 deletions

diff --git a/style.scss b/style.scss
index e8cf083..a967abf 100644
--- a/style.scss
+++ b/style.scss
@@ -1,5 +1,6 @@
 @import "h5bp";
 @import "../shared/themes/default/ikiwiki";
+@import "compass";
 
 $link-color: #9c0000;
 $link-hover-color: #600;
@@ -42,16 +43,18 @@ a {
 }
 .header {
 	width: 90%;
-}
-.header #searchform {
-	right: 0;
-}
-.pageheader .actions {
-	position: absolute;
-}
-.pageheader .actions ul,
-.pageheader #otherlanguages {
-	border-bottom: inherit;
+	#searchform {
+		right: 0;
+	}
+}
+.pageheader {
+	.actions {
+		position: absolute;
+	}
+	.actions ul,
+	#otherlanguages {
+		border-bottom: inherit;
+	}
 }
 .topbar,
 .pagerights,
@@ -60,25 +63,19 @@ a {
 	padding: 0 .3em;
 	background: #9c9c63;
 	text-align: right;
+	p {
+		line-height: 1.2em;
+	}
 }
 .topbar,
 .pagerights {
 	font-size: small;
 }
-.topbar p,
-.pagerights p,
-.pagedate p {
-	line-height: 1.2em;
-}
 .topbar ul {
-	list-style-type: none;
-	padding: 0;
-}
-.topbar ul li {
-	display: inline;
+	@include inline-list;
 }
 #pagebody {
-	float: left;
+	@include float-left;
 	width: 100%;
 	background-image: url(pictoman_big.gif);
 	background-attachment: fixed;
@@ -89,7 +86,7 @@ a {
 	margin: 0 11% 0 16%;
 }
 .sidebar {
-	float: left;
+	@include float-left;
 	background-color: inherit;
 	width: 15%;
 	border: none;
@@ -97,12 +94,12 @@ a {
 	margin-left: -100%;
 	padding: 0;
 	text-align: right;
-}
-.sidebar p {
-	margin: 2em 0;
+	p {
+		margin: 2em 0;
+	}
 }
 .farbar {
-	float: left;
+	@include float-left;
 	width: 10%;
 	margin-left: -10%;
 }