13 Commits

Author	SHA1	Message	Date
Mark Otto	bc0b94a3fd	Merge branch 'master' into 3.0.0-wip ... Conflicts: docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/css.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/javascript.mustache less/breadcrumbs.less less/tables.less less/tests/css-tests.html	2012-12-08 17:40:42 -08:00
fat	a7eb9c294a	add noConflict functionality to all bootstrap plugins	2012-12-07 17:06:01 -05:00
Mark Otto	98b0d475ae	version bump to 3.0	2012-11-30 22:30:50 -08:00
Mark Otto	79b7017227	version bump	2012-11-05 09:32:48 -08:00
fat	3b3dd3ac3c	2.2.1 - hotfix for carousel	2012-10-30 21:59:56 -07:00
Mark Otto	41ad16fe40	v2.2.0 instead of v2.1.2	2012-10-29 21:00:53 -07:00
Jacob Thornton	0540b63ab0	check affix pos on clicks - use timeout for clicks which scroll	2012-09-24 23:59:02 -07:00
Mark Otto	08b8571cb8	version bump to get this started	2012-09-05 10:00:57 -07:00
Mark Otto	1c134d9a7f	update version numbers to 2.1.1	2012-08-21 13:11:25 -07:00
Jacob Thornton	ff38c14948	stray ;	2012-08-14 21:23:29 -07:00
Jacob Thornton	dee57462e2	get affix actually working and update docs	2012-08-14 21:06:08 -07:00
Jacob Thornton	614d52bd7f	delete this test for now - as affix is still heavily underdevelopment	2012-07-23 18:17:43 -07:00
Jacob Thornton	dcf75697ec	some progress on affix plugin	2012-07-22 18:28:39 -07:00