From: XhmikosR <xhmikosr@gmail.com>
Date: Tue, 25 Sep 2018 11:09:24 +0000 (+0300)
Subject: docs: Concat the IE files with the rest.
X-Git-Tag: v3.4.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd71b40aedce5e51959fe20e12d080e76bac92a8;p=thirdparty%2Fbootstrap.git

docs: Concat the IE files with the rest.
---

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 028d5722ad..de9af4fc65 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 7446ba8867..8b0e175d13 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 146b2b5ecd..8e035b5a51 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": {