1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
twbs--bootstrap/js
Mark Otto 7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
..
tests Merge pull request #6378 from Yohn/patch-7 2012-12-24 16:17:25 -08:00
.jshintrc some progress on affix plugin 2012-07-22 18:28:39 -07:00
bootstrap-affix.js Version bump 2012-12-22 16:10:06 -08:00
bootstrap-alert.js Version bump 2012-12-22 16:10:06 -08:00
bootstrap-button.js Version bump 2012-12-22 16:10:06 -08:00
bootstrap-carousel.js Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
bootstrap-collapse.js Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
bootstrap-dropdown.js Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
bootstrap-modal.js Version bump 2012-12-22 16:10:06 -08:00
bootstrap-popover.js Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
bootstrap-scrollspy.js Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
bootstrap-tab.js Version bump 2012-12-22 16:10:06 -08:00
bootstrap-tooltip.js Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00
bootstrap-transition.js Version bump 2012-12-22 16:10:06 -08:00
bootstrap-typeahead.js Merge branch '2.3.0-wip' into 3.0.0-wip 2013-01-13 04:26:52 -08:00