rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap into need-to-activate-animated-progressbar

Browse Source 
Conflicts:
	docs/_includes/components/progress-bars.html
	docs/assets/js/src/application.js
This commit is contained in:
Mark Otto 2014-10-26 14:17:14 -07:00
commit 657ff31c74
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/_includes/components/progress-bars.html
View File

@ -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">

2
docs/assets/js/src/application.js
View File

@ -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')
})