diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /docs/getting-started.html | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'docs/getting-started.html')
| -rw-r--r-- | docs/getting-started.html | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/docs/getting-started.html b/docs/getting-started.html index e1ae3aec0..e3bec7e74 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -447,6 +447,10 @@ bootstrap/ <td><code>.input-lg</code></td> </tr> <tr> + <td><code>.input-block-level</code></td> + <td><code>.form-control</code></td> + </tr> + <tr> <td><code>.control-group</code></td> <td><code>.form-group</code></td> </tr> @@ -674,6 +678,11 @@ bootstrap/ <td class="text-muted">N/A</td> </tr> <tr> + <td>Block level from input</td> + <td><code>.input-block-level</code></td> + <td>No direct equivalent, but <a href="../css/#forms-controls">forms controls</a> are similar.</td> + </tr> + <tr> <td>Fluid container</td> <td><code>.container-fluid</code></td> <td><code>.container</code> (no more fixed grid)</td> |