diff options
| author | Mark Otto <[email protected]> | 2013-08-02 19:05:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-02 19:05:49 -0700 |
| commit | e8145ac9390b92aca69a84dfdd561793b72e7540 (patch) | |
| tree | 0a5f09e40abecc5b7c9252f1c21f85e16b434c30 | |
| parent | 9435991ff0ffa79c027f12c0a08aa13376c3b2fe (diff) | |
| parent | b5dcbf5045cf9b533c6b47718a7ee29be5a9092c (diff) | |
| download | bootstrap-e8145ac9390b92aca69a84dfdd561793b72e7540.tar.xz bootstrap-e8145ac9390b92aca69a84dfdd561793b72e7540.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
| -rw-r--r-- | css.html | 16 |
1 files changed, 16 insertions, 0 deletions
@@ -1302,11 +1302,19 @@ For example, <code><section></code> should be wrapped as inline. <label for="inputPassword" class="col-lg-2 control-label">Password</label> <div class="col-lg-10"> <input type="password" class="form-control" id="inputPassword" placeholder="Password"> + </div> + </div> + <div class="form-group"> + <div class="col-offset-2 col-lg-10"> <div class="checkbox"> <label> <input type="checkbox"> Remember me </label> </div> + </div> + </div> + <div class="form-group"> + <div class="col-offset-2 col-lg-10"> <button type="submit" class="btn btn-default">Sign in</button> </div> </div> @@ -1323,11 +1331,19 @@ For example, <code><section></code> should be wrapped as inline. <label for="inputPassword" class="col-lg-2 control-label">Password</label> <div class="col-lg-10"> <input type="password" class="form-control" id="inputPassword" placeholder="Password"> + </div> + </div> + <div class="form-group"> + <div class="col-offset-2 col-lg-10"> <div class="checkbox"> <label> <input type="checkbox"> Remember me </label> </div> + </div> + </div> + <div class="form-group"> + <div class="col-offset-2 col-lg-10"> <button type="submit" class="btn btn-default">Sign in</button> </div> </div> |