diff options
| author | Mark Otto <[email protected]> | 2013-09-01 09:59:27 +0200 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-01 09:59:27 +0200 |
| commit | 560753da969a38049a667aefe2ae10a6c61f4386 (patch) | |
| tree | c74462578517e83edec9f250c759d7c10a3e7279 /components.html | |
| parent | 901da1b2b4727e3d00990dcf66ea3d31703b4edc (diff) | |
| parent | 4b53ea52e9cc27ab27dde2695400fd6c95a0b6c2 (diff) | |
| download | bootstrap-560753da969a38049a667aefe2ae10a6c61f4386.tar.xz bootstrap-560753da969a38049a667aefe2ae10a6c61f4386.zip | |
Merge branch 'master' into table-nesting
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'components.html')
| -rw-r--r-- | components.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components.html b/components.html index 642146e71..12c72e00a 100644 --- a/components.html +++ b/components.html @@ -2209,7 +2209,7 @@ body { padding-bottom: 70px; } <div class="page-header"> <h1 id="alerts">Alerts</h1> </div> - <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#js-alerts">alerts jQuery plugin</a>.</p> + <p class="lead">Provide contextual feedback messages for typical user actions with the handful of available and flexible alert messages. For inline dismissal, use the <a href="../javascript/#alerts">alerts jQuery plugin</a>.</p> <h2 id="alerts-examples">Examples</h2> <p>Wrap any text and an optional dismiss button in <code>.alert</code> and one of the four contextual classes (e.g., <code>.alert-success</code>) for basic alert messages.</p> @@ -2243,13 +2243,13 @@ body { padding-bottom: 70px; } <h2 id="alerts-dismissable">Dismissable alerts</h2> <p>Build on any alert by adding an optional <code>.alert-dismissable</code> and close button.</p> <div class="bs-example"> - <div class="alert alert-warning alert-dismissable alert-warning"> + <div class="alert alert-warning alert-dismissable"> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <strong>Warning!</strong> Best check yo self, you're not looking too good. </div> </div> {% highlight html %} -<div class="alert alert-warning alert-dismissable alert-warning"> +<div class="alert alert-warning alert-dismissable"> <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button> <strong>Warning!</strong> Best check yo self, you're not looking too good. </div> |