aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-12 14:05:42 -0700
committerMark Otto <[email protected]>2013-08-12 14:05:42 -0700
commitc02269a9f046d2f5b267e2316b0d616e8e343c80 (patch)
tree160e1eb9f3cb329b897d8a0dfefd07374b530b10
parenta78c8d9c04e83a22d6eebc2e3d54cb2ccf6b614c (diff)
parentc3c02183790f689cfb3adccf28c0dbdb949b7904 (diff)
downloadbootstrap-c02269a9f046d2f5b267e2316b0d616e8e343c80.tar.xz
bootstrap-c02269a9f046d2f5b267e2316b0d616e8e343c80.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
-rw-r--r--javascript.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html
index db3053f22..faeed15c4 100644
--- a/javascript.html
+++ b/javascript.html
@@ -1183,7 +1183,7 @@ $('#myPopover').on('hidden.bs.popover', function () {
</div><!-- /example -->
<div class="bs-example">
- <div class="alert alert-block alert-error fade in">
+ <div class="alert alert-block alert-danger fade in">
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<h4>Oh snap! You got an error!</h4>
<p>Change this and that and try again. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Cras mattis consectetur purus sit amet fermentum.</p>