Skip to content

B
bootstrap
Commit f681c971 authored by Mark Otto's avatar Mark Otto
Browse files
Options

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

parents 51f2c907 18be4e88
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
css.html
View file @ f681c971
...@@ -127,11 +127,11 @@ base_url: "../" ...@@ -127,11 +127,11 @@ base_url: "../"
</th> </th>
<th> <th>
Medium devices Medium devices
<small>Desktops (&gt;992px)</small> <small>Desktops (&ge;992px)</small>
</th> </th>
<th> <th>
Large devices Large devices
<small>Desktops (&gt;1200px)</small> <small>Desktops (&ge;1200px)</small>
</th> </th>
</tr> </tr>
</thead> </thead>
...@@ -1355,7 +1355,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1355,7 +1355,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<legend>Legend</legend> <legend>Legend</legend>
<div class="form-group"> <div class="form-group">
<label for="exampleInputEmail1">Email address</label> <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>
<div class="form-group"> <div class="form-group">
<label for="exampleInputPassword1">Password</label> <label for="exampleInputPassword1">Password</label>
...@@ -1380,7 +1380,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1380,7 +1380,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<legend>Legend</legend> <legend>Legend</legend>
<div class="form-group"> <div class="form-group">
<label for="exampleInputEmail1">Email address</label> <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>
<div class="form-group"> <div class="form-group">
<label for="exampleInputPassword1">Password</label> <label for="exampleInputPassword1">Password</label>
...@@ -1415,7 +1415,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1415,7 +1415,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<form class="bs-example form-inline" role="form"> <form class="bs-example form-inline" role="form">
<div class="form-group"> <div class="form-group">
<label class="sr-only" for="exampleInputEmail2">Email address</label> <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>
<div class="form-group"> <div class="form-group">
<label class="sr-only" for="exampleInputPassword2">Password</label> <label class="sr-only" for="exampleInputPassword2">Password</label>
...@@ -1432,7 +1432,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1432,7 +1432,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<form class="form-inline" role="form"> <form class="form-inline" role="form">
<div class="form-group"> <div class="form-group">
<label class="sr-only" for="exampleInputEmail2">Email address</label> <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>
<div class="form-group"> <div class="form-group">
<label class="sr-only" for="exampleInputPassword2">Password</label> <label class="sr-only" for="exampleInputPassword2">Password</label>
...@@ -1453,7 +1453,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1453,7 +1453,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<div class="form-group"> <div class="form-group">
<label for="inputEmail1" class="col-lg-2 control-label">Email</label> <label for="inputEmail1" class="col-lg-2 control-label">Email</label>
<div class="col-lg-10"> <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> </div>
<div class="form-group"> <div class="form-group">
...@@ -1482,7 +1482,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1482,7 +1482,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<div class="form-group"> <div class="form-group">
<label for="inputEmail1" class="col-lg-2 control-label">Email</label> <label for="inputEmail1" class="col-lg-2 control-label">Email</label>
<div class="col-lg-10"> <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> </div>
<div class="form-group"> <div class="form-group">
...@@ -2142,11 +2142,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -2142,11 +2142,11 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</th> </th>
<th> <th>
Medium devices Medium devices
<small>Desktops (&gt;992px)</small> <small>Desktops (&ge;992px)</small>
</th> </th>
<th> <th>
Large devices Large devices
<small>Desktops (&gt;1200px)</small> <small>Desktops (&ge;1200px)</small>
</th> </th>
</tr> </tr>
</thead> </thead>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment