Mark Otto ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise ...

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/base-css.html
	docs/templates/pages/base-css.mustache
	less/forms.less
	less/mixins.less

2012-09-25 22:00:41 -07:00

..

assets

Merge branch '2.1.2-wip' into box-sizing-exercise

2012-09-25 22:00:41 -07:00

build

optimizing images on 2.1.0-wip branch; saving couple of KBs from package

2012-08-06 13:23:12 +03:00

examples

nuke new examples for now

2012-09-17 08:53:13 -07:00

templates

Merge branch '2.1.2-wip' into box-sizing-exercise

2012-09-25 22:00:41 -07:00

base-css.html

Merge branch '2.1.2-wip' into box-sizing-exercise

2012-09-25 22:00:41 -07:00

components.html

fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8

2012-09-20 10:28:27 -07:00

customize.html

add the media css to customizer

2012-09-17 18:17:22 -07:00

extend.html

Standardized spelling of 'JavaScript'; added icons to file trees

2012-09-14 14:06:15 +01:00

getting-started.html

way cooler carousel example, along with updated screenshots for examples

2012-09-14 15:55:46 -07:00

index.html

add in some more examples (will work em in later), removed fleetio per their request, and added gather content to replace it

2012-09-14 14:48:03 -07:00

javascript.html

fixes #5173: proper popover offsets; added docs examples to enable tests in the future

2012-09-17 23:03:32 -07:00

scaffolding.html

Merge branch '2.1.2-wip' into box-sizing-exercise

2012-09-25 22:00:41 -07:00