rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports

Browse Source 
Conflicts:
	getting-started.html
	less/responsive-utilities.less
This commit is contained in:
Mark Otto 2013-09-11 16:15:12 -07:00
commit b0ea3a08cd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
getting-started.html
View File

@ -728,7 +728,7 @@ bootstrap/
<p>See <a href="http://stackoverflow.com/questions/6771258/whats-the-difference-if-meta-http-equiv-x-ua-compatible-content-ie-edge">this StackOverflow question</a> for more information.</p> <p>See <a href="http://stackoverflow.com/questions/6771258/whats-the-difference-if-meta-http-equiv-x-ua-compatible-content-ie-edge">this StackOverflow question</a> for more information.</p>
<h3>Internet Explorer 10 in Windows 8 and Windows Phone 8</h3> <h3>Internet Explorer 10 in Windows 8 and Windows Phone 8</h3>
<p>Internet Explorer 10 doesn't differentiate <strong>device width</strong> from <storng>viewport width</storng>, and thus doesn't properly apply the media queries in Bootstrap's CSS. Normally you'd just add a quick snippet of CSS to fix this:</p> <p>Internet Explorer 10 doesn't differentiate <strong>device width</strong> from <strong>viewport width</strong>, and thus doesn't properly apply the media queries in Bootstrap's CSS. Normally you'd just add a quick snippet of CSS to fix this:</p>
{% highlight css %} {% highlight css %}
@-ms-viewport { width: device-width; } @-ms-viewport { width: device-width; }
{% endhighlight %} {% endhighlight %}

3
less/responsive-utilities.less
View File

@ -6,7 +6,7 @@
// IE10 in Windows (Phone) 8 // IE10 in Windows (Phone) 8
// //
// Support for responsive views via media queries is kind of borked in IE10, for // Support for responsive views via media queries is kind of borked in IE10, for
// both Surface/desktop in split view and Windows Phone 8. This particular fix // 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 // must be accompanied by a snippet of JavaScript to sniff the user agent and
// apply some condtional CSS to *only* the Surface/desktop Windows 8. Look at // apply some condtional CSS to *only* the Surface/desktop Windows 8. Look at
// our Getting Started page for more information on this bug. // our Getting Started page for more information on this bug.
@ -14,6 +14,7 @@
// For more information, see the following: // For more information, see the following:
// //
// Issue: https://github.com/twbs/bootstrap/issues/10497 // Issue: https://github.com/twbs/bootstrap/issues/10497
// Docs: http://getbootstrap.com/getting-started/#browsers
// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/ // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
@-ms-viewport { @-ms-viewport {