Mark Otto f07477d290 Merge branch 'master' into derp ...

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/progress-bars.less
	less/theme.less

2014-10-26 22:59:02 -07:00

..

mixins

rename media query mixins to .media-*

2014-09-17 21:57:51 -07:00

_alert.less

rename imported files to preface with underscore; rerun grunt dist

2014-08-04 15:36:41 -07:00

_animation.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_badge.less

rename imported files to preface with underscore; rerun grunt dist

2014-08-04 15:36:41 -07:00

_breadcrumb.less

rename imported files to preface with underscore; rerun grunt dist

2014-08-04 15:36:41 -07:00

_button-group.less

Merge branch 'master' into derp

2014-10-26 22:59:02 -07:00

_buttons.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_card.less

cards

2014-08-05 17:12:24 -07:00

_carousel.less

more media query mixins

2014-09-17 21:56:27 -07:00

_close.less

rename imported files to preface with underscore; rerun grunt dist

2014-08-04 15:36:41 -07:00

_code.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_dropdown.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_forms.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_grid.less

more media query mixins

2014-09-17 21:56:27 -07:00

_input-group.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_jumbotron.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_labels.less

rename imported files to preface with underscore; rerun grunt dist

2014-08-04 15:36:41 -07:00

_list-group.less

Merge branch 'master' into derp

2014-09-17 15:21:31 -07:00

_media.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_mixins.less

Add reference to media query partial.

2014-09-17 21:53:36 -07:00

_modal.less

no more mixin, use regular property

2014-10-26 22:34:08 -07:00

_nav.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_navbar.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_normalize.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_pager.less

Merge branch 'master' into derp

2014-09-17 15:21:31 -07:00

_pagination.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_popover.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_print.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_progress.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_responsive-embed.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_scaffolding.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_tables.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_tooltip.less

Swap -small and -large variables for -sm and -lg

2014-09-21 16:04:37 -07:00

_type.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

_utilities-responsive.less

rename media query mixins to .media-*

2014-09-17 21:57:51 -07:00

_utilities.less

Move text and background utilties from _type to _utilities

2014-09-18 19:15:01 -07:00

_variables.less

Merge branch 'master' into derp

2014-10-26 22:31:59 -07:00

.csscomb.json

Update grunt-csscomb.

2014-07-22 08:25:35 +03:00

.csslintrc

Merge branch 'master' into derp

2014-08-04 15:09:23 -07:00

bootstrap.less

cards

2014-08-05 17:12:24 -07:00