From bcb03474d6e11cd7b3aaccc4a765c2a0068b5028 Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Wed, 17 Dec 2014 14:51:47 -0500
Subject: [PATCH] fixing base line-height and big/small abuse

---
 app/assets/stylesheets/common/base/discourse.scss  | 7 +++++--
 app/assets/stylesheets/common/foundation/base.scss | 3 +--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 1617e3a3542..a44139c5e99 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -12,13 +12,16 @@
 }
 
 big {
-  font-size: 2em;
+  font-size: 28px;
 }
 
 small {
-  font-size: 0.714em;
+  font-size: 9px;
 }
 
+//setting a static limit on big and small prevents nesting abuse
+
+
 blockquote {
   background-color: scale-color-diff();
   border-left: 5px solid darken(scale-color-diff(), 10%);
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 37b6d220b3f..f8e044adec2 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -9,8 +9,7 @@ html {
   color: $primary;
   font-family: $base-font-family;
   font-size: $base-font-size;
-  // font: #{$base-font-size}/#{$base-line-height} $base-font-family;
-  // this does not work, see https://meta.discourse.org/t/x/23193/11
+  line-height: $base-line-height;
   background-color: $secondary;
   overflow-y: scroll;
 }