Mark Otto 325748ff68 Merge branch 'master' into v4 ... Conflicts: _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.css.map dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.min.js docs/_includes/components/thumbnails.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/customizer-variables.html docs/_includes/footer.html docs/_includes/getting-started/download.html docs/_includes/getting-started/template.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tooltips.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/dist/css/bootstrap-theme.css docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap-theme.min.css docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.js docs/dist/js/bootstrap.min.js docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/non-responsive/index.html docs/examples/theme/index.html grunt/configBridge.json less/alerts.less less/badges.less less/jumbotron.less less/panels.less less/tables.less less/theme.less less/variables.less package.json scss/_button-group.scss scss/_buttons.scss scss/_forms.scss		2015-01-19 14:48:12 -08:00
..
mixins	Revert "Remove libsass @media nesting bug workaround"	2015-01-08 21:38:12 +00:00
_alert.scss	un-nest .alert-heading & .alert-link	2014-12-29 16:03:22 -08:00
_animation.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_badge.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_breadcrumb.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_button-group.scss	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
_buttons.scss	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
_card.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_carousel.scss	Kill scss/mixins/_media-queries.scss	2015-01-06 17:47:13 -08:00
_close.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_code.scss	convert to scss	2014-12-02 14:02:35 -08:00
_custom-forms.scss	override the box-shadows on active, checked, and indeterminate states	2015-01-01 12:13:24 -08:00
_dropdown.scss	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
_forms.scss	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
_grid.scss	rename media-breakpoint-{min,max} => media-breakpoint-{up,down}	2015-01-06 17:47:13 -08:00
_input-group.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_jumbotron.scss	Kill scss/mixins/_media-queries.scss	2015-01-06 17:47:13 -08:00
_labels.scss	inline-block on labels now instead of inline	2014-12-06 00:33:36 -08:00
_list-group.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_media.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_mixins.scss	Kill scss/mixins/_media-queries.scss	2015-01-06 17:47:13 -08:00
_modal.scss	Kill scss/mixins/_media-queries.scss	2015-01-06 17:47:13 -08:00
_nav.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_navbar.scss	Kill scss/mixins/_media-queries.scss	2015-01-06 17:47:13 -08:00
_normalize.scss	convert to scss	2014-12-02 14:02:35 -08:00
_pager.scss	rename .previous => .pager-prev , .next => .pager-next	2014-12-17 18:39:43 -08:00
_pagination.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_popover.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_print.scss	Remove defunct OS X Chrome <select> printing bug workaround	2014-12-16 19:59:05 -08:00
_progress.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_responsive-embed.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_scaffolding.scss	Use improved box sizing reset	2015-01-05 15:20:46 -08:00
_tables.scss	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
_tooltip.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_type.scss	Update styles for Ruby Sass compat	2014-12-24 22:22:15 +02:00
_utilities-responsive.scss	Overhaul responsive visibility classes	2015-01-06 17:47:13 -08:00
_utilities.scss	Remove affix from docs & CSS; add migration guidance	2015-01-05 11:36:51 -08:00
_variables.scss	Merge branch 'master' into v4	2015-01-19 14:48:12 -08:00
.csscomb.json	convert to scss	2014-12-02 14:02:35 -08:00
.csslintrc	convert to scss	2014-12-02 14:02:35 -08:00
.scss-lint.yml	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
bootstrap.scss	Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"	2015-01-18 15:00:58 -08:00