From 4177507f99b143a563034ccfd992f184ab4f6c5e Mon Sep 17 00:00:00 2001
From: Justin Hsu <echylon@gmail.com>
Date: Fri, 6 Feb 2015 17:10:24 +0100
Subject: [PATCH] Merge?

---
 css/style.scss | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/css/style.scss b/css/style.scss
index f198170..c12d49a 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -13,6 +13,8 @@ $acc-color: #C51162;
 
 $base-font-size: 16px;
 $base-line-height: 24px;
+$rhythm-unit: "em";
+$min-line-padding: 1px;
 @include establish-baseline;
 
 $text-pad: rhythm(0.5);
@@ -46,15 +48,15 @@ body {
   @include justify-content(flex-start);
 
   h1 {
-    @include adjust-font-size-to(3em, 1/2);
+    @include adjust-font-size-to(3em, 1);
   }
 
   h2 {
-    @include adjust-font-size-to(2em, 1/2);
+    @include adjust-font-size-to(2em, 1);
   }
 
   h3 {
-    @include adjust-font-size-to(1.5em, 1/2);
+    @include adjust-font-size-to(1.5em, 1);
   }
 
   p {
@@ -80,7 +82,7 @@ body {
   padding: $text-pad;
 
   h1 {
-    @include adjust-font-size-to(5em,1/2);
+    @include adjust-font-size-to(5em,1);
     color: white;
   }
 }
@@ -151,14 +153,14 @@ body {
 #mini-header {
   background: $main-color;
   color: white;
-  @include adjust-font-size-to(3em,1/2);
+  @include adjust-font-size-to(3em,1);
   padding: $text-pad;
 }
 
 #mini-header-alt {
   background: $acc-color;
   color: white;
-  @include adjust-font-size-to(3em,1/2);
+  @include adjust-font-size-to(3em,1);
   padding: $text-pad;
 }