From 363d73d145a28c9443c538c6f7861176e7139972 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 14 Dec 2018 11:58:52 +0100 Subject: [PATCH] bootstrap 3.4 and switch from components/ to canonical bootstrap repo, which puts bootstrap.min.js into a `dist` subdir. components hasn't received the 3.4 update --- bower.json | 2 +- notebook/templates/page.html | 2 +- setupbase.py | 2 +- tools/build-main.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index b27f21455..0136a82da 100644 --- a/bower.json +++ b/bower.json @@ -3,7 +3,7 @@ "version": "0.0.1", "dependencies": { "backbone": "components/backbone#~1.2", - "bootstrap": "components/bootstrap#~3.3", + "bootstrap": "bootstrap#~3.4", "bootstrap-tour": "0.9.0", "codemirror": "components/codemirror#~5.37", "es6-promise": "~1.0", diff --git a/notebook/templates/page.html b/notebook/templates/page.html index 9d0a5009c..9e68da1b2 100644 --- a/notebook/templates/page.html +++ b/notebook/templates/page.html @@ -37,7 +37,7 @@ jquery: 'components/jquery/jquery.min', json: 'components/requirejs-plugins/src/json', text: 'components/requirejs-text/text', - bootstrap: 'components/bootstrap/js/bootstrap.min', + bootstrap: 'components/bootstrap/dist/js/bootstrap.min', bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min', 'jquery-ui': 'components/jquery-ui/jquery-ui.min', moment: 'components/moment/min/moment-with-locales', diff --git a/setupbase.py b/setupbase.py index 1b1549c54..51cb9fac5 100644 --- a/setupbase.py +++ b/setupbase.py @@ -133,7 +133,7 @@ def find_package_data(): # (there are lots of resources we bundle for sdist-reasons that we don't actually use) static_data.extend([ pjoin(components, "backbone", "backbone-min.js"), - pjoin(components, "bootstrap", "js", "bootstrap.min.js"), + pjoin(components, "bootstrap", "dist", "js", "bootstrap.min.js"), pjoin(components, "bootstrap-tour", "build", "css", "bootstrap-tour.min.css"), pjoin(components, "bootstrap-tour", "build", "js", "bootstrap-tour.min.js"), pjoin(components, "font-awesome", "css", "*.css"), diff --git a/tools/build-main.js b/tools/build-main.js index fcf5b35db..27f9048c5 100644 --- a/tools/build-main.js +++ b/tools/build-main.js @@ -19,7 +19,7 @@ var rjs_config = { jquery: 'components/jquery/jquery.min', json: 'components/requirejs-plugins/src/json', text: 'components/requirejs-text/text', - bootstrap: 'components/bootstrap/js/bootstrap.min', + bootstrap: 'components/bootstrap/dist/js/bootstrap.min', bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min', "jquery-ui": 'components/jquery-ui/jquery-ui.min', moment: 'components/moment/min/moment-with-locales',