From: Mark Otto <otto@github.com>
Date: Wed, 11 Sep 2013 23:15:12 +0000 (-0700)
Subject: Merge branch 'ie_viewports' of github.com:twbs/bootstrap into ie_viewports
X-Git-Tag: v3.0.3~14^2~15^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0ea3a08cde1a4507cc0f171cbe335407a84b738;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	getting-started.html
	less/responsive-utilities.less
---

b0ea3a08cde1a4507cc0f171cbe335407a84b738
diff --cc less/responsive-utilities.less
index a56c028875,138562eb88..6cacabec75
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
@@@ -6,14 -6,14 +6,15 @@@
  // 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
 -// both Surface/desktop in split view and for 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 conditional 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.
  //
  // 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 {