diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:15:45 -0700 |
| commit | a9378a92670f4bf5ccb753191af795c45bb64998 (patch) | |
| tree | 9690c9a1c123c3103a1f345015f93aac8b43e983 /javascript.html | |
| parent | cf09e6a6b5e314f4f7433f21bd32287885c95451 (diff) | |
| parent | f584500211af84038bcff9b363343eb02cda6ccd (diff) | |
| download | bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.tar.xz bootstrap-a9378a92670f4bf5ccb753191af795c45bb64998.zip | |
Merge branch '3.0.0-wip' into bs3_homepage
Conflicts:
customize.html
dist/css/bootstrap.min.css
Diffstat (limited to 'javascript.html')
| -rw-r--r-- | javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/javascript.html b/javascript.html index 9e85c7742..40c04f58b 100644 --- a/javascript.html +++ b/javascript.html @@ -1184,7 +1184,7 @@ $('#myPopover').on('hidden.bs.popover', function () { <h2 id="alerts-examples">Example alerts</h2> <p>Add dismiss functionality to all alert messages with this plugin.</p> <div class="bs-example"> - <div class="alert fade in"> + <div class="alert alert-warning fade in"> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good. </div> |