root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

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
parent a0d0864bd7 4912f960f4
commit f8de960c38
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
css.html
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>