diff options
| author | Mark Otto <[email protected]> | 2013-07-29 12:29:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-29 12:29:22 -0700 |
| commit | d08d9a63c3b61e834d5109069805867dfa841dcf (patch) | |
| tree | 152555fa0886d86efc153c3b3f48e75b60d7dc9d /css.html | |
| parent | 7b42b8b0fefa3511862040c58aaaf8f8b6800cbb (diff) | |
| parent | a954f04a02a193959fd9d9c172c5004311a5cca1 (diff) | |
| download | bootstrap-d08d9a63c3b61e834d5109069805867dfa841dcf.tar.xz bootstrap-d08d9a63c3b61e834d5109069805867dfa841dcf.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'css.html')
| -rw-r--r-- | css.html | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -206,7 +206,7 @@ base_url: "../" <div class="col-lg-1">1</div> <div class="col-lg-1">1</div> </div> -<div class="row show-grid"> +<div class="row"> <div class="col-lg-8">8</div> <div class="col-lg-4">4</div> </div> @@ -362,7 +362,7 @@ base_url: "../" </div> {% highlight html %} -<div class="row show-grid"> +<div class="row"> <div class="col-lg-9 col-push-3">9</div> <div class="col-lg-3 col-pull-9">3</div> </div> @@ -1425,7 +1425,7 @@ For example, <code><section></code> should be wrapped as inline. {% endhighlight %} <h3>Selects</h3> - <p>Use the default option or specify a <code>multiple="multiple"</code> to show multiple options at once.</p> + <p>Use the default option, or add <code>multiple</code> to show multiple options at once.</p> <form class="bs-example"> <select class="form-control"> <option>1</option> @@ -1435,7 +1435,7 @@ For example, <code><section></code> should be wrapped as inline. <option>5</option> </select> <br> - <select multiple="multiple" class="form-control"> + <select multiple class="form-control"> <option>1</option> <option>2</option> <option>3</option> @@ -1452,7 +1452,7 @@ For example, <code><section></code> should be wrapped as inline. <option>5</option> </select> -<select multiple="multiple" class="form-control"> +<select multiple class="form-control"> <option>1</option> <option>2</option> <option>3</option> @@ -1562,9 +1562,9 @@ For example, <code><section></code> should be wrapped as inline. <h2 id="forms-control-sizes">Control sizing</h2> - <p>Use relative sizing classes like <code>.input-large</code> or match your inputs to the grid column sizes using <code>.col-lg-*</code> classes.</p> + <p>Set heights using classes like <code>.input-large</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p> - <h3>Relative sizing</h3> + <h3>Height sizing</h3> <p>Create larger or smaller form controls that match button sizes.</p> <form class="bs-example bs-example-control-sizing"> <div class="controls docs-input-sizes"> |