Mark Otto f9f03d8976 Merge branch 'bartt-master' into 2.0.3-wip ...

Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less

2012-03-23 20:56:48 -07:00

..

assets

Merge branch 'bartt-master' into 2.0.3-wip

2012-03-23 20:56:48 -07:00

build

change title attr to re-include twitter

2012-03-10 15:14:54 -08:00

examples

fix apple touch icons in examples

2012-03-12 00:21:52 -07:00

templates

Merge branch '2.1.0-wip' into 2.0.3-wip

2012-03-23 18:29:21 -07:00

base-css.html

remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append

2012-03-22 17:36:32 -07:00

components.html

badge-error => badge-important

2012-03-23 13:35:46 +01:00

css-tests.html

Fix #2758: Uneditable inputs in input-prepend/append

2012-03-23 09:47:57 -07:00

download.html

bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization

2012-03-22 21:33:06 -07:00

examples.html

use variable for navbar text line-height

2012-03-11 17:53:17 -07:00

index.html

adding blog link to docs homepage

2012-03-23 01:13:20 -07:00

javascript.html

Merge branch '2.1.0-wip' into 2.0.3-wip

2012-03-23 18:29:21 -07:00

less.html

add shell of tests page, lighten form actions background and give it a variable

2012-03-22 21:08:41 -07:00

scaffolding.html

remove mention of siteWidth, no longer used

2012-03-22 17:23:20 -07:00

upgrading.html

use variable for navbar text line-height

2012-03-11 17:53:17 -07:00