inaugust/inaugust.com
Code Issues Proposed changes

Switch bootstrap to non-bower

Browse Source
This commit is contained in:
Monty Taylor 2018-08-24 03:42:23 -05:00
parent 67c1f59c79
commit 2712cdc639
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gulpfile.js
View File

@ -147,6 +147,11 @@
* standard packaging format that bower files like. * standard packaging format that bower files like.
*/ */
gulp.task('package:libs', function (cb) { 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) var resolveCSS = gulp.src(bowerFiles)
.pipe(filter('*.css')) .pipe(filter('*.css'))
.pipe(gulp.dest(dir.dist + '/css')); .pipe(gulp.dest(dir.dist + '/css'));
@ -177,7 +182,8 @@
])) ]))
.pipe(gulp.dest(dir.dist)); .pipe(gulp.dest(dir.dist));
streamqueue({'objectMode': true}, resolveCSS, streamqueue({'objectMode': true},
resolveBootstrap, resolveCSS,
resolveLESS, resolveReveal, resolveLESS, resolveReveal,
resolveLibs, resolveFonts); resolveLibs, resolveFonts);
cb() cb()
@ -196,7 +202,7 @@
* Package keybase static files. * Package keybase static files.
*/ */
gulp.task('package:keybase', function () { 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)); .pipe(gulp.dest(dir.dist));
}); });

2
package.json
View File

@ -18,8 +18,8 @@
}, },
"license": "CC-BY 4.0", "license": "CC-BY 4.0",
"dependencies": { "dependencies": {
"@bower_components/bootstrap": "twbs/bootstrap#~3.3.5",
"@bower_components/font-awesome": "FortAwesome/Font-Awesome#~4.3.0", "@bower_components/font-awesome": "FortAwesome/Font-Awesome#~4.3.0",
"bootstrap": "^3.3.5",
"font-mfizz": "^2.4.1", "font-mfizz": "^2.4.1",
"modernizr": "^3.6.0", "modernizr": "^3.6.0",
"reveal.js": "^3.7.0" "reveal.js": "^3.7.0"

8
yarn.lock
View File

@ -2,10 +2,6 @@
# yarn lockfile v1 # 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": "@bower_components/font-awesome@FortAwesome/Font-Awesome#~4.3.0":
version "4.3.0" version "4.3.0"
resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0" resolved "https://codeload.github.com/FortAwesome/Font-Awesome/tar.gz/41b9ed01103e6820c3cb043ba7ddab30ecd3f4c0"
@ -396,6 +392,10 @@ boom@2.x.x:
dependencies: dependencies:
hoek "2.x.x" 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: bower@^1.4.1:
version "1.8.4" version "1.8.4"
resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a" resolved "https://registry.yarnpkg.com/bower/-/bower-1.8.4.tgz#e7876a076deb8137f7d06525dc5e8c66db82f28a"