0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

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

This commit is contained in:
Mark Otto 2013-04-07 11:49:53 -07:00
commit cfea6d295e

View File

@ -2137,7 +2137,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<input class="btn" type="button" value="Input"> <input class="btn" type="button" value="Input">
<input class="btn" type="submit" value="Submit"> <input class="btn" type="submit" value="Submit">
{% endhighlight %} {% endhighlight %}
<p>As a best practice, <strong>we highly recommend matching using the <code>&lt;button&lt;</code> element whenever possible</strong> to ensure matching cross-browser rendering.</p> <p>As a best practice, <strong>we highly recommend matching using the <code>&lt;button&gt;</code> element whenever possible</strong> to ensure matching cross-browser rendering.</p>
</div> </div>
@ -2561,6 +2561,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</div> </div>
{% endhighlight %} {% endhighlight %}
<p class="alert alert-info">
<strong>Heads up!</strong>
Using icons without any additional content means the icons are not represented to screen reader users.
</p>
<h5>Dropdown in a button group</h5> <h5>Dropdown in a button group</h5>
<div class="bs-docs-example"> <div class="bs-docs-example">
<div class="btn-group"> <div class="btn-group">