Switch bootstrap to non-bower

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 @@
    * standard packaging format that bower files like.
    */
   gulp.task('package:libs', function (cb) {
+
+    var resolveBootstrap = gulp.src(
+      './node_modules/bootstrap/dist/css/bootstrap.css')
+      .pipe(gulp.dest(dir.dist + '/css'));
+
     var resolveCSS = gulp.src(bowerFiles)
       .pipe(filter('*.css'))
       .pipe(gulp.dest(dir.dist + '/css'));
@@ -177,7 +182,8 @@
       ]))
       .pipe(gulp.dest(dir.dist));
 
-    streamqueue({'objectMode': true}, resolveCSS,
+    streamqueue({'objectMode': true},
+      resolveBootstrap, resolveCSS,
       resolveLESS, resolveReveal,
       resolveLibs, resolveFonts);
     cb()
@@ -196,7 +202,7 @@
    * Package keybase static files.
    */
   gulp.task('package:keybase', function () {
-    return gulp.src(paths.keybase, {'keybase': dir.src})
+    return gulp.src(paths.keybase, {'base': dir.src})
       .pipe(gulp.dest(dir.dist));
   });
 
diff --git a/package.json b/package.json
index e11bfe3..5d653b6 100644
--- a/package.json
+++ b/package.json
@@ -18,8 +18,8 @@
   },
   "license": "CC-BY 4.0",
   "dependencies": {
-    "@bower_components/bootstrap": "twbs/bootstrap#~3.3.5",
     "@bower_components/font-awesome": "FortAwesome/Font-Awesome#~4.3.0",
+    "bootstrap": "^3.3.5",
     "font-mfizz": "^2.4.1",
     "modernizr": "^3.6.0",
     "reveal.js": "^3.7.0"
diff --git a/yarn.lock b/yarn.lock
index 11fa6d0..bda6194 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,10 +2,6 @@
 # yarn lockfile v1
 
 
-"@bower_components/bootstrap@twbs/bootstrap#~3.3.5":
-  version "3.3.7"
-  resolved "https://codeload.github.com/twbs/bootstrap/tar.gz/0b9c4a4007c44201dce9a6cc1a38407005c26c86"
-
 "@bower_components/font-awesome@FortAwesome/Font-Awesome#~4.3.0":
   version "4.3.0"
   resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0"
@@ -396,6 +392,10 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
+bootstrap@^3.3.5:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71"
+
 bower@^1.4.1:
   version "1.8.4"
   resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a"