From b92480bc0126fc6e2201238daccfc3f59968d841 Mon Sep 17 00:00:00 2001
From: Brian Mock <brian@mockbrian.com>
Date: Sun, 9 Apr 2017 05:45:26 -0700
Subject: [PATCH] Fixes #1311 margin shouldn't stay fixed (#1312)

---
 app/assets/stylesheets/components.scss | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/components.scss b/app/assets/stylesheets/components.scss
index 696e89418a..9aead00b5f 100644
--- a/app/assets/stylesheets/components.scss
+++ b/app/assets/stylesheets/components.scss
@@ -714,7 +714,15 @@ a.status__content__spoiler-link {
 
 @media screen and (min-width: 360px) {
   .columns-area {
-    margin: 10px;
+    margin: 0;
+  }
+
+  .column:first-child, .drawer:first-child {
+    margin-left: 0;
+  }
+
+  .column:last-child, .drawer:last-child {
+    margin-right: 0;
   }
 }
 
@@ -816,6 +824,7 @@ a.status__content__spoiler-link {
 }
 
 .column, .drawer {
+  margin: 10px;
   margin-left: 5px;
   margin-right: 5px;
   flex: 0 0 auto;
@@ -823,11 +832,11 @@ a.status__content__spoiler-link {
 }
 
 .column:first-child, .drawer:first-child {
-  margin-left: 0;
+  margin-left: 10px;
 }
 
 .column:last-child, .drawer:last-child {
-  margin-right: 0;
+  margin-right: 10px;
 }
 
 @media screen and (max-width: 1024px) {
@@ -885,6 +894,10 @@ a.status__content__spoiler-link {
 }
 
 @media screen and (min-width: 360px) {
+  .columns-area {
+    margin: 10px;
+  }
+
   .tabs-bar {
     margin: 10px;
     margin-bottom: 0;
@@ -895,6 +908,12 @@ a.status__content__spoiler-link {
   }
 }
 
+@media screen and (min-width: 1024px) {
+  .columns-area {
+    margin: 0;
+  }
+}
+
 @media screen and (min-width: 600px) {
   .tabs-bar__link {
     .fa {