diff options
| author | Chris Rebert <[email protected]> | 2015-09-30 12:51:33 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-09-30 12:51:33 -0700 |
| commit | 8f627f6546f0892ea482b7ad49f05ec312e9c2d8 (patch) | |
| tree | 87dfad5a0e7fcd88b2efbee9af710697543c5e02 /docs | |
| parent | 79cdd66bbb53b8b55c4151c0b425062519f5a2e8 (diff) | |
| parent | 700966253ab3c9fa66d0ac3844e79e88d62f75d8 (diff) | |
| download | bootstrap-8f627f6546f0892ea482b7ad49f05ec312e9c2d8.tar.xz bootstrap-8f627f6546f0892ea482b7ad49f05ec312e9c2d8.zip | |
Merge pull request #17742 from twbs/ie10-viewport-bug-workaround-css
Add CSS portion of IE10 viewport bug workaround to docs & examples
Diffstat (limited to 'docs')
21 files changed, 72 insertions, 0 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 176f45fc0..6b53f00d8 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -32,6 +32,7 @@ {% if site.github %} <link href="../assets/css/docs.min.css" rel="stylesheet"> {% else %} +<link href="../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> <link href="../assets/css/src/pygments-manni.css" rel="stylesheet"> <link href="../assets/css/src/docs.css" rel="stylesheet"> {% endif %} diff --git a/docs/assets/css/ie10-viewport-bug-workaround.css b/docs/assets/css/ie10-viewport-bug-workaround.css new file mode 100644 index 000000000..8b3803b48 --- /dev/null +++ b/docs/assets/css/ie10-viewport-bug-workaround.css @@ -0,0 +1,15 @@ +/*! + * IE10 viewport hack for Surface/desktop Windows 8 bug + * Copyright 2014-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/* + * See the Getting Started docs for more information: + * http://getbootstrap.com/getting-started/#support-ie10-width + */ +@-webkit-viewport { width: device-width; } +@-moz-viewport { width: device-width; } +@-ms-viewport { width: device-width; } +@-o-viewport { width: device-width; } +@viewport { width: device-width; } diff --git a/docs/examples/blog/index.html b/docs/examples/blog/index.html index fdab9bc46..068550cf4 100644 --- a/docs/examples/blog/index.html +++ b/docs/examples/blog/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="blog.css" rel="stylesheet"> diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index b5e95694c..e00847aca 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Just for debugging purposes. Don't actually copy these 2 lines! --> <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]--> <script src="../../assets/js/ie-emulation-modes-warning.js"></script> diff --git a/docs/examples/cover/index.html b/docs/examples/cover/index.html index 5f740d1bc..9c6553768 100644 --- a/docs/examples/cover/index.html +++ b/docs/examples/cover/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="cover.css" rel="stylesheet"> diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index e6c10d6a4..fd8f7cfa0 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="dashboard.css" rel="stylesheet"> diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index 7b4b69574..242cf106c 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="grid.css" rel="stylesheet"> diff --git a/docs/examples/jumbotron-narrow/index.html b/docs/examples/jumbotron-narrow/index.html index 78e9e2c8b..e84a7bac0 100644 --- a/docs/examples/jumbotron-narrow/index.html +++ b/docs/examples/jumbotron-narrow/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="jumbotron-narrow.css" rel="stylesheet"> diff --git a/docs/examples/jumbotron/index.html b/docs/examples/jumbotron/index.html index c6cb4b1aa..6b7680108 100644 --- a/docs/examples/jumbotron/index.html +++ b/docs/examples/jumbotron/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="jumbotron.css" rel="stylesheet"> diff --git a/docs/examples/justified-nav/index.html b/docs/examples/justified-nav/index.html index 24d3ff397..43205de8e 100644 --- a/docs/examples/justified-nav/index.html +++ b/docs/examples/justified-nav/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="justified-nav.css" rel="stylesheet"> diff --git a/docs/examples/navbar-fixed-top/index.html b/docs/examples/navbar-fixed-top/index.html index ca9ca3df5..b416cca71 100644 --- a/docs/examples/navbar-fixed-top/index.html +++ b/docs/examples/navbar-fixed-top/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="navbar-fixed-top.css" rel="stylesheet"> diff --git a/docs/examples/navbar-static-top/index.html b/docs/examples/navbar-static-top/index.html index dc2e39929..42ddac283 100644 --- a/docs/examples/navbar-static-top/index.html +++ b/docs/examples/navbar-static-top/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="navbar-static-top.css" rel="stylesheet"> diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index e396be315..167534fd7 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="navbar.css" rel="stylesheet"> diff --git a/docs/examples/non-responsive/index.html b/docs/examples/non-responsive/index.html index 608dc369e..206204373 100644 --- a/docs/examples/non-responsive/index.html +++ b/docs/examples/non-responsive/index.html @@ -16,6 +16,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="non-responsive.css" rel="stylesheet"> diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index 69d04694f..5a7b13f47 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="offcanvas.css" rel="stylesheet"> diff --git a/docs/examples/signin/index.html b/docs/examples/signin/index.html index ab249ed5f..af778a0f0 100644 --- a/docs/examples/signin/index.html +++ b/docs/examples/signin/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="signin.css" rel="stylesheet"> diff --git a/docs/examples/starter-template/index.html b/docs/examples/starter-template/index.html index 8246a9726..5a6733b94 100644 --- a/docs/examples/starter-template/index.html +++ b/docs/examples/starter-template/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="starter-template.css" rel="stylesheet"> diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 07f9c8440..6df7f042a 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="sticky-footer-navbar.css" rel="stylesheet"> diff --git a/docs/examples/sticky-footer/index.html b/docs/examples/sticky-footer/index.html index e619c15da..26962f6e8 100644 --- a/docs/examples/sticky-footer/index.html +++ b/docs/examples/sticky-footer/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="sticky-footer.css" rel="stylesheet"> diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index 0d9bcdadd..8ce83159c 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -15,6 +15,8 @@ <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> <!-- Bootstrap theme --> <link href="../../dist/css/bootstrap-theme.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> <!-- Custom styles for this template --> <link href="theme.css" rel="stylesheet"> diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html index 5fcd00f4c..860542760 100644 --- a/docs/examples/tooltip-viewport/index.html +++ b/docs/examples/tooltip-viewport/index.html @@ -14,6 +14,9 @@ <!-- Bootstrap core CSS --> <link href="../../dist/css/bootstrap.min.css" rel="stylesheet"> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <link href="../../assets/css/ie10-viewport-bug-workaround.css" rel="stylesheet"> + <!-- Custom styles for this template --> <link href="tooltip-viewport.css" rel="stylesheet"> |
