Mark Otto 0e5d17d5f6 Merge branch 'master' into v4 ... Conflicts: Gruntfile.js 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/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.html docs/_includes/components/breadcrumbs.html docs/_includes/components/button-dropdowns.html docs/_includes/components/button-groups.html docs/_includes/components/dropdowns.html docs/_includes/components/glyphicons.html docs/_includes/components/input-groups.html docs/_includes/components/jumbotron.html docs/_includes/components/labels.html docs/_includes/components/list-group.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/page-header.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/components/thumbnails.html docs/_includes/components/wells.html docs/_includes/css/buttons.html docs/_includes/css/code.html docs/_includes/css/forms.html docs/_includes/css/grid.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/css/tables.html docs/_includes/css/type.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/whats-included.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/nav/components.html docs/_includes/nav/javascript.html docs/_jade/customizer-variables.jade docs/_layouts/default.html docs/about.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/assets/js/src/customizer.js docs/customize.html docs/dist/css/bootstrap-theme.css.map docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css less/glyphicons.less less/mixins/vendor-prefixes.less less/navbar.less less/popovers.less less/tables.less less/theme.less less/tooltip.less less/variables.less package.json scss/_carousel.scss scss/_close.scss scss/_forms.scss test-infra/npm-shrinkwrap.json		2015-01-03 20:08:58 -08:00
..
mixins	Automate breakpoints	2014-12-24 22:27:11 +02: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	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_buttons.scss	[disabled] => :disabled	2014-12-22 13:34:02 -08:00
_card.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_carousel.scss	rename .item => .carousel-item	2014-12-17 18:44:55 -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	rm trailing whitespace	2014-12-19 18:35:58 -08:00
_forms.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_grid.scss	Automate breakpoints	2014-12-24 22:27:11 +02:00
_input-group.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_jumbotron.scss	grunt	2014-12-31 10:37:23 -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	fix typo in comment	2015-01-01 00:02:21 -08:00
_modal.scss	Automate breakpoints	2014-12-24 22:27:11 +02:00
_nav.scss	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_navbar.scss	Update styles for Ruby Sass compat	2014-12-24 22:22:15 +02: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	larger hr border width so it shows up	2014-12-31 10:20:29 -08:00
_tables.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -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	fix all validation, turn off some settings, add sort order	2014-12-11 12:05:29 -08:00
_utilities.scss	Update styles for Ruby Sass compat	2014-12-24 22:22:15 +02:00
_variables.scss	Automate breakpoints	2014-12-24 22:27:11 +02: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	add custom forms, stub out examples for radios and checkboxes	2014-12-24 04:13:23 -08:00