Skip to content

Commit

Permalink
Downgrading bootstrap and bootswatch as they conflict with dc
Browse files Browse the repository at this point in the history
  • Loading branch information
DaveBathnes committed Sep 24, 2024
1 parent 8237677 commit a251dde
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 49 deletions.
7 changes: 2 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var paths = {
srcCNAME: 'CNAME',
srcCSS: 'css/*.css',
srcNodeCSS: [
'node_modules/bootswatch/dist/zephyr/bootstrap.min.css',
'node_modules/bootswatch/dist/flatly/bootstrap.min.css',
'node_modules/font-awesome/css/font-awesome.min.css',
'node_modules/dc/dist/style/dc.css',
'node_modules/mapbox-gl/dist/mapbox-gl.css',
Expand Down Expand Up @@ -63,10 +63,7 @@ gulp.task('html', function () {
})

gulp.task('html:dist', function () {
return gulp
.src(paths.srcHTML)
.pipe(htmlclean())
.pipe(gulp.dest(paths.dist))
return gulp.src(paths.srcHTML).pipe(htmlclean()).pipe(gulp.dest(paths.dist))
})

gulp.task('cname:dist', function () {
Expand Down
84 changes: 42 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"gulp-uglify": "^3.0.2"
},
"dependencies": {
"bootstrap": "^5.3.3",
"bootswatch": "^5.3.3",
"bootstrap": "^4.6.2",
"bootswatch": "^4.6.2",
"colorbrewer": "^1.5.6",
"crossfilter2": "^1.5.4",
"d3": "^7.9.0",
Expand Down

0 comments on commit a251dde

Please sign in to comment.