From 447c24d0821f2ba08f927fae9c4f682907ffe51e Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Sat, 6 Aug 2016 18:51:06 -0700
Subject: [PATCH] Update dependencies, incl Bootstrap 4 alpha 3

---
 assets/scripts/main.js              | 12 +-----------
 assets/styles/components/_grid.scss | 12 +++++-------
 package.json                        | 18 +++++++++---------
 3 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/assets/scripts/main.js b/assets/scripts/main.js
index b825c66ab3..7ef154ea33 100644
--- a/assets/scripts/main.js
+++ b/assets/scripts/main.js
@@ -5,17 +5,7 @@ import home from './routes/Home';
 import about_us from './routes/About';
 
 // Import npm dependencies
-import 'bootstrap/dist/js/umd/util.js';
-import 'bootstrap/dist/js/umd/alert.js';
-import 'bootstrap/dist/js/umd/button.js';
-import 'bootstrap/dist/js/umd/carousel.js';
-import 'bootstrap/dist/js/umd/collapse.js';
-import 'bootstrap/dist/js/umd/dropdown.js';
-import 'bootstrap/dist/js/umd/modal.js';
-import 'bootstrap/dist/js/umd/scrollspy.js';
-import 'bootstrap/dist/js/umd/tab.js';
-import 'bootstrap/dist/js/umd/tooltip.js';
-import 'bootstrap/dist/js/umd/popover.js';
+import 'bootstrap/dist/js/bootstrap';
 
 // Use this variable to set up the common and page specific functions. If you
 // rename this variable, you will also need to rename the namespace below.
diff --git a/assets/styles/components/_grid.scss b/assets/styles/components/_grid.scss
index fb3e829a3c..f5d16873d4 100644
--- a/assets/styles/components/_grid.scss
+++ b/assets/styles/components/_grid.scss
@@ -1,18 +1,16 @@
 // Grid system
 .main {
-  @include make-col();
-
+  @extend %grid-column;
   @include media-breakpoint-up(sm) {
-    @include make-col-span($main-sm-columns);
+    @include make-col($main-sm-columns);
     .sidebar-primary & {
-      @include make-col-span($main-sm-columns - $sidebar-sm-columns);
+      @include make-col($main-sm-columns - $sidebar-sm-columns);
     }
   }
 }
 .sidebar {
-  @include make-col();
-
+  @extend %grid-column;
   @include media-breakpoint-up(sm) {
-    @include make-col-span($sidebar-sm-columns);
+    @include make-col($sidebar-sm-columns);
   }
 }
diff --git a/package.json b/package.json
index cf9caef21a..9e31643731 100644
--- a/package.json
+++ b/package.json
@@ -41,24 +41,24 @@
     "clean-webpack-plugin": "^0.1.8",
     "css-loader": "^0.23.1",
     "cssnano": "^3.5.2",
-    "eslint": "^2.5.1",
-    "eslint-config-airbnb": "^6.2.0",
+    "eslint": "^3.2.2",
+    "eslint-config-airbnb": "^10.0.0",
     "eslint-loader": "^1.3.0",
-    "eslint-plugin-react": "^4.2.3",
+    "eslint-plugin-react": "^6.0.0",
     "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.5",
-    "image-webpack-loader": "^1.6.3",
-    "imagemin-pngcrush": "^4.1.0",
+    "file-loader": "^0.9.0",
+    "image-webpack-loader": "^2.0.0",
+    "imagemin-pngcrush": "^5.0.0",
     "imports-loader": "^0.6.5",
     "minimist": "^1.2.0",
     "monkey-hot-loader": "0.0.3",
     "node-sass": "^3.4.2",
     "optimize-css-assets-webpack-plugin": "^1.3.0",
     "postcss": "^5.0.18",
-    "postcss-loader": "^0.8.0",
+    "postcss-loader": "^0.9.1",
     "qs": "^6.1.0",
     "resolve-url-loader": "^1.4.3",
-    "sass-loader": "^3.1.1",
+    "sass-loader": "^4.0.0",
     "style-loader": "^0.13.0",
     "url-loader": "^0.5.7",
     "webpack": "^1.12.14",
@@ -67,7 +67,7 @@
   },
   "dependencies": {
     "babel-runtime": "^6.5.0",
-    "bootstrap": "^4.0.0-alpha.2",
+    "bootstrap": "^4.0.0-alpha.3",
     "jquery": "^2.1.4",
     "tether": "^1.2.0"
   }