mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 21:49:09 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into carousel-glyphicons-mainstream

Browse Source 
Conflicts:
	javascript.html
This commit is contained in:
Mark Otto 2013-09-03 18:43:42 -07:00
commit dcdafa4220
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/raw-files.js
View File

File diff suppressed because one or more lines are too long

26
getting-started.html
View File

@ -660,7 +660,7 @@ bootstrap/
<li>Internet Explorer</li>
<li>Opera (Mac, Windows)</li>
</ul>
<p>Unofficially, Bootstrap should look and behave well enough in Chromium for Linux and Internet Explorer 7, though they are not officially supported.</p>
<p>Unofficially, Bootstrap should look and behave well enough in Chromium for Linux, Firefox for Linux, and Internet Explorer 7, though they are not officially supported.</p>
<h3>Internet Explorer 8 and 9</h3>
<p>Internet Explorer 8 and 9 are also supported, however, please be aware that some CSS3 properties and HTML5 elements are not fully supported by these browsers. In addition, <strong>Internet Explorer 8 requires the use of <a href="https://github.com/scottjehl/Respond">respond.js</a> to enable media query support.</strong></p>
@ -668,38 +668,36 @@ bootstrap/
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Feature</th>
<th>Internet Explorer 8</th>
<th>Internet Explorer 9</th>
<th class="col-xs-4">Feature</th>
<th class="col-xs-4">Internet Explorer 8</th>
<th class="col-xs-4">Internet Explorer 9</th>
</tr>
</thead>
<tbody>
<tr>
<td scope="row"><code>border-radius</code></td>
<td class="text-muted">No</td>
<td>Yes</td>
<td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
<td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
</tr>
<tr>
<td scope="row"><code>box-shadow</code></td>
<td class="text-muted">No</td>
<td>Yes</td>
<td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
<td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported</td>
</tr>
<tr>
<td scope="row"><code>transform</code></td>
<td class="text-muted">No</td>
<td>Yes, with <code>-ms</code></td>
<td class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
<td class="text-success"><span class="glyphicon glyphicon-ok"></span> Supported, with <code>-ms</code> prefix</td>
</tr>
<tr>
<td scope="row"><code>transition</code></td>
<td class="text-muted">No</td>
<td class="text-muted">No</td>
<td colspan="2" class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
</tr>
</tbody>
<tbody>
<tr>
<td scope="row"><code>placeholder</code></td>
<td class="text-muted">No</td>
<td class="text-muted">No</td>
<td colspan="2" class="text-danger"><span class="glyphicon glyphicon-remove"></span> Not supported</td>
</tr>
</tbody>
</table>

4
javascript.html
View File

@ -1711,6 +1711,10 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {
</a>
</div>
{% endhighlight %}
<div class="bs-callout bs-callout-warning" id="callout-carousel-transitions">
<h4>Transition animations not supported in Internet Explorer 8 &amp; 9</h4>
<p>Bootstrap exclusively uses CSS3 for its animations, but Internet Explorer 8 &amp; 9 don't support the necessary CSS properties. Thus, there are no slide transition animations when using these browsers. We have intentionally decided not to include jQuery-based fallbacks for the transitions.</p>
</div>
<h3>Optional captions</h3>
<p>Add captions to your slides easily with the <code>.carousel-caption</code> element within any <code>.item</code>. Place just about any optional HTML within there and it will be automatically aligned and formatted.</p>