rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-19 16:54:24 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2013-08-15 10:30:47 -07:00
commit f681c9712d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
css.html
View File

@ -127,11 +127,11 @@ base_url: "../"
</th>
<th>
Medium devices
<small>Desktops (&gt;992px)</small>
<small>Desktops (&ge;992px)</small>
</th>
<th>
Large devices
<small>Desktops (&gt;1200px)</small>
<small>Desktops (&ge;1200px)</small>
</th>
</tr>
</thead>
@ -1355,7 +1355,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<legend>Legend</legend>
<div class="form-group">
<label for="exampleInputEmail1">Email address</label>
<input type="text" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
<input type="email" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
</div>
<div class="form-group">
<label for="exampleInputPassword1">Password</label>
@ -1380,7 +1380,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<legend>Legend</legend>
<div class="form-group">
<label for="exampleInputEmail1">Email address</label>
<input type="text" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
<input type="email" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
</div>
<div class="form-group">
<label for="exampleInputPassword1">Password</label>
@ -1415,7 +1415,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<form class="bs-example form-inline" role="form">
<div class="form-group">
<label class="sr-only" for="exampleInputEmail2">Email address</label>
<input type="text" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
<input type="email" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
</div>
<div class="form-group">
<label class="sr-only" for="exampleInputPassword2">Password</label>
@ -1432,7 +1432,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<form class="form-inline" role="form">
<div class="form-group">
<label class="sr-only" for="exampleInputEmail2">Email address</label>
<input type="text" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
<input type="email" class="form-control" id="exampleInputEmail2" placeholder="Enter email">
</div>
<div class="form-group">
<label class="sr-only" for="exampleInputPassword2">Password</label>
@ -1453,7 +1453,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<div class="form-group">
<label for="inputEmail1" class="col-lg-2 control-label">Email</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="inputEmail1" placeholder="Email">
<input type="email" class="form-control" id="inputEmail1" placeholder="Email">
</div>
</div>
<div class="form-group">
@ -1482,7 +1482,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<div class="form-group">
<label for="inputEmail1" class="col-lg-2 control-label">Email</label>
<div class="col-lg-10">
<input type="text" class="form-control" id="inputEmail1" placeholder="Email">
<input type="email" class="form-control" id="inputEmail1" placeholder="Email">
</div>
</div>
<div class="form-group">
@ -2142,11 +2142,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</th>
<th>
Medium devices
<small>Desktops (&gt;992px)</small>
<small>Desktops (&ge;992px)</small>
</th>
<th>
Large devices
<small>Desktops (&gt;1200px)</small>
<small>Desktops (&ge;1200px)</small>
</th>
</tr>
</thead>