Merge pull request #5 from gronke/sync-upstream

Sync upstream repo kristoferjoseph/flexboxgrid
hugeinc · Aug 31, 2015 · d083a00 · d083a00
2 parents f2ce4ef + 85e94ec
commit d083a00
Show file tree

Hide file tree

Showing 6 changed files with 277 additions and 365 deletions.
diff --git a/Gulpfile.js b/Gulpfile.js
@@ -31,9 +31,6 @@ gulp.task('styles:demo', function () {
       includePaths: ['.', 'bower_components'],
       onError: console.error.bind(console, 'Sass error:')
     }))
-    .pipe($.postcss([
-      require('autoprefixer-core')({browsers: ['last 1 version']})
-    ]))
     .pipe($.sourcemaps.write())
     .pipe(gulp.dest('demo'));
 });
@@ -47,9 +44,6 @@ gulp.task('styles:dist', function () {
       includePaths: ['.', 'bower_components'],
       onError: console.error.bind(console, 'Sass error:')
     }))
-    .pipe($.postcss([
-      require('autoprefixer-core')({browsers: ['last 1 version']})
-    ]))
     .pipe($.sourcemaps.write())
     .pipe(gulp.dest('dist'));
 });
@@ -60,6 +54,7 @@ gulp.task('watch', ['jade:demo', 'styles:demo', 'styles:dist'], function () {
   // watch for changes
   gulp.watch('demo/*.jade', ['jade:demo']);
   gulp.watch('*.scss', ['styles:dist']);
+  gulp.watch('bower_components/**/*.scss', ['styles:dist']);
   gulp.watch('demo/sass/*.scss', ['styles:demo']);
   gulp.watch('bower.json', ['wiredep']);
 });

diff --git a/demo/demo.css b/demo/demo.css
diff --git a/demo/sass/demo.scss b/demo/sass/demo.scss
@@ -40,7 +40,7 @@ body {
 }
 
 .box, .box-first, .box-large, .box-nested, .box-row {
-  padding: 0.5rem;
+  padding: 1rem;
 }
 
 .box-row {