aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-04-24 18:50:30 -0700
committerMark Otto <[email protected]>2014-04-24 18:50:30 -0700
commitfe11ac77a26ab321bb6648d557a15416bab1d74e (patch)
tree1e352422c3f3b61f8b0bd90e5ead2e6dd2d340d8 /docs
parent0e48cb2f9383df0ba4ba54168f8730b4694bee0c (diff)
parent448086f95a9114fb9ad96b76c5fc7b12a6fc51fd (diff)
downloadbootstrap-fe11ac77a26ab321bb6648d557a15416bab1d74e.tar.xz
bootstrap-fe11ac77a26ab321bb6648d557a15416bab1d74e.zip
Merge pull request #13390 from twbs/ie10-viewport-bug
add IE10 viewport bug workaround to examples
Diffstat (limited to 'docs')
-rw-r--r--docs/_includes/header.html2
-rw-r--r--docs/assets/js/_src/application.js14
-rw-r--r--docs/assets/js/ie10-viewport-bug-workaround.js21
-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/equal-height-columns/index.html3
-rw-r--r--docs/examples/grid/index.html3
-rw-r--r--docs/examples/jumbotron-narrow/index.html3
-rw-r--r--docs/examples/jumbotron/index.html3
-rw-r--r--docs/examples/justified-nav/index.html3
-rw-r--r--docs/examples/navbar-fixed-top/index.html3
-rw-r--r--docs/examples/navbar-static-top/index.html3
-rw-r--r--docs/examples/navbar/index.html3
-rw-r--r--docs/examples/non-responsive/index.html3
-rw-r--r--docs/examples/offcanvas/index.html3
-rw-r--r--docs/examples/rtl/index.html3
-rw-r--r--docs/examples/signin/index.html3
-rw-r--r--docs/examples/starter-template/index.html3
-rw-r--r--docs/examples/sticky-footer-navbar/index.html3
-rw-r--r--docs/examples/sticky-footer/index.html3
-rw-r--r--docs/examples/theme/index.html3
-rw-r--r--docs/examples/tooltip-viewport/index.html3
24 files changed, 86 insertions, 14 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index 7879bf392..4eee52a3c 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -19,6 +19,8 @@
<!-- Documentation extras -->
<link href="../assets/css/docs.min.css" rel="stylesheet">
<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+<script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
diff --git a/docs/assets/js/_src/application.js b/docs/assets/js/_src/application.js
index 2566298b8..08ca5f907 100644
--- a/docs/assets/js/_src/application.js
+++ b/docs/assets/js/_src/application.js
@@ -14,20 +14,6 @@
$(function () {
- // IE10 viewport hack for Surface/desktop Windows 8 bug
- //
- // See Getting Started docs for more information
- if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
- var msViewportStyle = document.createElement('style')
- msViewportStyle.appendChild(
- document.createTextNode(
- '@-ms-viewport{width:auto!important}'
- )
- )
- document.querySelector('head').appendChild(msViewportStyle)
- }
-
-
var $window = $(window)
var $body = $(document.body)
diff --git a/docs/assets/js/ie10-viewport-bug-workaround.js b/docs/assets/js/ie10-viewport-bug-workaround.js
new file mode 100644
index 000000000..256a6a65a
--- /dev/null
+++ b/docs/assets/js/ie10-viewport-bug-workaround.js
@@ -0,0 +1,21 @@
+/*!
+ * IE10 viewport hack for Surface/desktop Windows 8 bug
+ * Copyright 2014 Twitter, Inc.
+ * Licensed under the Creative Commons Attribution 3.0 Unported License. For
+ * details, see http://creativecommons.org/licenses/by/3.0/.
+ */
+
+// See the Getting Started docs for more information:
+// http://getbootstrap.com/getting-started/#support-ie10-width
+
+(function () {
+ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
+ var msViewportStyle = document.createElement('style')
+ msViewportStyle.appendChild(
+ document.createTextNode(
+ '@-ms-viewport{width:auto!important}'
+ )
+ )
+ document.querySelector('head').appendChild(msViewportStyle)
+ }
+})();
diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html
index 43a10d36f..ee787c59d 100644
--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html
index 2faa2e273..3372c87ef 100644
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@@ -16,6 +16,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html
index 5cc41e329..f4765685d 100644
--- a/docs/examples/cover/index.html
+++ b/docs/examples/cover/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html
index a5f366220..0b83d30d0 100644
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/equal-height-columns/index.html b/docs/examples/equal-height-columns/index.html
index 8bc4b7f97..b31e7bd7d 100644
--- a/docs/examples/equal-height-columns/index.html
+++ b/docs/examples/equal-height-columns/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html
index 662c7af09..7e55b5b90 100644
--- a/docs/examples/grid/index.html
+++ b/docs/examples/grid/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/jumbotron-narrow/index.html b/docs/examples/jumbotron-narrow/index.html
index cf24a0aa8..372bac7e3 100644
--- a/docs/examples/jumbotron-narrow/index.html
+++ b/docs/examples/jumbotron-narrow/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html
index d2bc4eaba..9cc8ae592 100644
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html
index 466e2f2a9..0b682cee8 100644
--- a/docs/examples/justified-nav/index.html
+++ b/docs/examples/justified-nav/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/navbar-fixed-top/index.html b/docs/examples/navbar-fixed-top/index.html
index 75b98a41b..2224c49ca 100644
--- a/docs/examples/navbar-fixed-top/index.html
+++ b/docs/examples/navbar-fixed-top/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/navbar-static-top/index.html b/docs/examples/navbar-static-top/index.html
index d1a6ebd6f..b040d500c 100644
--- a/docs/examples/navbar-static-top/index.html
+++ b/docs/examples/navbar-static-top/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html
index de6c990b7..77fbab605 100644
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html
index 2a6b2125f..aa95550fe 100644
--- a/docs/examples/non-responsive/index.html
+++ b/docs/examples/non-responsive/index.html
@@ -21,6 +21,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html
index 3793097d8..df596fdce 100644
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/rtl/index.html b/docs/examples/rtl/index.html
index ebeb83744..42cea4fb6 100644
--- a/docs/examples/rtl/index.html
+++ b/docs/examples/rtl/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html
index 820615593..6a898f427 100644
--- a/docs/examples/signin/index.html
+++ b/docs/examples/signin/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html
index 1c07936c8..e9eb5592b 100644
--- a/docs/examples/starter-template/index.html
+++ b/docs/examples/starter-template/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html
index 47887775f..73dfe3ef0 100644
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html
index 9df6b3852..f714a1383 100644
--- a/docs/examples/sticky-footer/index.html
+++ b/docs/examples/sticky-footer/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html
index 99e2202ee..a2e228c84 100644
--- a/docs/examples/theme/index.html
+++ b/docs/examples/theme/index.html
@@ -21,6 +21,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html
index 1dfb7fec4..ccf6ef078 100644
--- a/docs/examples/tooltip-viewport/index.html
+++ b/docs/examples/tooltip-viewport/index.html
@@ -19,6 +19,9 @@
<!-- Just for debugging purposes. Don't actually copy this line! -->
<!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]-->
+ <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+ <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script>
+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>