mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code 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
parent 2dc7ab4bbb 6519303549
commit b0ea3a08cd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/responsive-utilities.less
+2 -1
View File
@@ -6,7 +6,7 @@
// IE10 in Windows (Phone) 8
//
// 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
// apply some condtional CSS to *only* the Surface/desktop Windows 8. Look at
// our Getting Started page for more information on this bug.
@@ -14,6 +14,7 @@
// For more information, see the following:
//
// 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/
@-ms-viewport {