Mark Otto 72f13e2870 Merge branch '2.2.3' into 3.0.0-wip ...

Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	less/type.less
	package.json

2012-12-20 00:02:52 -08:00

..

tests

Merge branch 'master' into 3.0.0-wip

2012-12-08 17:40:42 -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

badges.less

Drop .label component. Instead, just use .badge because fuck dupe code and stuff.

2012-12-19 21:18:32 -08:00

bootstrap.less

Merge branch '2.2.3' into 3.0.0-wip

2012-12-20 00:02:52 -08:00

breadcrumbs.less

Fixes #6136: Proper scoping of breadcrumbs divider

2012-12-07 09:43:09 -08:00

button-groups.less

Merge branch '2.2.3' into 3.0.0-wip

2012-12-20 00:02:52 -08:00

buttons.less

Holy shit, buttons, button states, and input states updated

2012-12-19 23:37:33 -08:00

carousel.less

Merge branch '2.2.3' into 3.0.0-wip

2012-12-20 00:02:52 -08:00

close.less

Remove @black and just use #000

2012-12-19 22:02:57 -08:00

code.less

Merge branch 'master' into 3.0.0-wip

2012-12-08 17:40:42 -08:00

component-animations.less

Fix bug Collapse broken in IE

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

dropdowns.less

Remove @black and just use #000

2012-12-19 22:02:57 -08:00

forms.less

Holy shit, buttons, button states, and input states updated

2012-12-19 23:37:33 -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

jumbotron.less

Rename .hero-unit to .jumbotron becaue fuck dashes in filenames and sports metaphors are cooler than ad ones

2012-12-19 21:37:16 -08:00

media.less

Merge branch '2.2.3' into 3.0.0-wip

2012-12-20 00:02:52 -08:00

mixins.less

Holy shit, buttons, button states, and input states updated

2012-12-19 23:37:33 -08:00

modals.less

Remove @black and just use #000

2012-12-19 22:02:57 -08:00

navbar.less

Merge branch '2.2.3' into 3.0.0-wip

2012-12-20 00:02:52 -08:00

navs.less

Use @border-radius-base var for nav tabs

2012-12-17 10:11:33 -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

Remove commented out old popover CSS

2012-12-05 11:06:16 -08:00

progress-bars.less

remove color variables, swap others were appropro

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

reset.less

Restore print styles

2012-12-08 21:05:05 -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

IE10 fix in responsive utilities, not regular utilities

2012-12-10 10:29:16 -08:00

scaffolding.less

more consistent variable naming patterns

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

tables.less

Merge branch 'master' into 3.0.0-wip

2012-12-08 17:40:42 -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

Simplify syntax of nesting with inline lists

2012-12-10 10:28:18 -08:00

utilities.less

Update clearfix mixin and class per @necolas's feedback

2012-12-19 17:49:20 -08:00

variables.less

Holy shit, buttons, button states, and input states updated

2012-12-19 23:37:33 -08:00

wells.less

more vars changed

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