From f245da51421511c0203272fee7524579e645f586 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Thu, 5 Jun 2014 02:29:56 -0700
Subject: [PATCH] f**ing bootstrap, span11 = .embedded-posts body

---
 .../templates/embedded_post.js.handlebars     |  2 +-
 app/assets/stylesheets/desktop/discourse.scss |  4 ----
 .../stylesheets/desktop/topic-post.scss       | 22 +++++++++----------
 app/assets/stylesheets/vendor/bootstrap.scss  |  3 ---
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
index 4b0d970f700..5b23a0423bf 100644
--- a/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/embedded_post.js.handlebars
@@ -6,7 +6,7 @@
       </div>
     </div>
   </div>
-  <div class='span11 topic-body'>
+  <div class='topic-body'>
     <div class="topic-meta-data">
       <h5 {{bind-attr class="staff new_user"}}><a href='{{unbound usernameUrl}}'>{{{breakUp username name}}}</a></h5>
       {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 9f5db9f77a3..bd438c586e3 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -569,10 +569,6 @@ body {
   width: 664px;
   float: left;
 }
-.span11 {
-  width: 560px;
-  float: left;
-}
 .span10 {
   width: 508px;
   float: left;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index e5fb82487fd..4b693af6865 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -249,40 +249,43 @@ nav.post-controls {
 .embedded-posts {
   h1, h2, h3 {margin: 10px 0;}
   a.mention {background: darken(scale-color-diff(), 10%);}
+
+  .topic-body { width: 610px; border: none; }
+
+  // bottom means "reply expansion" below a post
   &.bottom {
     &.hidden {display: block; opacity: 0; }
-
   }
   &.bottom .arrow {float: right; margin: 0 0 0 0;}
-  &.top {
+  &.bottom { margin-top: -11px;}
 
+  // top means "in reply to expansion" above a post
+  &.top {
     margin-left: 66px;
     max-width: 713px;
-
     @include medium-width {
     margin-left: 59px;
     }
-
     @include small-width {
     margin-left: 57px;
     max-width: 720px;
     }
   }
   &.top.topic-body {padding-left: 0;}
-    .topic-body, .topic-avatar {border: none;}
-    .topic-avatar {padding-left: 15px;}
+    .topic-avatar {border: none; padding-left: 15px;}
     .post-date {color: scale-color($primary, $lightness: 50%);}
     .fa-arrow-up {margin-left: 5px;}
     .row {border-top: 1px solid darken(scale-color-diff(), 10%); padding-top: 7px;}
     .reply:first-of-type .row {border-top: none;}
     .quote {margin-top: 0 !important;}
   background: scale-color-diff();
+
   .quote .title, blockquote, .onebox, .onebox-result {
     background: darken(scale-color-diff(), 5%);
     border-left: 5px solid darken(scale-color-diff(), 12%);
   }
 
-  &.bottom { margin-top: -11px;}
+
   .topic-meta-data {
     position: relative;
   }
@@ -795,11 +798,6 @@ blockquote { /* solo quotes */
 
 //columns
 
-.span11 {
-  width: 84%;
-  padding-left: 4%;
-}
-
 .span5 {
   width: 19%;
   padding-left: 1%;
diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss
index a22b45719d6..3b213ca7490 100644
--- a/app/assets/stylesheets/vendor/bootstrap.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.scss
@@ -46,9 +46,6 @@ img {
 .span13 {
   width: 664px;
 }
-.span11 {
-  width: 560px;
-}
 .span10 {
   width: 508px;
 }