0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	css.html
This commit is contained in:
Mark Otto 2013-08-23 10:47:36 -07:00
commit f8de960c38

View File

@ -1847,7 +1847,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</form>
</div><!-- /.bs-example -->
{% highlight html %}
<form class="form-inline" role="form">
<form role="form">
<fieldset disabled>
<div class="form-group">
<label for="disabledTextInput">Disabled input</label>