diff options
| author | Mark Otto <[email protected]> | 2014-10-26 14:17:14 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-10-26 14:17:14 -0700 |
| commit | 657ff31c7448563abc7b11e0cfea971e060a3d3d (patch) | |
| tree | 32d3b6fbe651e28b9240e9f5ee3d36add31e08af | |
| parent | 97b4364452aa45539aac11d866ebd17fa211200d (diff) | |
| parent | 66e140db82d367710013707a327c67d67168b3c9 (diff) | |
| download | bootstrap-657ff31c7448563abc7b11e0cfea971e060a3d3d.tar.xz bootstrap-657ff31c7448563abc7b11e0cfea971e060a3d3d.zip | |
Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap into need-to-activate-animated-progressbar
Conflicts:
docs/_includes/components/progress-bars.html
docs/assets/js/src/application.js
| -rw-r--r-- | docs/_includes/components/progress-bars.html | 2 | ||||
| -rw-r--r-- | docs/assets/js/src/application.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/_includes/components/progress-bars.html b/docs/_includes/components/progress-bars.html index 43b641262..f4c1631e7 100644 --- a/docs/_includes/components/progress-bars.html +++ b/docs/_includes/components/progress-bars.html @@ -170,7 +170,7 @@ <div class="progress"> <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div> </div> - <button type="button" class="btn btn-default bs-docs-activate-aniamted-progressbar" data-toggle="button" aria-pressed="false" autocomplete="off">Toggle animation</button> + <button type="button" class="btn btn-default bs-docs-activate-animated-progressbar" data-toggle="button" aria-pressed="false" autocomplete="off">Toggle animation</button> </div> {% highlight html %} <div class="progress"> diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/application.js index a547fe20c..571645e5f 100644 --- a/docs/assets/js/src/application.js +++ b/docs/assets/js/src/application.js @@ -110,7 +110,7 @@ }) // Activate animated progress bar - $('.bs-docs-activate-aniamted-progressbar').on('click', function () { + $('.bs-docs-activate-animated-progressbar').on('click', function () { $(this).siblings('.progress').find('.progress-bar-striped').toggleClass('active') }) |