aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-09-06 09:36:40 -0700
committerMark Otto <[email protected]>2015-09-06 09:36:40 -0700
commitdee38e33b5f8e39f2171737b6e28818aa396992d (patch)
treefc317eec861fdb15dd469f0d898683e34053b3a0 /docs
parent0d0edebea61ec0fbc38215e2316b0d6c7d7f0228 (diff)
parent1ebf85223610d0f5983f3e9d1fb2f0a8f609b56d (diff)
downloadbootstrap-dee38e33b5f8e39f2171737b6e28818aa396992d.tar.xz
bootstrap-dee38e33b5f8e39f2171737b6e28818aa396992d.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'docs')
-rw-r--r--docs/_includes/footer.html1
-rw-r--r--docs/_includes/header.html4
-rw-r--r--docs/examples/album/index.html5
-rw-r--r--docs/examples/blog/index.html3
-rw-r--r--docs/examples/carousel/index.html3
-rw-r--r--docs/examples/cover/index.html3
-rw-r--r--docs/examples/dashboard/index.html3
-rw-r--r--docs/examples/grid/index.html5
-rw-r--r--docs/examples/jumbotron/index.html5
-rw-r--r--docs/examples/justified-nav/index.html5
-rw-r--r--docs/examples/narrow-jumbotron/index.html5
-rw-r--r--docs/examples/navbar-top-fixed/index.html5
-rw-r--r--docs/examples/navbar-top/index.html5
-rw-r--r--docs/examples/navbar/index.html5
-rw-r--r--docs/examples/offcanvas/index.html3
-rw-r--r--docs/examples/signin/index.html5
-rw-r--r--docs/examples/starter-template/index.html5
-rw-r--r--docs/examples/sticky-footer-navbar/index.html5
-rw-r--r--docs/examples/sticky-footer/index.html5
-rw-r--r--docs/examples/tooltip-viewport/index.html3
20 files changed, 25 insertions, 58 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">
diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html
index 5c3c0ea77..557f57ec2 100644
--- 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 b1acf85ef..a598f8413 100644
--- 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 9c6ae35d9..d34786540 100644
--- 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 e7c7539a9..54b0d705a 100644
--- 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 6d92f41ae..b51f2d86e 100644
--- 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 3c4c68df6..c64b37dc5 100644
--- 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 37ddabf4b..674c5c2b5 100644
--- 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 ad3de8352..b0d37f464 100644
--- 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 3a52a710d..86c732ba7 100644
--- 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 b5caa644d..c716bec7d 100644
--- 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 f54f5eafd..87c73d56d 100644
--- 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 51328c795..53269a094 100644
--- 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 5382011f7..6dc7c044c 100644
--- 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 9fb60b33c..6a7b99c2f 100644
--- 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 84b3bdec6..ca82debb2 100644
--- 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 56408c6a8..fc41d08b4 100644
--- 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 dd5b4e39a..9dcb7a8ef 100644
--- 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 e5773948c..7327331e1 100644
--- 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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 19:18:39 +0000