diff options
| author | Mark Otto <[email protected]> | 2015-01-19 14:48:12 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-19 14:48:12 -0800 |
| commit | 325748ff6860fbafaac21e3bfbaabfdb05fa71a8 (patch) | |
| tree | 0fc4e65149990e9d59029c09e24a0242ffa8a2d0 /docs/_includes | |
| parent | 0964504fdafdde0ac71ab1a6f65eea1686cef9f8 (diff) | |
| parent | 4fd01b7ac130dd815e7490950ed807487b684f4a (diff) | |
| download | bootstrap-325748ff6860fbafaac21e3bfbaabfdb05fa71a8.tar.xz bootstrap-325748ff6860fbafaac21e3bfbaabfdb05fa71a8.zip | |
Merge branch 'master' into v4
Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/footer.html | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index c1380af63..d466e1f86 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -32,7 +32,8 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> -<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> +<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> + {% if site.github %} <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script> {% else %} |