Mark Otto a56de2b84f Merge branch 'glyphicons_font' into exploratory ...

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less

2012-11-03 16:15:54 -07:00

..

tests

Merge branch 'glyphicons_font' into exploratory

2012-11-03 16:15:54 -07:00

accordion.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

alerts.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

bootstrap.less

Merge branch 'glyphicons_font' into exploratory

2012-11-03 16:15:54 -07:00

breadcrumbs.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

button-groups.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

buttons.less

Merge branch 'glyphicons_font' into exploratory

2012-11-03 16:15:54 -07:00

carousel.less

…

close.less

…

code.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

component-animations.less

…

dropdowns.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

forms.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

glyphicons.less

tweaks to icons defaults and in buttons improve vertical align

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

grid.less

…

hero-unit.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

labels-badges.less

Merge branch '2.2.2-wip' into exploratory

2012-11-03 13:44:01 -07:00

layouts.less

…

media.less

…

mixins.less

…

modals.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

navbar.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

navs.less

Navs refactor, restoring .nav-list

2012-11-03 16:14:44 -07:00

pager.less

…

pagination.less

…

popovers.less

Merge branch '2.2.2-wip' into exploratory

2012-11-03 13:44:01 -07:00

progress-bars.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

reset.less

Merge branch '2.2.2-wip' into exploratory

2012-11-03 13:44:01 -07:00

responsive-767px-max.less

…

responsive-768px-979px.less

…

responsive-1200px-min.less

…

responsive-navbar.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

responsive-utilities.less

…

responsive.less

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

scaffolding.less

…

tables.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

thumbnails.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

tooltip.less

rgba() tooltip bg

2012-11-03 13:44:55 -07:00

type.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00

utilities.less

…

variables.less

Merge branch 'glyphicons_font' into exploratory

2012-11-03 16:15:54 -07:00

wells.less

Merge branch '2.2.2-wip' into exploratory

2012-11-02 09:36:51 -07:00