aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXhmikosR <[email protected]>2018-09-25 14:09:24 +0300
committerXhmikosR <[email protected]>2018-12-14 01:45:51 +0200
commitdd71b40aedce5e51959fe20e12d080e76bac92a8 (patch)
tree43dbfd500e7b0e3eee69693adf12263503fedf92
parent4a5c7f21d597341f91004b352c1a0abde7ff92e1 (diff)
downloadbootstrap-dd71b40aedce5e51959fe20e12d080e76bac92a8.tar.xz
bootstrap-dd71b40aedce5e51959fe20e12d080e76bac92a8.zip
docs: Concat the IE files with the rest.
-rw-r--r--docs/_includes/footer.html3
-rw-r--r--docs/_includes/header.html1
-rw-r--r--grunt/configBridge.json4
3 files changed, 3 insertions, 5 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 028d5722a..de9af4fc6 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -51,6 +51,3 @@
{% endfor %}
{% endif %}
{% endif %}
-
-<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script>
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 7446ba886..8b0e175d1 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -39,7 +39,6 @@
<link href="{{ site.baseurl }}/assets/css/docs.css" rel="stylesheet">
{% endif %}
<!--[if lt IE 9]><script src="{{ site.baseurl }}/assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
-<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
diff --git a/grunt/configBridge.json b/grunt/configBridge.json
index 146b2b5ec..8e035b5a5 100644
--- a/grunt/configBridge.json
+++ b/grunt/configBridge.json
@@ -15,7 +15,9 @@
"../assets/js/vendor/clipboard.min.js",
"../assets/js/vendor/anchor.min.js",
"../assets/js/src/application.js",
- "../assets/js/src/search.js"
+ "../assets/js/src/search.js",
+ "../assets/js/ie10-viewport-bug-workaround.js",
+ "../assets/js/ie-emulation-modes-warning.js"
]
},
"config": {