diff --git a/_config.yml b/_config.yml index 01ca2646..06a435ab 100644 --- a/_config.yml +++ b/_config.yml @@ -49,7 +49,7 @@ cdn: # # See https://www.srihash.org for info on how to generate the hashes css: https://cdn.rawgit.com/fezvrasta/bootstrap-material-design/v4-dev/dist/css/bootstrap-material-design.css # css_hash: "sha384-XXXXXXXX" - js: https://cdn.rawgit.com/fezvrasta/bootstrap-material-design/v4-dev/dist/js/bootstrap-material-design.js + js: https://cdn.rawgit.com/fezvrasta/bootstrap-material-design/v4-dev/dist/js/bootstrap-material-design # js_hash: "sha384-XXXXXXXX" # fonts diff --git a/docs/_plugins/variables.rb b/docs/_plugins/variables.rb index 1bbb0f0d..e7c6bc88 100644 --- a/docs/_plugins/variables.rb +++ b/docs/_plugins/variables.rb @@ -39,7 +39,13 @@ module Variables bootstrap_version = site.data['npm_bootstrap']['version'] assert_not_nil :bootstrap_version, bootstrap_version - if (bootstrap_version.include?('rosskevin')) + if (bootstrap_version.include?('rosskevin') || bootstrap_version.include?('alpha')) + # // not this + # https://cdn.rawgit.com/twbs/bootstrap/4.0.0-alpha.2/dist/js/bootstrap.js + + # // this + # https://cdn.rawgit.com/twbs/bootstrap/v4-dev/dist/js/bootstrap.js + bootstrap_version = 'v4-dev' # hack since we are using a rosskevin flex branch end diff --git a/docs/getting-started/introduction.md b/docs/getting-started/introduction.md index cf01a791..2270d31b 100644 --- a/docs/getting-started/introduction.md +++ b/docs/getting-started/introduction.md @@ -35,9 +35,10 @@ Copy-paste the font and stylesheet `` into your `
` before all other Add jQuery, Bootstrap, and our Javascript plugins near the end of your pages, right before the closing `` tag. Be sure to place jQuery first as our code depends on it. {% highlight html %} - - - + + + + @@ -75,10 +76,10 @@ Put it all together and your pages should look like this: