0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Bootstrap/docs/assets
Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less
2012-10-01 23:41:00 -07:00
..
css Merge branch '2.1.2-wip' into exploratory 2012-10-01 23:41:00 -07:00
ico new fav and touch icons to match new masthead 2012-07-30 10:33:48 -07:00
img add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
js check affix pos on clicks - use timeout for clicks which scroll 2012-09-24 23:59:02 -07:00