From 80a862c358c99efda6ff5d583ef7ac11d4a411fc Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Thu, 5 Jun 2014 00:34:57 -0700
Subject: [PATCH] f**ing bootstrap, span14 = post-column

---
 .../discourse/templates/post.js.handlebars    |  2 +-
 .../discourse/views/reply_history.js          |  2 +-
 app/assets/stylesheets/desktop/discourse.scss |  4 ---
 .../stylesheets/desktop/topic-post.scss       | 25 ++++++++-----------
 app/assets/stylesheets/vendor/bootstrap.scss  |  3 ---
 5 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index faf30fd5e30..1f2c9c071f4 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 span14'>
+    <div class='topic-body post-column'>
       <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 ce230d31917..feadca4f181 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', ':span14', ':offset2', 'hidden'],
+  classNameBindings: [':embedded-posts', ':top', ':post-column', ':offset2', 'hidden'],
   itemViewClass: Discourse.EmbeddedPostView,
   hidden: Em.computed.equal('content.length', 0),
   previousPost: true
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index d1e3c451c08..3af1c65b51f 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -565,10 +565,6 @@ body {
   margin-left: 12px;
   float: left;
 }
-.span14 {
-  width: 716px;
-  float: left;
-}
 .span13 {
   width: 664px;
   float: left;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 20219683a1e..b36812c52bb 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.span14 {padding-left: 0;}
+  &.top.post-column {padding-left: 0;}
     .topic-body, .topic-avatar {border: none;}
     .topic-avatar {padding-left: 15px;}
     .post-date {color: scale-color($primary, $lightness: 50%);}
@@ -737,7 +737,7 @@ blockquote { /* solo quotes */
   float: left;
   margin-top: 15px;
       ul {margin: 0;}
-      padding-left: 10px;
+      padding-left: 8px;
 
   i {font-size: 12px;}
 
@@ -792,10 +792,11 @@ blockquote { /* solo quotes */
 
 //columns
 
-.span14 {
-  width: 68%;
-  padding-left: 1%;
-  padding-right: 1%;
+.post-column {
+  width: 695px;
+  float: left;
+  padding-left: 10px;
+  padding-right: 10px;
   }
 
 .span2 { width: 5%; }
@@ -811,14 +812,10 @@ blockquote { /* solo quotes */
 }
 
 
-@media screen and (max-width: 966px) {
-  .gutter {display: none;}
-  .span14 {
-    width: 78%;
-    padding-left: 1%;
-    padding-right: 1%;
-    max-width: 720px;
-  } //main content
+@media screen and (max-width: 955px) {
+  .span5 {
+    width: 16%;
+  } // tighten right gutter
 }
 
 .row:before, .row:after {
diff --git a/app/assets/stylesheets/vendor/bootstrap.scss b/app/assets/stylesheets/vendor/bootstrap.scss
index 925c58edfa3..8f2bb3ea876 100644
--- a/app/assets/stylesheets/vendor/bootstrap.scss
+++ b/app/assets/stylesheets/vendor/bootstrap.scss
@@ -43,9 +43,6 @@ img {
 .span15 {
   width: 768px;
 }
-.span14 {
-  width: 716px;
-}
 .span13 {
   width: 664px;
 }