Fixes #950 - dropdowns in examples were failing due to duplicate bs js include. Update migration docs and fix example footer.

This commit is contained in:
Kevin Ross 2016-03-28 15:06:03 -05:00
parent d3253dd10e
commit 3b17e36377
3 changed files with 5 additions and 3 deletions

View File

@ -2,12 +2,10 @@
{% if site.data.minified %}
<script src="{{ site.data.cdn.jquery }}.min.js"></script>
<script src="{{ site.data.cdn.tether }}.min.js"></script>
<script src="{{ site.data.cdn.bootstrap }}.min.js"></script>
<script src="{{ site.baseurl }}/dist/bootstrap-material-design.iife.min.js"></script>
{% else %}
<script src="{{ site.data.cdn.jquery }}.js"></script>
<script src="{{ site.data.cdn.tether }}.js"></script>
<script src="{{ site.data.cdn.bootstrap }}.js"></script>
<script src="{{ site.baseurl }}/dist/bootstrap-material-design.iife.js"></script>
{% endif %}

View File

@ -21,6 +21,10 @@ Looking to quickly add Material Design for Bootstrap to your project? Use the Ma
provided for free by the folks at MaxCDN. Using a package manager or need to download the source files?
[Head to the downloads page.]({{ site.baseurl }}/getting-started/download)
{% callout info %}
**Heads up!** DO NOT include Bootstrap CSS or Javascript, it is bundled with BMD.
{% endcallout %}
Copy-paste the font and stylesheet `<link>` into your `<head>` before all other stylesheets to load our CSS.
{% highlight html %}

View File

@ -27,7 +27,7 @@ Here are the big ticket items you'll want to be aware of when moving from BMD v3
### Global changes
- Switched from [Less](http://lesscss.org/) to [SCSS](http://sass-lang.com/) for our source CSS files.
- No longer a theme that overrides Bootstrap, instead it is a full customization of Bootstrap.
- Full customization of Bootstrap, no longer a theme that overrides Bootstrap. **DO NOT** include Bootstrap CSS or Javascript in your page, see [getting started](../getting-started/introduction#quick-start).
- Switched from `px` to `rem` as our primary CSS unit.
- Global font-size increased from `14px` to `16px`.
- Switched Javascript to ES6 classes