diff options
| author | Mark Otto <[email protected]> | 2013-09-11 16:35:27 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 16:35:27 -0700 |
| commit | d88e743b417c3e149c9fcb02c8d5580afb8baee0 (patch) | |
| tree | d8018f676ed81eb5ec5dcbfbb990ca4aa6d300fd /assets | |
| parent | fddcadbc21cf35fb584ab02dc0817612da6596a4 (diff) | |
| parent | 725e2b9ccf66cd54e64ff5d15bf8b2744b5122cd (diff) | |
| download | bootstrap-d88e743b417c3e149c9fcb02c8d5580afb8baee0.tar.xz bootstrap-d88e743b417c3e149c9fcb02c8d5580afb8baee0.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/js/application.js | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/assets/js/application.js b/assets/js/application.js index 81b644b97..76c24e5a6 100644 --- a/assets/js/application.js +++ b/assets/js/application.js @@ -6,6 +6,21 @@ $(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.getElementsByTagName("head")[0]. + appendChild(msViewportStyle); + } + + var $window = $(window) var $body = $(document.body) |