diff options
| author | Chris Rebert <[email protected]> | 2015-01-21 13:14:07 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2015-01-21 13:14:07 -0800 |
| commit | 59542aa36757e41541f275013cecd15ffbae0a11 (patch) | |
| tree | f254a44db30a90b84ef270cc54edade927783cea /scss | |
| parent | 55cb723e08fa407d499b7aebde7d6e797b6d4ac4 (diff) | |
| parent | a1126ef655d130b726c7d08359d589e93fc9531a (diff) | |
| download | bootstrap-59542aa36757e41541f275013cecd15ffbae0a11.tar.xz bootstrap-59542aa36757e41541f275013cecd15ffbae0a11.zip | |
Merge pull request #90 from twbs/at-viewport
Reorg @viewport now that we don't need to worry about non-responsiveness
Diffstat (limited to 'scss')
| -rw-r--r-- | scss/_scaffolding.scss | 20 | ||||
| -rw-r--r-- | scss/_utilities-responsive.scss | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss index a0d73be40..038ee020b 100644 --- a/scss/_scaffolding.scss +++ b/scss/_scaffolding.scss @@ -20,6 +20,26 @@ html { } +// Make viewport responsive +// +// @viewport is supposed to eventually replace <meta name="viewport">. It's manually prefixed for forward-compatibility. +// +// @viewport is also needed because IE 10+ doesn't honor <meta name="viewport"> in some cases. +// (See http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/) +// +// However, `device-width` is broken on IE 10 on Windows (Phone) 8, +// (see http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ +// and https://github.com/twbs/bootstrap/issues/10497) +// and the fix for that involves a snippet of JavaScript to sniff the user agent and apply some conditional CSS. +// See http://getbootstrap.com/getting-started/#support-ie10-width for the relevant hack. + +@-moz-viewport { width: device-width; } +@-ms-viewport { width: device-width; } +@-o-viewport { width: device-width; } +@-webkit-viewport { width: device-width; } +@viewport { width: device-width; } + + // Body reset html { diff --git a/scss/_utilities-responsive.scss b/scss/_utilities-responsive.scss index 837cda7b9..bb8c784db 100644 --- a/scss/_utilities-responsive.scss +++ b/scss/_utilities-responsive.scss @@ -16,26 +16,6 @@ } -// IE10 in Windows (Phone) 8 -// -// Support for responsive views via media queries is kind of borked in IE10, for -// Surface/desktop in split view and for Windows Phone 8. This particular fix -// must be accompanied by a snippet of JavaScript to sniff the user agent and -// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at -// our Getting Started page for more information on this bug. -// -// For more information, see the following: -// -// Issue: https://github.com/twbs/bootstrap/issues/10497 -// Docs: http://getbootstrap.com/getting-started/#support-ie10-width -// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/ -// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ - -@-ms-viewport { - width: device-width; -} - - // Print utilities // // Media queries are placed on the inside to be mixin-friendly. |