diff options
| author | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
| commit | 9f2aeafe851bdca522b886c29afcece1ee0060e1 (patch) | |
| tree | be13d5ce0d68631543f28af8d9b444a7bd44917e /docs/javascript/alerts.md | |
| parent | 7d9f55c3d5dcc5b12882af96245dab27be5fa346 (diff) | |
| parent | c5c67d0f54674dede58fc924d4d7c0f1d65705d9 (diff) | |
| download | bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.tar.xz bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
Diffstat (limited to 'docs/javascript/alerts.md')
| -rw-r--r-- | docs/javascript/alerts.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/javascript/alerts.md b/docs/javascript/alerts.md index 3b47292f8..4ab4abb80 100644 --- a/docs/javascript/alerts.md +++ b/docs/javascript/alerts.md @@ -39,7 +39,7 @@ $(".alert").alert() ### Markup -Just add `data-dismiss="alert"` to your close button to automatically give an alert close functionality. +Just add `data-dismiss="alert"` to your close button to automatically give an alert close functionality. Closing an alert removes it from the DOM. {% highlight html %} <button type="button" class="close" data-dismiss="alert"> @@ -48,7 +48,7 @@ Just add `data-dismiss="alert"` to your close button to automatically give an al </button> {% endhighlight %} -To have your alerts use animation when closing, make sure they have the `.fade` and `.in` class already applied to them. +To have your alerts use animation when closing, make sure they have the `.fade` and `.in` classes already applied to them. ### Methods @@ -58,13 +58,13 @@ Makes an alert listen for click events on descendant elements which have the `da #### $().alert('close') -Closes an alert. +Closes an alert by removing it from the DOM. If the `.fade` and `.in` classes are present on the element, the alert will fade out before it is removed. {% highlight js %}$(".alert").alert('close'){% endhighlight %} ### Events -Bootstrap's alert class exposes a few events for hooking into alert functionality. +Bootstrap's alert plugin exposes a few events for hooking into alert functionality. <div class="table-responsive"> <table class="table table-bordered table-striped"> |