diff options
| author | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 20:11:04 -0700 |
| commit | a1db2d7a5ee452ee272f0d040aceec6f947a8b75 (patch) | |
| tree | 124eb3d18c886b08b725a2b6e0c41c44c3abcff0 /javascript.html | |
| parent | 0615142834343af8c40cd7ad47c498431745f080 (diff) | |
| parent | 2e9184366129139bb9b64b679a0e75a3c556465e (diff) | |
| download | bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.tar.xz bootstrap-a1db2d7a5ee452ee272f0d040aceec6f947a8b75.zip | |
Merge branch '3.0.0-wip' into bs3_panel_base_class
Conflicts:
dist/css/bootstrap-theme.min.css
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> |