Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #17742 from twbs/ie10-viewport-bug-workaround-css
Add CSS portion of IE10 viewport bug workaround to docs & examples
  • Loading branch information
cvrebert committed Sep 30, 2015
2 parents 79cdd66 + 7009662 commit 8f627f6
Show file tree
Hide file tree
Showing 22 changed files with 73 additions and 0 deletions.
1 change: 1 addition & 0 deletions Gruntfile.js
Expand Up @@ -244,6 +244,7 @@ module.exports = function (grunt) {
},
docs: {
src: [
'docs/assets/css/ie10-viewport-bug-workaround.css',
'docs/assets/css/src/pygments-manni.css',
'docs/assets/css/src/docs.css'
],
Expand Down
1 change: 1 addition & 0 deletions docs/_includes/header.html
Expand Up @@ -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 %}
Expand Down
15 changes: 15 additions & 0 deletions 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; }
3 changes: 3 additions & 0 deletions docs/examples/blog/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/carousel/index.html
Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions docs/examples/cover/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/dashboard/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/grid/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/jumbotron-narrow/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/jumbotron/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/justified-nav/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/navbar-fixed-top/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/navbar-static-top/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/navbar/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/non-responsive/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/offcanvas/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/signin/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/starter-template/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/sticky-footer-navbar/index.html
Expand Up @@ -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">

Expand Down
3 changes: 3 additions & 0 deletions docs/examples/sticky-footer/index.html
Expand Up @@ -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">

Expand Down
2 changes: 2 additions & 0 deletions docs/examples/theme/index.html
Expand Up @@ -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">
Expand Down
3 changes: 3 additions & 0 deletions docs/examples/tooltip-viewport/index.html
Expand Up @@ -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">

Expand Down

0 comments on commit 8f627f6

Please sign in to comment.