aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-24 12:11:26 -0800
committerJacob Thornton <[email protected]>2012-01-24 12:11:26 -0800
commitb5503c4c28d4f9d80f3285922376f0552808d40e (patch)
treee2467846d77a93e4867a523a57a0fc44d12150a2 /docs/components.html
parent222067b360ecf4c6c082d3d364d464a26ef13ae9 (diff)
parent91780529d5f355054d17420f56a6b11e2d40b2a9 (diff)
downloadbootstrap-b5503c4c28d4f9d80f3285922376f0552808d40e.tar.xz
bootstrap-b5503c4c28d4f9d80f3285922376f0552808d40e.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/components.html b/docs/components.html
index 9d28b9e06..3a15541c4 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1088,7 +1088,7 @@
<div class="row">
<div class="span4">
<h3>Rewritten base class</h3>
- <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup&mdash;no <code>&lt;p&gt;</code> is required by default, just the outter <code>&lt;div&gt;</code>.</p>
+ <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup&mdash;no <code>&lt;p&gt;</code> is required by default, just the outer <code>&lt;div&gt;</code>.</p>
<h3>Single alert message</h3>
<p>For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.</p>
<hr>