diff options
-rw-r--r-- | gulpfile.js | 10 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | yarn.lock | 8 |
3 files changed, 13 insertions, 7 deletions
diff --git a/gulpfile.js b/gulpfile.js index a48dfb2..e3bb6a6 100644 --- a/gulpfile.js +++ b/gulpfile.js | |||
@@ -147,6 +147,11 @@ | |||
147 | * standard packaging format that bower files like. | 147 | * standard packaging format that bower files like. |
148 | */ | 148 | */ |
149 | gulp.task('package:libs', function (cb) { | 149 | gulp.task('package:libs', function (cb) { |
150 | |||
151 | var resolveBootstrap = gulp.src( | ||
152 | './node_modules/bootstrap/dist/css/bootstrap.css') | ||
153 | .pipe(gulp.dest(dir.dist + '/css')); | ||
154 | |||
150 | var resolveCSS = gulp.src(bowerFiles) | 155 | var resolveCSS = gulp.src(bowerFiles) |
151 | .pipe(filter('*.css')) | 156 | .pipe(filter('*.css')) |
152 | .pipe(gulp.dest(dir.dist + '/css')); | 157 | .pipe(gulp.dest(dir.dist + '/css')); |
@@ -177,7 +182,8 @@ | |||
177 | ])) | 182 | ])) |
178 | .pipe(gulp.dest(dir.dist)); | 183 | .pipe(gulp.dest(dir.dist)); |
179 | 184 | ||
180 | streamqueue({'objectMode': true}, resolveCSS, | 185 | streamqueue({'objectMode': true}, |
186 | resolveBootstrap, resolveCSS, | ||
181 | resolveLESS, resolveReveal, | 187 | resolveLESS, resolveReveal, |
182 | resolveLibs, resolveFonts); | 188 | resolveLibs, resolveFonts); |
183 | cb() | 189 | cb() |
@@ -196,7 +202,7 @@ | |||
196 | * Package keybase static files. | 202 | * Package keybase static files. |
197 | */ | 203 | */ |
198 | gulp.task('package:keybase', function () { | 204 | gulp.task('package:keybase', function () { |
199 | return gulp.src(paths.keybase, {'keybase': dir.src}) | 205 | return gulp.src(paths.keybase, {'base': dir.src}) |
200 | .pipe(gulp.dest(dir.dist)); | 206 | .pipe(gulp.dest(dir.dist)); |
201 | }); | 207 | }); |
202 | 208 | ||
diff --git a/package.json b/package.json index e11bfe3..5d653b6 100644 --- a/package.json +++ b/package.json | |||
@@ -18,8 +18,8 @@ | |||
18 | }, | 18 | }, |
19 | "license": "CC-BY 4.0", | 19 | "license": "CC-BY 4.0", |
20 | "dependencies": { | 20 | "dependencies": { |
21 | "@bower_components/bootstrap": "twbs/bootstrap#~3.3.5", | ||
22 | "@bower_components/font-awesome": "FortAwesome/Font-Awesome#~4.3.0", | 21 | "@bower_components/font-awesome": "FortAwesome/Font-Awesome#~4.3.0", |
22 | "bootstrap": "^3.3.5", | ||
23 | "font-mfizz": "^2.4.1", | 23 | "font-mfizz": "^2.4.1", |
24 | "modernizr": "^3.6.0", | 24 | "modernizr": "^3.6.0", |
25 | "reveal.js": "^3.7.0" | 25 | "reveal.js": "^3.7.0" |
@@ -2,10 +2,6 @@ | |||
2 | # yarn lockfile v1 | 2 | # yarn lockfile v1 |
3 | 3 | ||
4 | 4 | ||
5 | "@bower_components/bootstrap@twbs/bootstrap#~3.3.5": | ||
6 | version "3.3.7" | ||
7 | resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/0b9c4a4007c44201dce9a6cc1a38407005c26c86" | ||
8 | |||
9 | "@bower_components/font-awesome@FortAwesome/Font-Awesome#~4.3.0": | 5 | "@bower_components/font-awesome@FortAwesome/Font-Awesome#~4.3.0": |
10 | version "4.3.0" | 6 | version "4.3.0" |
11 | resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0" | 7 | resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0" |
@@ -396,6 +392,10 @@ boom@2.x.x: | |||
396 | dependencies: | 392 | dependencies: |
397 | hoek "2.x.x" | 393 | hoek "2.x.x" |
398 | 394 | ||
395 | bootstrap@^3.3.5: | ||
396 | version "3.3.7" | ||
397 | resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71" | ||
398 | |||
399 | bower@^1.4.1: | 399 | bower@^1.4.1: |
400 | version "1.8.4" | 400 | version "1.8.4" |
401 | resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a" | 401 | resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a" |