mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00
Code Activity

Merge branch '2.3.0-wip' into 3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
This commit is contained in:
Mark Otto
2012-12-20 13:47:36 -08:00
parent 00ff34b9e6 5e4f663e69
commit a5e04c0799
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/bootstrap-collapse.js
Vendored
+1 -1
View File
@@ -52,7 +52,7 @@
, actives
, hasData
if (this.transitioning) return
if (this.transitioning || this.$element.hasClass('in')) return
dimension = this.dimension()
scroll = $.camelCase(['scroll', dimension].join('-'))