Commit 972e42ef authored by vindarel's avatar vindarel

install bootstrap with bower (for fonts)

with npm we need to configure somethings to get the fonts back. with bower we get the glyphicons fonts. for #62 - Remove Bower, replace by npm - broken installation
parent 9ed3ea45
Pipeline #8378761 failed with stage
in 7 minutes and 26 seconds
......@@ -274,12 +274,13 @@ LOGIN_URL = "/login/"
# Don't get bootstrap and jquery from a CDN (a step towards offline work).
BOOTSTRAP3 = {
'include_jquery': False,
'jquery_url': '/node_modules/jquery/jquery.min.js',
'base_url': '/static/',
'css_url': '/static/css/bootstrap.min.css',
'theme_url': '/static/css/bootstrap-theme.min.css',
'javascript_url': '/static/js/bootstrap.min.js',
'jquery_url': '/static/bower_components/jquery/jquery.min.js',
'base_url': '/static/',
'css_url': '/static/bower_components/bootstrap/dist/css/bootstrap.min.css',
'theme_url': '/static/bower_components/bootstrap/dist/css/bootstrap-theme.min.css',
'javascript_url': '/static/bower_components/bootstrap/dist/js/bootstrap.min.js',
}
BOOTSTRAP_BASE_URL = '/static/'
HUEY = {
......
......@@ -23,7 +23,8 @@
],
"dependencies": {
"prelude-ls": "^1.1.2",
"angular-i18n": "^1.6.4"
"angular-i18n": "^1.6.4",
"bootstrap": "^3.3.7"
},
"resolutions": {
"angular-i18n": "1.3"
......
......@@ -36,8 +36,7 @@ var vendorJsFiles = [
'node_modules/underscore/underscore-min.js',
// 'node_modules/prelude-ls/**/*.js', // see issue #62. To be removed from bower eventually.
'static/bower_components/prelude-ls/browser/prelude-browser-min.js', // xxx bower here
'node_modules/bootstrap/js/*.js',
'node_modules/bootstrap/js/*.js', // needed despite of settings.py
'node_modules/datejs/build/production/date.min.js', // XXX
'node_modules/c3/c3.min.js',
......@@ -110,12 +109,6 @@ gulp.task('concatjs:vendor', function () {
.pipe(gulp.dest('static/js/build'));
});
// for djangos bootstrap3, we want bootstrap's js alone, not concatenated.
gulp.task('bootstrap', function () {
return gulp.src('node_modules/bootstrap/dist/js/bootstrap.min.js')
.pipe(gulp.dest('static/js'));
});
// Concatenate js app files
gulp.task('concatjs:app', ['compile:livescript'], function () {
console.log("warning: we deactived jshint.");
......@@ -175,4 +168,4 @@ gulp.task('livescript', ['compile:livescript']);
// Default Task
// gulp.task('default', ['less', 'test', 'concat']);
//XXX warning of mixing ls and js for same file.
gulp.task('default', ['css', 'less', 'bootstrap', 'angularlocale', 'concat',]);
gulp.task('default', ['css', 'less', 'concat',]);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment