A saner rhythm.

1 files changed, 28 insertions, 38 deletions

diff --git a/style.scss b/style.scss
index b384ce3..e311f1c 100644
--- a/style.scss
+++ b/style.scss
@@ -2,32 +2,27 @@
 @import "../shared/themes/default/style";
 @import "compass/typography/vertical_rhythm";
 
-$round-to-nearest-half-line: true;
-
 @include h5bp-normalize;
 
 @include establish-baseline;
 
 h1 {
 	color: DarkRed;
-	@include adjust-font-size-to(2 * $base-font-size, 1);
+	@include adjust-font-size-to(32px);
+	@include rhythm;
 }
 
 h2 {
-	@include adjust-font-size-to(1.4 * $base-font-size, 1.5);
+	@include adjust-font-size-to(24px);
+	@include rhythm;
 }
 
 h3 {
-	@include adjust-font-size-to(1.1 * $base-font-size, 1.6em / $base-rhythm-unit);
+	@include adjust-font-size-to(16px);
+	@include rhythm(1);
 	font-weight: bold;
 }
 
-h1,
-h2,
-h3 {
-	@include trailer (.1);
-}
-
 h4,
 h5,
 h6 {
@@ -44,7 +39,7 @@ a {
 }
 
 p {
-	@include rhythm(.2em / $base-rhythm-unit, $trailer: 1.2em / $base-rhythm-unit);
+	@include rhythm;
 }
 
 em {
@@ -60,7 +55,7 @@ body {
 }
 
 div.header {
-	padding: rhythm(.5em / $base-rhythm-unit) 0 0 1.5em;
+	padding: rhythm(.5) 0 0 1em;
 	background-color: LightBlue;
 	color: LightBlue;
 }
@@ -69,12 +64,12 @@ span.author,
 div.recentchanges,
 span.committype,
 div#footer {
-	@include adjust-font-size-to(.8 * $base-font-size);
+	@include adjust-font-size-to(8px);
 }
 
 div.pageheader span.title {
 	color: white;
-	@include adjust-font-size-to(1.2 * $base-font-size, .8);
+	@include adjust-font-size-to(18px);
 }
 
 span.parentlinks {
@@ -104,9 +99,9 @@ div.actions ul {
 
 div#topbar,
 div.topbar {
-	height: rhythm(2.5);
+	height: rhythm(2);
 	margin: 0;
-	padding: rhythm(20px / $base-line-height) 0;
+	padding: rhythm() 0;
 	background-color: LightBlue;
 	text-align: center;
 	text-transform: uppercase;
@@ -138,7 +133,7 @@ div.topbar ul,
 div.topbar ul li,
 div.topbar ol,
 div.topbar ol li {
-	@include adjust-font-size-to(1.1 * $base-font-size, 2em / $base-rhythm-unit);
+	@include adjust-font-size-to(18px);
 }
 
 div#topbar img,
@@ -152,17 +147,15 @@ div#pagebody {
 	width: 100%;
 }
 
-// FIXME: use vertical rhythm
 div#content {
-	min-height: 480px;
+	min-height: rhythm(25);
 	max-width: 48em;
-	margin: 2% 40% 2% 20%;
+	margin: rhythm() 40% rhythm(2) 20%;
 	padding: 0;
 	text-align: left;
 	background-color: none;
 }
 
-// FIXME: use vertical rhythm
 div#content IMG {
 	display: block;
 	clear: both;
@@ -170,19 +163,19 @@ div#content IMG {
 	width: 50%;
 	max-width: 200px;
 	margin-right: -50%;
-	padding: 0 5% 5%;
+	padding: 0 rhythm() rhythm();
 	background-color: none;
 }
 
 div.inlinepage {
 	border: 0;
-	padding: 1em;
+	padding: rhythm(.5);
 	margin: 0 -1em;
 	background-color: LightYellow;
 }
 
 div.inlinepage SPAN.header a {
-	@include adjust-font-size-to(.9 * $base-font-size);
+	@include adjust-font-size-to(14px);
 	font-weight: normal;
 	color: DarkRed;
 }
@@ -191,16 +184,15 @@ div.inlinefooter {
 	display: none;
 }
 
-// FIXME: use vertical rhythm
 div#sidebar,
 div.sidebar {
 	float: left;
-	min-height: 480px;
+	min-height: rhythm(25);
 	width: 14%;
-	padding: 1%;
-	margin-top: 2%;
+	padding: rhythm(.5);
+	margin-top: rhythm();
 	margin-left: -98%;
-	margin-bottom: 2%;
+	margin-bottom: rhythm();
 	border: none;
 	background-color: LightBlue;
 	text-align: left;
@@ -241,16 +233,15 @@ div.sidebar ul li SPAN.selflink {
 	font-weight: bold;
 }
 
-// FIXME: use vertical rhythm
 div#farbar,
 div.farbar {
 	float: left;
-	min-height: 480px;
+	min-height: rhythm(25);
 	width: 14%;
-	margin-top: 2%;
+	margin-top: rhythm();
 	margin-left: -18%;
-	margin-bottom: 2%;
-	padding: 1%;
+	margin-bottom: rhythm(2);
+	padding: rhythm(.5);
 	background-color: LightBlue;
 	text-align: left;
 }
@@ -263,17 +254,16 @@ div#backlinks {
 	display: none;
 }
 
-// FIXME: use vertical rhythm
 div#footer {
 	clear: left;
 	width: 100%;
-	margin: 2% 0 0;
+	margin: rhythm() 0 0;
 }
 
 div#pageinfo {
 	margin: 0;
 	border-top: 0;
-	padding: rhythm(1em / $base-rhythm-unit) 1em rhythm(1em / $base-rhythm-unit) 20px;
+	padding: rhythm(.5) 1em rhythm(.5) 20px;
 	background-color: LightBlue;
 }