7 files changed, 29 insertions, 23 deletions
diff --git a/assets/sass/_form.sass b/assets/sass/_form.sass
index 00cea65a..adf20a1b 100644
--- a/assets/sass/_form.sass
+++ b/assets/sass/_form.sass
@@ -145,6 +145,10 @@ ul.form-errors li
 .form-login
   max-width: 350px
   margin: 5% auto 0
+
+  @include xs-device
+    margin-left: 5px
+
   li
     margin-left: 25px
     line-height: 25px
diff --git a/assets/sass/_header.sass b/assets/sass/_header.sass
index 5f6a2885..2940fea3 100644
--- a/assets/sass/_header.sass
+++ b/assets/sass/_header.sass
@@ -5,7 +5,7 @@ header
   display: flex
   flex-wrap: wrap
   padding: 5px 10px
-  margin-bottom: 10px
+  margin-bottom: 5px
   border-bottom: 1px solid #dedede
   background-color: #fbfbfb
 
diff --git a/assets/sass/_main.sass b/assets/sass/_main.sass
deleted file mode 100644
index a74106b4..00000000
--- a/assets/sass/_main.sass
+++ /dev/null
@@ -1,3 +0,0 @@
-#main
-  padding-left: 10px
-  padding-right: 10px
diff --git a/assets/sass/_reset.sass b/assets/sass/_reset.sass
index 34d73def..6906bee2 100644
--- a/assets/sass/_reset.sass
+++ b/assets/sass/_reset.sass
@@ -30,3 +30,7 @@ hr
   height: 0
   border-top: 1px solid rgba(0, 0, 0, 0.1)
   border-bottom: 1px solid rgba(255, 255, 255, 0.3)
+
+.page
+  margin-left: 10px
+  margin-right: 10px
diff --git a/assets/sass/_sidebar.sass b/assets/sass/_sidebar.sass
index d06f18b7..c872c1d7 100644
--- a/assets/sass/_sidebar.sass
+++ b/assets/sass/_sidebar.sass
@@ -2,23 +2,28 @@
 @import mixins
 
 .sidebar-container
-  @include grid(100)
+  height: 100%
+  display: flex
+  flex-flow: row
+
+  @include sm-device
+    flex-flow: wrap
 
 .sidebar-content
   padding-left: 10px
-  @include grid_width(82/100)
-  @include xs-device
-    @include grid_width(1)
+  flex: 1 100%
+
+  @include sm-device
     padding-left: 0
+    order: 1
 
 .sidebar
-  max-width: 240px
-  min-width: 190px
-  @include grid_width(18/100)
-  @include xs-device
-    @include grid_width(1)
-    max-width: 99%
-    min-width: 0
+  width: 230px
+
+  @include sm-device
+    flex: 1 auto
+    order: 2
+
   h2
     margin-top: 0
   > ul
diff --git a/assets/sass/_task_summary.sass b/assets/sass/_task_summary.sass
index 1135133f..7f736bd9 100644
--- a/assets/sass/_task_summary.sass
+++ b/assets/sass/_task_summary.sass
@@ -12,18 +12,15 @@
 .task-summary-container
   border: 2px solid #000
   border-radius: 8px
-  padding: 15px
+  padding: 10px
 
 .task-summary-columns
-  display: -webkit-flex
   display: flex
-  -webkit-flex-direction: row
-  flex-direction: row
-  -webkit-justify-content: space-between
+  flex-flow: row
   justify-content: space-between
 
-  @include xs-device
-    display: block
+  @include sm-device
+    flex-flow: column
 
 .task-summary-column
   color: color('primary')
diff --git a/assets/sass/app.sass b/assets/sass/app.sass
index 028f7f3b..7a58ac77 100644
--- a/assets/sass/app.sass
+++ b/assets/sass/app.sass
@@ -19,7 +19,6 @@
 @import pagination
 @import header
 @import logo
-@import main
 @import page_header
 @import sidebar
 @import avatar