diff options
| author | Mark Otto <[email protected]> | 2013-09-11 12:31:21 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-11 12:31:21 -0700 |
| commit | 37933a9e08e24e0683c3909aaabe79888e006ba6 (patch) | |
| tree | dcd0cbb40240b1e0a5b856ce8755fbcd9a6b9f10 /getting-started.html | |
| parent | 5d1707a25c0ee68644a182196439a86be1beafbd (diff) | |
| parent | c62426daeb8e7709422ab2eeeb0cf2eb2fad4575 (diff) | |
| download | bootstrap-37933a9e08e24e0683c3909aaabe79888e006ba6.tar.xz bootstrap-37933a9e08e24e0683c3909aaabe79888e006ba6.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'getting-started.html')
| -rw-r--r-- | getting-started.html | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/getting-started.html b/getting-started.html index 5986f43eb..886ac5cec 100644 --- a/getting-started.html +++ b/getting-started.html @@ -398,6 +398,10 @@ bootstrap/ <td><code>.input-lg</code></td> </tr> <tr> + <td><code>.control-group</code></td> + <td><code>.form-group</code></td> + </tr> + <tr> <td><code>.checkbox.inline</code> <code>.radio.inline</code></td> <td><code>.checkbox-inline</code> <code>.radio-inline</code></td> </tr> @@ -595,6 +599,16 @@ bootstrap/ <td><code>.row</code> (no more fixed grid)</td> </tr> <tr> + <td>Controls wrapper</td> + <td><code>.controls</code></td> + <td class="text-muted">N/A</td> + </tr> + <tr> + <td>Controls row</td> + <td><code>.controls-row</code></td> + <td><code>.row</code> or <code>.form-group</code></td> + </tr> + <tr> <td>Navbar inner</td> <td><code>.navbar-inner</code></td> <td class="text-muted">N/A</td> @@ -617,7 +631,7 @@ bootstrap/ <tr> <td>Nav lists</td> <td><code>.nav-list</code> <code>.nav-header</code></td> - <td>No direct equivalent, but <a href="../components/#list-group">List groups</a> and <a href="../javascript/#collapse"><code>.panel-group</code>s</a> are similar.</td> + <td>No direct equivalent, but <a href="../components/#list-group">list groups</a> and <a href="../javascript/#collapse"><code>.panel-group</code>s</a> are similar.</td> </tr> </tbody> </table> |