Mark Otto 33e14fe5bf Merge branch '2.2.2-wip' into 3.0.0-wip ...

Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less

2012-12-05 11:05:10 -08:00

..

tests

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

accordion.less

more consistent variable naming patterns

2012-11-30 14:45:25 -08:00

alerts.less

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

bootstrap.less

version bump to 3.0

2012-11-30 22:30:50 -08:00

breadcrumbs.less

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

button-groups.less

remove single corner border-radius mixins

2012-12-01 14:25:28 -08:00

buttons.less

more vars changed, remove @white var

2012-11-30 15:05:23 -08:00

carousel.less

more vars changed, remove @white var

2012-11-30 15:05:23 -08:00

close.less

more consistent variable naming patterns

2012-11-30 14:45:25 -08:00

code.less

more consistent variable naming patterns

2012-11-30 14:45:25 -08:00

component-animations.less

Fix bug Collapse broken in IE

2012-08-21 14:33:15 +04:00

dropdowns.less

remove sprites vars, change zindex vars

2012-11-30 15:23:13 -08:00

forms.less

grid vars updated

2012-11-30 15:43:07 -08:00

glyphicons.less

tweaks to icons defaults and in buttons improve vertical align

2012-11-02 01:39:40 -07:00

grid.less

Remove more fluid grid stuff

2012-11-30 16:18:40 -08:00

hero-unit.less

hero unit and pagination vars

2012-11-30 15:36:16 -08:00

labels-badges.less

form state vars

2012-11-30 15:38:31 -08:00

media.less

remove more ie7 css hacks

2012-09-30 23:20:43 -07:00

mixins.less

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

modals.less

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

navbar.less

grid vars updated

2012-11-30 15:43:07 -08:00

navs.less

more vars changed, remove @white var

2012-11-30 15:05:23 -08:00

pager.less

more consistent variable naming patterns

2012-11-30 14:45:25 -08:00

pagination.less

hero unit and pagination vars

2012-11-30 15:36:16 -08:00

popovers.less

Merge branch '2.2.2-wip' into 3.0.0-wip

2012-12-05 11:05:10 -08:00

progress-bars.less

remove color variables, swap others were appropro

2012-11-30 15:18:49 -08:00

reset.less

Merge branch '2.2.2-wip' into exploratory

2012-11-22 22:04:21 -08:00

responsive-767px-max.less

Remove more fluid grid stuff

2012-11-30 16:18:40 -08:00

responsive-768px-979px.less

grid vars updated

2012-11-30 15:43:07 -08:00

responsive-1200px-min.less

grid vars updated

2012-11-30 15:43:07 -08:00

responsive-navbar.less

navbar vars

2012-11-30 15:33:56 -08:00

responsive-utilities.less

Fixes #4002 responsive utilities classes

2012-07-10 08:12:16 +02:00

scaffolding.less

more consistent variable naming patterns

2012-11-30 14:45:25 -08:00

tables.less

remove single corner border-radius mixins

2012-12-01 14:25:28 -08:00

thumbnails.less

more consistent variable naming patterns

2012-11-30 14:45:25 -08:00

tooltip.less

popovers and tooltips vars

2012-11-30 15:40:44 -08:00

type.less

form state vars

2012-11-30 15:38:31 -08:00

utilities.less

move mixins that generate css to utilities.less with different class names, but the same mixins

2012-09-26 08:59:57 -07:00

variables.less

grid vars updated

2012-11-30 15:43:07 -08:00

wells.less

more vars changed

2012-11-30 15:27:13 -08:00