From a001232ff30e09112bb60f449c9b6727d130efa2 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Sun, 24 Mar 2013 02:26:54 -0700
Subject: [PATCH] move h1-h6 margins into topic-body

---
 app/assets/stylesheets/application/topic-post.css.scss | 4 +++-
 app/assets/stylesheets/vendor/bootstrap.css.scss       | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index c6a678956..644937221 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -586,7 +586,9 @@
 .topic-body {
   position: relative;
 
-
+  h1, h2, h3, h4, h5, h6 {
+    margin: 20px 0 10px;
+  }
 
   // this is the little pointy bit of the speech bubble on the post, on the left side
   &:before,
diff --git a/app/assets/stylesheets/vendor/bootstrap.css.scss b/app/assets/stylesheets/vendor/bootstrap.css.scss
index 8e4c6919e..9090c65f3 100644
--- a/app/assets/stylesheets/vendor/bootstrap.css.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.css.scss
@@ -395,16 +395,12 @@ body {
   }
 
   h1, h2, h3, h4, h5, h6 {
-    margin: 20px 0 10px;
+    margin: 0;
     font-family: inherit;
     font-weight: bold;
     color: inherit;
     text-rendering: optimizelegibility;
   }
-  h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
-    font-weight: normal;
-    color: #999999;
-  }
   h1 {
     font-size: 30px;
     line-height: 36px;