From 972d58b876bf70eac0697dd22ed4d4998ffc4e80 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Thu, 5 Jun 2014 02:02:27 -0700
Subject: [PATCH] consolidate post-column into topic-body

---
 .../javascripts/discourse/templates/post.js.handlebars |  2 +-
 .../javascripts/discourse/views/reply_history.js       |  2 +-
 app/assets/stylesheets/desktop/topic-post.scss         | 10 ++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index 58b632e7875..7fd1635b35f 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -36,7 +36,7 @@
       {{/if}}
     </div>
 
-    <div class='topic-body post-column'>
+    <div class='topic-body'>
       <div class='topic-meta-data'>
         {{poster-name post=this expandAction="showPosterExpansion"}}
         <div class='post-info'>
diff --git a/app/assets/javascripts/discourse/views/reply_history.js b/app/assets/javascripts/discourse/views/reply_history.js
index feadca4f181..b29749c0323 100644
--- a/app/assets/javascripts/discourse/views/reply_history.js
+++ b/app/assets/javascripts/discourse/views/reply_history.js
@@ -8,7 +8,7 @@
 **/
 Discourse.ReplyHistory = Em.CollectionView.extend({
   tagName: 'section',
-  classNameBindings: [':embedded-posts', ':top', ':post-column', ':offset2', 'hidden'],
+  classNameBindings: [':embedded-posts', ':top', ':topic-body', ':offset2', 'hidden'],
   itemViewClass: Discourse.EmbeddedPostView,
   hidden: Em.computed.equal('content.length', 0),
   previousPost: true
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index ad7a042195e..e5fb82487fd 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -268,7 +268,7 @@ nav.post-controls {
     max-width: 720px;
     }
   }
-  &.top.post-column {padding-left: 0;}
+  &.top.topic-body {padding-left: 0;}
     .topic-body, .topic-avatar {border: none;}
     .topic-avatar {padding-left: 15px;}
     .post-date {color: scale-color($primary, $lightness: 50%);}
@@ -764,6 +764,7 @@ blockquote { /* solo quotes */
 }
 
 .topic-body {
+  width: 695px;
   float: left;
   position: relative;
   border-top: 1px solid scale-color-diff();
@@ -794,13 +795,6 @@ blockquote { /* solo quotes */
 
 //columns
 
-.post-column {
-  width: 695px;
-  float: left;
-  padding-left: 10px;
-  padding-right: 10px;
-  }
-
 .span11 {
   width: 84%;
   padding-left: 4%;