From 35e6eb5cacf4137ee64e010f39d3ef36763c34cb Mon Sep 17 00:00:00 2001
From: Simon Cossar <scossar3@gmail.com>
Date: Mon, 20 Jul 2015 00:42:52 -0700
Subject: [PATCH 1/5] Add wrap class

---
 app/assets/javascripts/discourse/templates/application.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 6b9b1332196..23822e0f409 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,6 +1,6 @@
 {{render "header"}}
 
-<div id='main-outlet'>
+<div id='main-outlet' class='wrap'>
   {{outlet}}
   {{render "user-card"}}
 </div>

From 8840a611abd9c06723786125de680a864f7a838f Mon Sep 17 00:00:00 2001
From: Simon Cossar <scossar3@gmail.com>
Date: Mon, 20 Jul 2015 00:47:53 -0700
Subject: [PATCH 2/5] Substitute wrap for container

---
 app/assets/stylesheets/common/base/discourse.scss | 5 +++++
 app/assets/stylesheets/desktop/discourse.scss     | 4 ++--
 app/assets/stylesheets/desktop/topic-list.scss    | 3 ---
 app/assets/stylesheets/desktop/topic-post.scss    | 5 +----
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index d9bf6279782..c98c4e891c5 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -4,8 +4,13 @@ img.avatar {
 
 .container {
   @extend .clearfix;
+}
+
+.wrap {
+  @extend .clearfix;
   margin-right: auto;
   margin-left: auto;
+  padding: 8px;
   .contents {
     position: relative;
   }
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 52997e7b1f0..0d117b4ae26 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -6,7 +6,7 @@
   body {
     min-width: $medium-width;
   }
-  .container,
+  .wrap,
   .full-width {
     width: $medium-width;
   }
@@ -17,7 +17,7 @@ and (max-width : 570px) {
   body {
     min-width: 0;
   }
-  .container,
+  .wrap,
   .full-width {
     min-width: 0;
   }
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 45da7a14775..25f3a04cb48 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -303,9 +303,6 @@ and (max-width : 850px) {
   #topic-title {
     padding-left: 10px;
   }
-  .container.posts {
-    padding-left: 10px;
-  }
 
   .nav-pills {
     > li > a {
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 8f051d1e923..99794d40b30 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -1,8 +1,5 @@
-.container {
-  @extend .clearfix;
+.wrap {
   max-width: $large-width;
-  margin-right: auto;
-  margin-left: auto;
 }
 
 .full-width {

From c8085cf576b28369d2a887780e5ffd99c58a1d07 Mon Sep 17 00:00:00 2001
From: Simon Cossar <scossar3@gmail.com>
Date: Mon, 20 Jul 2015 01:01:55 -0700
Subject: [PATCH 3/5] remove top and bottom padding

---
 app/assets/stylesheets/common/base/discourse.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index c98c4e891c5..43da67c1e50 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -10,7 +10,7 @@ img.avatar {
   @extend .clearfix;
   margin-right: auto;
   margin-left: auto;
-  padding: 8px;
+  padding: 0 8px;
   .contents {
     position: relative;
   }

From c47c5dd0c608f366188347a6329a036ae8c32fd3 Mon Sep 17 00:00:00 2001
From: Simon Cossar <scossar3@gmail.com>
Date: Mon, 20 Jul 2015 01:02:51 -0700
Subject: [PATCH 4/5] Substitute wrap for container

---
 app/assets/javascripts/discourse/templates/header.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 4d71d1eb220..3a8bd239ed7 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -1,4 +1,4 @@
-<div class='container'>
+<div class='wrap'>
   <div class='contents clearfix'>
 
     {{home-logo minimized=showExtraInfo}}

From 6ca8f14db430acdaf4f4d84b719893a21ec27e88 Mon Sep 17 00:00:00 2001
From: Simon Cossar <scossar3@gmail.com>
Date: Mon, 20 Jul 2015 01:03:26 -0700
Subject: [PATCH 5/5] Remove padding from media query

---
 app/assets/stylesheets/desktop/topic-list.scss | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 25f3a04cb48..2e90524da09 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -298,12 +298,6 @@ button.dismiss-read {
 @media all
 and (max-width : 850px) {
 
-  // add some left padding to topics otherwise everything is 100% flush
-  // with left edge in portrait tablet, which looks awful
-  #topic-title {
-    padding-left: 10px;
-  }
-
   .nav-pills {
     > li > a {
       font-size: 1em;
@@ -312,7 +306,6 @@ and (max-width : 850px) {
   }
 
   .list-controls {
-    padding: 0 5px;
 
     .btn {
         font-size: 1em