update bootstrap version

This commit is contained in:
Kevin Ross 2015-12-07 17:20:32 -06:00
parent 62cdb564fc
commit 7b603bcad2
6 changed files with 9 additions and 9 deletions

View File

@ -35,7 +35,7 @@ Add the necessary links to your `<head>` element for fonts and stylsheets:
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"> <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Material Design --> <!-- Bootstrap Material Design -->
<link href="dist/css/bootstrap-material-design.css" rel="stylesheet"> <link href="dist/css/bootstrap-material-design.css" rel="stylesheet">

View File

@ -13,7 +13,7 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"> <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Material Design --> <!-- Bootstrap Material Design -->
<link href="dist/css/bootstrap-material-design.css" rel="stylesheet"> <link href="dist/css/bootstrap-material-design.css" rel="stylesheet">
@ -1894,7 +1894,7 @@
<br> <br>
<script src="//code.jquery.com/jquery-1.10.2.min.js"></script> <script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script> <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<script> <script>
(function () { (function () {

View File

@ -39,7 +39,7 @@
"license": "https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md", "license": "https://github.com/FezVrasta/bootstrap-material-design/blob/master/LICENSE.md",
"dependencies": { "dependencies": {
"jquery": "~2.1.1", "jquery": "~2.1.1",
"bootstrap": "~3.3.5", "bootstrap": "~3.3.6",
"bootstrap-sass": "~3.3.5" "bootstrap-sass": "~3.3.6"
} }
} }

View File

@ -23,7 +23,7 @@
<script>window.jQuery || document.write('<script src="../assets/js/vendor/jquery.min.js"><\/script>')</script> <script>window.jQuery || document.write('<script src="../assets/js/vendor/jquery.min.js"><\/script>')</script>
<!-- Bootstrap --> <!-- Bootstrap -->
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
<!-- Sliders --> <!-- Sliders -->
<script src="//cdnjs.cloudflare.com/ajax/libs/noUiSlider/6.2.0/jquery.nouislider.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/noUiSlider/6.2.0/jquery.nouislider.min.js"></script>
<!-- Dropdown.js --> <!-- Dropdown.js -->

View File

@ -19,7 +19,7 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!--<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">--> <!--<link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">-->
{% if site.github %} {% if site.github %}
<link href="../dist/css/material-fullpalette.min.css" rel="stylesheet"> <link href="../dist/css/material-fullpalette.min.css" rel="stylesheet">

View File

@ -15,7 +15,7 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<!-- Bootstrap --> <!-- Bootstrap -->
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet"> <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
<!-- Bootstrap Material Design --> <!-- Bootstrap Material Design -->
<link href="dist/css/bootstrap-material-design.css" rel="stylesheet"> <link href="dist/css/bootstrap-material-design.css" rel="stylesheet">
@ -1049,7 +1049,7 @@
</script> </script>
<!-- Twitter Bootstrap --> <!-- Twitter Bootstrap -->
<script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/js/bootstrap.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.6/js/bootstrap.min.js"></script>
<!-- Material Design for Bootstrap --> <!-- Material Design for Bootstrap -->
<script src="dist/js/material.js"></script> <script src="dist/js/material.js"></script>