diff options
| author | Mark Otto <[email protected]> | 2015-09-06 09:36:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-09-06 09:36:40 -0700 |
| commit | dee38e33b5f8e39f2171737b6e28818aa396992d (patch) | |
| tree | fc317eec861fdb15dd469f0d898683e34053b3a0 /docs/_includes | |
| parent | 0d0edebea61ec0fbc38215e2316b0d6c7d7f0228 (diff) | |
| parent | 1ebf85223610d0f5983f3e9d1fb2f0a8f609b56d (diff) | |
| download | bootstrap-dee38e33b5f8e39f2171737b6e28818aa396992d.tar.xz bootstrap-dee38e33b5f8e39f2171737b6e28818aa396992d.zip | |
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/footer.html | 1 | ||||
| -rw-r--r-- | docs/_includes/header.html | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 3e12c58b8..eb35020ba 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -30,6 +30,7 @@ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script> +<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script> {% if page.layout == "docs" %} <script src="{{ site.baseurl }}/assets/js/vendor/jekyll-search.js"></script> diff --git a/docs/_includes/header.html b/docs/_includes/header.html index bba5aad3d..e637dc470 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -19,10 +19,6 @@ <!-- Documentation extras --> <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet"> -<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> -<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script> -<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script> - <!-- Favicons --> <link rel="apple-touch-icon" href="{{ site.baseurl }}/apple-touch-icon.png"> <link rel="icon" href="{{ site.baseurl }}/favicon.ico"> |