]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8f16abb)
Clean up inclusion of IE-specific JS files. 17492/head
authorXhmikosR <xhmikosr@gmail.com>
Sun, 6 Sep 2015 09:16:01 +0000 (12:16 +0300)
committerXhmikosR <xhmikosr@gmail.com>
Sun, 6 Sep 2015 10:33:52 +0000 (13:33 +0300)
Move them to footer, and remove duplicate ones.

[ci skip]

20 files changed:
docs/_includes/footer.html patch | blob | blame | history
docs/_includes/header.html patch | blob | blame | history
docs/examples/album/index.html patch | blob | blame | history
docs/examples/blog/index.html patch | blob | blame | history
docs/examples/carousel/index.html patch | blob | blame | history
docs/examples/cover/index.html patch | blob | blame | history
docs/examples/dashboard/index.html patch | blob | blame | history
docs/examples/grid/index.html patch | blob | blame | history
docs/examples/jumbotron/index.html patch | blob | blame | history
docs/examples/justified-nav/index.html patch | blob | blame | history
docs/examples/narrow-jumbotron/index.html patch | blob | blame | history
docs/examples/navbar-top-fixed/index.html patch | blob | blame | history
docs/examples/navbar-top/index.html patch | blob | blame | history
docs/examples/navbar/index.html patch | blob | blame | history
docs/examples/offcanvas/index.html patch | blob | blame | history
docs/examples/signin/index.html patch | blob | blame | history
docs/examples/starter-template/index.html patch | blob | blame | history
docs/examples/sticky-footer-navbar/index.html patch | blob | blame | history
docs/examples/sticky-footer/index.html patch | blob | blame | history
docs/examples/tooltip-viewport/index.html patch | blob | blame | history

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 3e12c58b8b31ed88436948a2d90f034c965e4577..eb35020baf7248d00e48557034bc3c1d80883f0a 100644 (file)
--- 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 bba5aad3d5c8e9ae63cde6eb4fd00356a999ee14..e637dc4700e36b64c9e68776b6a6c346470e6af1 100644 (file)
--- 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">
diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html
index 5c3c0ea7719630d61bd2b2b2928a0bbfca13921c..557f57ec2c989de30b8dc4714b73d554c01520f1 100644 (file)
--- a/docs/examples/album/index.html
+++ b/docs/examples/album/index.html
@@ -15,9 +15,6 @@
 
     <!-- Custom styles for this template -->
     <link href="album.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -126,5 +123,7 @@
       });
     </script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html
index b1acf85ef65ebd0e8fc8d8a659a0808831f8fd05..a598f8413d1f80017671a1056dc3d0152ca56c7a 100644 (file)
--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="blog.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index 9c6ae35d978e1f9cb3a1cc5bf8c1b55525192064..d347865401b9d4d748d4541876cff0a5f03722db 100644 (file)
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -14,9 +14,6 @@
     <!-- Bootstrap core CSS -->
     <link href="../../dist/css/bootstrap.min.css" rel="stylesheet">
 
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
-
     <!-- Custom styles for this template -->
     <link href="carousel.css" rel="stylesheet">
   </head>
diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html
index e7c7539a92b5f097e06bee1298bf0cadf2e2c4d8..54b0d705a985c517ce27431fe85f82268521aa6f 100644 (file)
--- a/docs/examples/cover/index.html
+++ b/docs/examples/cover/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="cover.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index 6d92f41ae141ceb1b4e60ed4258982da9444a8e7..b51f2d86e379af9c0182bdea6539ccd698d916ad 100644 (file)
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="dashboard.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 3c4c68df6c3928cf49293a63ef7c5e4e278ac557..c64b37dc5cbc8b7a976a67cef014564622a3676d 100644 (file)
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="grid.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -176,5 +173,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
index 37ddabf4bf75a7789a368c994739fa85f8e35ea1..674c5c2b5012694c5e06ac2bd82577cf5822244d 100644 (file)
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="jumbotron.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -81,5 +78,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html
index ad3de83520ab7f1722595273a01d6e74706400ad..b0d37f4645aa3b1f197cac8d130b12df230eb3d8 100644 (file)
--- a/docs/examples/justified-nav/index.html
+++ b/docs/examples/justified-nav/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="justified-nav.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -79,5 +76,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/narrow-jumbotron/index.html b/docs/examples/narrow-jumbotron/index.html
index 3a52a710d1b216b5b78bfb78b9b5bc497188a89d..86c732ba7a66bf902129bae0a06b7b7589b101f4 100644 (file)
--- a/docs/examples/narrow-jumbotron/index.html
+++ b/docs/examples/narrow-jumbotron/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="narrow-jumbotron.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -81,5 +78,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/navbar-top-fixed/index.html b/docs/examples/navbar-top-fixed/index.html
index b5caa644d9fb28e85b8defaf06a0c2cb34ca55ab..c716bec7de6dd047f5393f48ee2a9b4d4658212c 100644 (file)
--- a/docs/examples/navbar-top-fixed/index.html
+++ b/docs/examples/navbar-top-fixed/index.html
@@ -15,9 +15,6 @@
 
     <!-- Custom styles for this template -->
     <link href="navbar-top-fixed.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -50,5 +47,7 @@
     <!-- 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="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/navbar-top/index.html b/docs/examples/navbar-top/index.html
index f54f5eafd07435fc87e4e4426df56efd7df0a2e7..87c73d56d5614a19f4fddf8be37c1e00e537cc1c 100644 (file)
--- a/docs/examples/navbar-top/index.html
+++ b/docs/examples/navbar-top/index.html
@@ -15,9 +15,6 @@
 
     <!-- Custom styles for this template -->
     <link href="navbar-top.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -48,5 +45,7 @@
     <!-- 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="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
index 51328c795384e5c7dde373405681ae37da87c919..53269a094fd487dfa934978d444d6c68dcfbe354 100644 (file)
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="navbar.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -70,5 +67,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
index 5382011f7f36b12a584855047376411d48774339..6dc7c044cc1cb636f01de3750be4dd32b046499a 100644 (file)
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="offcanvas.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html
index 9fb60b33c0051aab2a7149ec4e634977efe3b08c..6a7b99c2ffad712f6b88fd95a54661f64e87c56e 100644 (file)
--- a/docs/examples/signin/index.html
+++ b/docs/examples/signin/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="signin.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -45,5 +42,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html
index 84b3bdec6d3cd81611ff6227d23bbd85111a0eb8..ca82debb21e61e8539433827c459171b56ae79d9 100644 (file)
--- a/docs/examples/starter-template/index.html
+++ b/docs/examples/starter-template/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="starter-template.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -54,5 +51,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index 56408c6a8a7a9e50624e9555f8af944e79f96ae5..fc41d08b4308e9d4a69dee23216996058ed0d174 100644 (file)
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="sticky-footer-navbar.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -79,5 +76,7 @@
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
     <script src="../../dist/js/bootstrap.min.js"></script>
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html
index dd5b4e39a79a75ebbf809fc0836bcebab750d195..9dcb7a8ef92987240fc87bab103ce253a4b30e57 100644 (file)
--- a/docs/examples/sticky-footer/index.html
+++ b/docs/examples/sticky-footer/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="sticky-footer.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
@@ -42,5 +39,7 @@
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
+    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </body>
 </html>
diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html
index e5773948cd909b2ebcfc5e2cedbb0ae76a3b4de8..7327331e1367bbbfa65e398d6452230fc0e41a9c 100644 (file)
--- a/docs/examples/tooltip-viewport/index.html
+++ b/docs/examples/tooltip-viewport/index.html
@@ -16,9 +16,6 @@
 
     <!-- Custom styles for this template -->
     <link href="tooltip-viewport.css" rel="stylesheet">
-
-    <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
-    <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
   </head>
 
   <body>
Mirror of https://github.com/twbs/bootstrap.git