aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-09 13:22:34 -0700
committerMark Otto <[email protected]>2013-09-09 13:22:34 -0700
commitcd98b10ea5c0074a8f1a2ae3e54107d19141a9d4 (patch)
treef9d8e5795d4585fda9ac339ce24c3746216d9756
parentfff5e540f5fb29ea3c2de713c0d6b10642c90e75 (diff)
parent6bc1a5cf6e6103552d900a00a81efab375123b0e (diff)
downloadbootstrap-cd98b10ea5c0074a8f1a2ae3e54107d19141a9d4.tar.xz
bootstrap-cd98b10ea5c0074a8f1a2ae3e54107d19141a9d4.zip
Merge pull request #10542 from twbs/controls-migration-docs
add .control* to migration docs; fixes #10532
-rw-r--r--getting-started.html14
1 files changed, 14 insertions, 0 deletions
diff --git a/getting-started.html b/getting-started.html
index 5986f43eb..84dec459e 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>