diff options
| author | Mark Otto <[email protected]> | 2013-09-11 16:15:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 16:15:12 -0700 |
| commit | b0ea3a08cde1a4507cc0f171cbe335407a84b738 (patch) | |
| tree | e74b3c874b0555adc5c2255d77aff07b32949aa2 /less | |
| parent | 2dc7ab4bbb70abfcdb0aa179935c72ddbb3e66e5 (diff) | |
| parent | 6519303549732d61de9e2905916f64a7d5b76910 (diff) | |
| download | bootstrap-b0ea3a08cde1a4507cc0f171cbe335407a84b738.tar.xz bootstrap-b0ea3a08cde1a4507cc0f171cbe335407a84b738.zip | |
Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
Conflicts:
getting-started.html
less/responsive-utilities.less
Diffstat (limited to 'less')
| -rw-r--r-- | less/responsive-utilities.less | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less index a56c02887..6cacabec7 100644 --- a/less/responsive-utilities.less +++ b/less/responsive-utilities.less @@ -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 { |