Skip to content

Commit 9562ec6

Browse files
updated modules and added normalize
1 parent c28d759 commit 9562ec6

File tree

3 files changed

+39
-28
lines changed

3 files changed

+39
-28
lines changed

gulpfile.js

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* - - - - - - - - - - EDIT YOUR PATHS
33
* - - - - - - - - - - - - - - - - - -
44
*/
5-
let paths = {
5+
const paths = {
66
styles: {
77
watch : 'src/scss/**/*.scss',
88
dest : 'dest/css/'
@@ -40,19 +40,20 @@ let paths = {
4040
* - - - - - - - - - - - - - - - - - - - - -
4141
*/
4242

43-
let prefix = require ('gulp-autoprefixer'),
44-
beeper = require ('beeper'),
45-
browserSync = require ('browser-sync').create (),
46-
changed = require ('gulp-changed'),
47-
colors = require ('ansi-colors'),
48-
gulp = require ('gulp'),
49-
log = require ('fancy-log'),
50-
njkRend = require ('gulp-nunjucks-render'),
51-
plumber = require ('gulp-plumber'),
52-
reload = browserSync.reload ,
53-
sass = require ('gulp-sass'),
54-
sourcemaps = require ('gulp-sourcemaps'),
55-
uglify = require ('gulp-uglify');
43+
const prefix = require('gulp-autoprefixer');
44+
const beeper = require('beeper');
45+
const browserSync = require('browser-sync').create ();
46+
const changed = require('gulp-changed');
47+
const colors = require('ansi-colors');
48+
const gulp = require('gulp');
49+
const log = require('fancy-log');
50+
const njkRend = require('gulp-nunjucks-render');
51+
const normal = require('node-normalize-scss');
52+
const plumber = require('gulp-plumber');
53+
const reload = browserSync.reload;
54+
const sass = require('gulp-sass');
55+
const sourcemaps = require('gulp-sourcemaps');
56+
const uglify = require('gulp-uglify');
5657

5758

5859

@@ -89,7 +90,10 @@ function style(env) {
8990
if (env !== true) {
9091
return gulp.src(paths.styles.watch)
9192
.pipe(sourcemaps.init())
92-
.pipe(sass({'outputStyle':'expanded'}))
93+
.pipe(sass({
94+
includePaths: normal.includePaths,
95+
outputStyle: 'expanded'
96+
}))
9397
.pipe(plumber({
9498
errorHandler : onError
9599
}))
@@ -103,7 +107,10 @@ function style(env) {
103107
} else {
104108
return gulp.src(paths.styles.watch)
105109
.pipe(sourcemaps.init())
106-
.pipe(sass({'outputStyle':'compressed'}))
110+
.pipe(sass({
111+
includePaths: normal.includePaths,
112+
outputStyle: 'compressed'
113+
}))
107114
.pipe(sourcemaps.write('./')) //maps are set relative to source
108115
.pipe(gulp.dest(paths.styles.dest));
109116
}
@@ -189,4 +196,5 @@ gulp.task('default', function() {
189196
image();
190197
server();
191198
watch();
199+
beeper();
192200
});

package.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "StreamBuilder",
3-
"version": "1.0.0",
3+
"version": "2.0.1",
44
"description": "Streaming, front-end build environment for automating mundane tasks.",
55
"keywords": [
66
"gulp",
@@ -25,19 +25,20 @@
2525
},
2626
"license": "MIT",
2727
"devDependencies": {
28-
"beeper": "1.1.1",
29-
"browser-sync": "2.26.3",
30-
"ansi-colors": "3.1.0",
31-
"fancy-log": "1.3.2",
32-
"fs-extra": "7.0.0",
33-
"gulp": "4.0.0",
34-
"gulp-autoprefixer": "6.0.0",
28+
"beeper": "2.0.0",
29+
"browser-sync": "2.26.4",
30+
"ansi-colors": "3.2.4",
31+
"fancy-log": "1.3.3",
32+
"fs-extra": "7.0.1",
33+
"gulp": "4.0.1",
34+
"gulp-autoprefixer": "6.1.0",
3535
"gulp-changed": "3.2.0",
3636
"gulp-data": "1.3.1",
37-
"gulp-nunjucks-render": "2.2.2",
38-
"gulp-plumber": "1.2.0",
37+
"gulp-nunjucks-render": "2.2.3",
38+
"gulp-plumber": "1.2.1",
3939
"gulp-sass": "4.0.2",
40-
"gulp-sourcemaps": "2.6.4",
41-
"gulp-uglify": "3.0.1"
40+
"gulp-sourcemaps": "2.6.5",
41+
"gulp-uglify": "3.0.2",
42+
"node-normalize-scss": "8.0.0"
4243
}
4344
}

src/scss/_settings.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import "normalize";
2+
13
@import url('https://fonts.googleapis.com/css?family=Roboto+Condensed:300,400');
24

35
$rem-base : 16px; // Default font rem size

0 commit comments

Comments
 (0)