Mark Otto c16fee5efd Merge branch 'master' into v4 ... Conflicts: .travis.yml Gruntfile.js bower.json dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_data/glyphicons.yml 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/labels.html docs/_includes/components/list-group.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/components/thumbnails.html docs/_includes/components/wells.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/helpers.html docs/_includes/css/images.html docs/_includes/css/less.html docs/_includes/customizer-variables.html docs/_includes/getting-started/accessibility.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/community.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/license.html docs/_includes/getting-started/template.html docs/_includes/header.html docs/_includes/js/affix.html docs/_includes/js/alerts.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.html docs/_includes/js/overview.html docs/_includes/js/popovers.html docs/_includes/js/scrollspy.html docs/_includes/js/tabs.html docs/_includes/js/tooltips.html docs/_includes/js/transitions.html docs/_includes/nav/javascript.html docs/_layouts/default.html docs/assets/css/docs.min.css docs/assets/css/src/docs.css docs/assets/js/customize.min.js docs/assets/js/docs.min.js docs/assets/js/raw-files.min.js docs/assets/js/vendor/FileSaver.js docs/assets/js/vendor/autoprefixer.js docs/assets/js/vendor/uglify.min.js docs/dist/css/bootstrap.css docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css docs/dist/js/bootstrap.min.js docs/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/narrow-jumbotron/narrow-jumbotron.css docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/non-responsive/index.html docs/examples/non-responsive/non-responsive.css docs/examples/theme/index.html grunt/configBridge.json js/affix.js js/carousel.js js/collapse.js js/dropdown.js js/modal.js js/popover.js js/scrollspy.js js/tab.js js/tests/unit/affix.js js/tests/unit/button.js js/tests/unit/carousel.js js/tests/unit/modal.js js/tests/unit/tooltip.js js/tooltip.js less/badges.less less/glyphicons.less less/type.less less/variables.less package.json scss/_dropdown.scss scss/_forms.scss test-infra/npm-shrinkwrap.json		2015-03-01 13:44:10 -08:00
..
mixins	account for mq4-hover-shim's renaming & org move	2015-02-04 21:15:01 -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
_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	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_breadcrumb.scss	fix broken breadcrumb divider	2015-01-19 16:08:48 -08:00
_button-group.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_buttons.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_card.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_carousel.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_close.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_code.scss	convert to scss	2014-12-02 14:02:35 -08:00
_custom-forms.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_dropdown.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_forms.scss	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
_grid.scss	rename media-breakpoint-{min,max} => media-breakpoint-{up,down}	2015-01-06 17:47:13 -08:00
_input-group.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_jumbotron.scss	Kill scss/mixins/_media-queries.scss	2015-01-06 17:47:13 -08:00
_labels.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_list-group.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_media.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_mixins.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_modal.scss	Kill scss/mixins/_media-queries.scss	2015-01-06 17:47:13 -08:00
_nav.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_navbar.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_normalize.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_pager.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_pagination.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -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	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
_scaffolding.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_tables.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_tooltip.scss	Merge branch 'master' into v4	2015-01-03 20:08:58 -08:00
_type.scss	Merge branch 'master' into v4	2015-03-01 13:44:10 -08:00
_utilities-responsive.scss	Reorg @viewport now that we don't need to worry about non-responsive layouts	2015-01-21 13:05:14 -08:00
_utilities.scss	Remove affix from docs & CSS; add migration guidance	2015-01-05 11:36:51 -08:00
_variables.scss	add $use-hover-media-query to control @media (hover:hover) usage	2015-01-22 11:39:57 -08:00
bootstrap.scss	Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss"	2015-01-18 15:00:58 -08:00