rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Mark Otto 2013-05-13 00:09:35 -07:00
commit 37898d5e19
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/css.html
View file

@ -1273,10 +1273,10 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</div>
<form class="bs-example form-inline">
<input class="col col-lg-3" type="email" placeholder="test@example.com" required>
<input type="email" placeholder="test@example.com" required>
</form>
{% highlight html %}
<input class="col col-lg-3" type="email" placeholder="test@example.com" required>
<input type="email" placeholder="test@example.com" required>
{% endhighlight %}
<h3 id="forms-disabled-inputs">Disabled inputs</h3>