Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

This commit is contained in:
Mark Otto 2013-08-06 18:06:36 -07:00
commit 000f89829e
3 changed files with 37 additions and 27 deletions

View File

@ -14,9 +14,12 @@
<li>
<a href="#browsers">Browser support</a>
</li>
<li>
<a href="#third-parties">Third party support</a>
</li>
<li>
<a href="#license-faqs">License FAQs</a>
</li>
<li>
<a href="#customizing">Customizing Bootstrap</a>
</li>
</li>

View File

@ -32,30 +32,6 @@
"browser_version": "latest",
"os": "Windows",
"os_version": "7"
},
{
"browser": "ie",
"browser_version": "8.0",
"os": "Windows",
"os_version": "XP"
},
{
"browser": "ie",
"browser_version": "9.0",
"os": "Windows",
"os_version": "7"
},
{
"browser": "ie",
"browser_version": "10.0",
"os": "Windows",
"os_version": "8"
},
{
"browser": "ie",
"browser_version": "11.0",
"os": "Windows",
"os_version": "7"
}
]
}

View File

@ -120,11 +120,11 @@ bootstrap/
<!-- Browser compatibility
<!-- Browser support
================================================== -->
<div class="bs-docs-section">
<div class="page-header">
<h1 id="browsers">Browser compatibility</h1>
<h1 id="browsers">Browser support</h1>
</div>
<p class="lead">Bootstrap is built to work best in the latest desktop and mobile browsers, meaning older and less advanced browsers might receive a less stylized, though fully functional, version of certain components.</p>
@ -176,6 +176,37 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
<!-- Third party support
================================================== -->
<div class="bs-docs-section">
<div class="page-header">
<h1 id="third-parties">Third party support</h1>
</div>
<p class="lead">While we don't officially support any third party plugins or add-ons, we do offer some helpful advice to help avoid potential issues in your projects.</p>
<h3>Google Maps</h3>
<p>If you're using Google Maps on a Bootstrapped project, you might run into some display problems due to our use of <code>* { box-sizing: border-box; }</code>. Previously, you may have also ran into issues with the use of <code>max-width</code> on images. The following snippet should avoid all those problems.</p>
{% highlight css %}
/* Fix Google Maps canvas
*
* Wrap your Google Maps embed in a `.google-map-canvas` to reset Bootstrap's
* global `box-sizing` changes. You may optionally need to reset the `max-width`
* on images in case you've applied that anywhere else. (That shouldn't be as
* necessary with Bootstrap 3 though as that behavior is relegated to the
* `.img-responsive` class.)
*/
.google-map-canvas,
.google-map-canvas * { .box-sizing(content-box); }
/* Optional responsive image override */
img { max-width: none; }
{% endhighlight %}
</div>
<!-- License FAQs
================================================== -->
<div class="bs-docs-section">