]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into ncoden-fix/each-breakpoint-remove-small
authorKevin Ball <kmball11@gmail.com>
Tue, 6 Dec 2016 23:03:52 +0000 (15:03 -0800)
committerKevin Ball <kmball11@gmail.com>
Tue, 6 Dec 2016 23:03:52 +0000 (15:03 -0800)
1  2 
gulp/tasks/customizer.js
scss/foundation.scss

index 408787e6c13b90c5f9561db4277968dd744dec50,3dd2b54083085462e2f5727b15f6e58be1671629..a70659b65bc3f03c82c007c8b748d4b01d356a08
@@@ -49,10 -49,9 +49,10 @@@ gulp.task('customizer:loadConfig', func
  // Prepare dependencies
  gulp.task('customizer:prepareSassDeps', function() {
    return gulp.src([
 -      'node_modules/@(normalize-scss)/sass/**/*.scss'
 +      'node_modules/@(normalize-scss)/sass/**/*.scss',
 +      'node_modules/@(sassy-lists)/stylesheets/**/*'
      ])
-     .pipe(gulp.dest('_vendor/scss'));
+     .pipe(gulp.dest('_vendor'));
  });
  
  // Creates a Sass file from the module/variable list and creates foundation.css and foundation.min.css
index d41471413648d3b270483f3a02d8b7bac7bc87c1,5de33535aa8b6740a6cb9d33233b9c143f7541db..dec0b0fcb5838e633220036d13e174992950f3f1
@@@ -6,8 -6,7 +6,8 @@@
   */
  
  // Dependencies
- @import "../_vendor/scss/normalize-scss/sass/normalize";
- @import "../_vendor/scss/sassy-lists/stylesheets/SassyLists";
+ @import "../_vendor/normalize-scss/sass/normalize";
++@import "../_vendor/sassy-lists/stylesheets/SassyLists";
  
  // Settings
  // import your own `settings` here or