update settings

getchopstick · Sep 22, 2015 · f00b234 · f00b234
1 parent e37ea69
commit f00b234
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -72,5 +72,7 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll
-  sass
   scss_lint
+
+BUNDLED WITH
+   1.10.6
diff --git a/_gulp/tasks/scss.js b/_gulp/tasks/scss.js
@@ -7,7 +7,7 @@ var gulp = require('gulp'),
     plumber = require('gulp-plumber'),
     sass = require('gulp-sass'),
     postcss = require('gulp-postcss'),
-    autoprefixer = require('autoprefixer-core'),
+    autoprefixer = require('autoprefixer'),
     filesize = require('gulp-filesize'),
     browserSync = require('browser-sync'),
     sourcemaps  = require('gulp-sourcemaps');

diff --git a/js/theme.concat.js b/js/theme.concat.js
diff --git a/scss/_settings.global.scss b/scss/_settings.global.scss
@@ -89,7 +89,8 @@ $columns: (
     2,
     3,
     4,
-    5
+    5,
+    6
 ) !default;
 
 // ---
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,8 @@ $columns: ( @@
 ,
 ,
 ,
+,
     ) !default;
     // ---
@@ Expand Down @@