diff options
| author | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
| commit | 0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (patch) | |
| tree | 7b88c388d526ada7b564f1faf44cda92276f2722 /docs/_includes/components/alerts.html | |
| parent | f071549c8408241b88a95192e477816d2402eb6e (diff) | |
| parent | b31c35b63629ec750f338a646f6b730bd675b734 (diff) | |
| download | bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.tar.xz bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.zip | |
Merge branch 'master' into fix-13386
Conflicts:
js/carousel.js
Diffstat (limited to 'docs/_includes/components/alerts.html')
| -rw-r--r-- | docs/_includes/components/alerts.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/_includes/components/alerts.html b/docs/_includes/components/alerts.html index f0895b0ed..749ecc2b4 100644 --- a/docs/_includes/components/alerts.html +++ b/docs/_includes/components/alerts.html @@ -32,16 +32,16 @@ <div class="alert alert-danger" role="alert">...</div> {% endhighlight %} - <h2 id="alerts-dismissable">Dismissable alerts</h2> - <p>Build on any alert by adding an optional <code>.alert-dismissable</code> and close button.</p> + <h2 id="alerts-dismissible">Dismissible alerts</h2> + <p>Build on any alert by adding an optional <code>.alert-dismissible</code> and close button.</p> <div class="bs-example"> - <div class="alert alert-warning alert-dismissable" role="alert"> + <div class="alert alert-warning alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> <strong>Warning!</strong> Better check yourself, you're not looking too good. </div> </div> {% highlight html %} -<div class="alert alert-warning alert-dismissable" role="alert"> +<div class="alert alert-warning alert-dismissible" role="alert"> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> <strong>Warning!</strong> Better check yourself, you're not looking too good. </div> |