From 5551ddebfaf980247ea450701d8d754c246066fb Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sat, 20 Feb 2016 08:49:53 -0700
Subject: [PATCH] Fix BS4 grid after their grid updates

---
 assets/styles/common/_variables.scss | 1 -
 assets/styles/components/_grid.scss  | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/assets/styles/common/_variables.scss b/assets/styles/common/_variables.scss
index 3a1ae7a..079070a 100644
--- a/assets/styles/common/_variables.scss
+++ b/assets/styles/common/_variables.scss
@@ -1,5 +1,4 @@
 // Grid settings
-$enable-flex:           true;
 $main-sm-columns:       12;
 $sidebar-sm-columns:    4;
 
diff --git a/assets/styles/components/_grid.scss b/assets/styles/components/_grid.scss
index fb3e829..77c019e 100644
--- a/assets/styles/components/_grid.scss
+++ b/assets/styles/components/_grid.scss
@@ -1,18 +1,15 @@
 // Grid system
 .main {
-  @include make-col();
+  @include make-col($main-sm-columns, $main-sm-columns, $grid-gutter-width);
 
   @include media-breakpoint-up(sm) {
-    @include make-col-span($main-sm-columns);
     .sidebar-primary & {
-      @include make-col-span($main-sm-columns - $sidebar-sm-columns);
+      @include make-col($main-sm-columns - $sidebar-sm-columns, $main-sm-columns, $grid-gutter-width);
     }
   }
 }
 .sidebar {
-  @include make-col();
-
   @include media-breakpoint-up(sm) {
-    @include make-col-span($sidebar-sm-columns);
+    @include make-col($sidebar-sm-columns, $main-sm-columns, $grid-gutter-width);
   }
 }