aboutsummaryrefslogtreecommitdiff
path: root/getting-started.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-09-19 22:57:11 -0500
committerMark Otto <[email protected]>2013-09-19 22:57:11 -0500
commite148923f2764d0af6f7d6fb1b601840d241759b5 (patch)
tree7831543c9b205eb0d184f2eb3187fb2cd3873110 /getting-started.html
parentef636bd62d6ab82e7cc70170f23bffe7bc8bd3cf (diff)
parent22d308b2c12525a7ba65fca4f2ca7dba8a2a80bb (diff)
downloadbootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.tar.xz
bootstrap-e148923f2764d0af6f7d6fb1b601840d241759b5.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.html25
1 files changed, 24 insertions, 1 deletions
diff --git a/getting-started.html b/getting-started.html
index f465a67eb..80069c45c 100644
--- a/getting-started.html
+++ b/getting-started.html
@@ -445,11 +445,34 @@ bootstrap/
<td><code>.bar-*</code></td>
<td><code>.progress-bar-*</code></td>
</tr>
+ <tr>
+ <td><code>.accordion</code></td>
+ <td><code>.panel-group</code></td>
+ </tr>
+ <tr>
+ <td><code>.accordion-group</code></td>
+ <td><code>.panel .panel-default</code></td>
+ </tr>
+ <tr>
+ <td><code>.accordion-heading</code></td>
+ <td><code>.panel-heading</code></td>
+ </tr>
+ <tr>
+ <td><code>.accordion-body</code></td>
+ <td><code>.panel-collapse</code></td>
+ </tr>
+ <tr>
+ <td><code>.accordion-inner</code></td>
+ <td><code>.panel-body</code></td>
+ </tr>
+ <tr>
+ <td><code>.alert-error</code></td>
+ <td><code>.alert-danger</code></td>
+ </tr>
</tbody>
</table>
</div><!-- /.table-responsive -->
-
<h2 id="migration-new">What's new</h2>
<p>We've added new elements and changed some existing ones. Here are the new or updated styles.</p>
<div class="table-responsive">