Mark Otto 58082cd83e Merge branch 'master' into v4 ... Conflicts: .gitignore Gruntfile.js _config.yml dist/css/bootstrap-theme.css dist/css/bootstrap-theme.min.css dist/css/bootstrap.css dist/css/bootstrap.css.map dist/css/bootstrap.min.css dist/js/bootstrap.js dist/js/bootstrap.min.js docs/_includes/components/navbar.html docs/_includes/components/progress-bars.html docs/_includes/css/grid.html docs/_includes/css/overview.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/disabling-responsiveness.html docs/_includes/getting-started/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/license.html docs/_includes/getting-started/third-party-support.html docs/_includes/js/alerts.html docs/_includes/js/buttons.html docs/_includes/js/carousel.html docs/_includes/js/collapse.html docs/_includes/js/dropdowns.html docs/_includes/js/modal.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/_includes/nav/main.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/dist/css/bootstrap-theme.css 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/migration.html js/affix.js js/alert.js js/button.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/tests/visual/modal.html js/tooltip.js less/component-animations.less less/jumbotron.less less/mixins/background-variant.less less/mixins/buttons.less less/mixins/responsive-visibility.less less/mixins/text-emphasis.less less/navbar.less less/navs.less less/scaffolding.less less/tooltip.less less/utilities.less less/variables.less package.json scss/_buttons.scss scss/_forms.scss scss/_modal.scss		2015-03-29 00:08:54 -07:00
..
_alert.scss	convert to scss	2014-12-02 14:02:35 -08:00
_background-variant.scss	Merge branch 'master' into v4	2015-03-29 00:08:54 -07:00
_border-radius.scss	convert to scss	2014-12-02 14:02:35 -08:00
_breakpoints.scss	Revert "Remove libsass @media nesting bug workaround"	2015-01-08 21:38:12 +00:00
_buttons.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_center-block.scss	convert to scss	2014-12-02 14:02:35 -08:00
_clearfix.scss	convert to scss	2014-12-02 14:02:35 -08:00
_forms.scss	convert to scss	2014-12-02 14:02:35 -08:00
_gradients.scss	Remove ancillary references to IE<9 in comments+docs	2014-12-16 19:06:57 -08:00
_grid-framework.scss	rename media-breakpoint-{min,max} => media-breakpoint-{up,down}	2015-01-06 17:47:13 -08:00
_grid.scss	Automate breakpoints	2014-12-24 22:27:11 +02:00
_hide-text.scss	convert to scss	2014-12-02 14:02:35 -08:00
_hover.scss	account for mq4-hover-shim's renaming & org move	2015-02-04 21:15:01 -08:00
_image.scss	Images are responsive by default	2015-03-11 19:19:03 +00:00
_label.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
_nav-divider.scss	convert to scss	2014-12-02 14:02:35 -08:00
_navbar-align.scss	convert to scss	2014-12-02 14:02:35 -08:00
_pagination.scss	convert to scss	2014-12-02 14:02:35 -08:00
_progress.scss	convert to scss	2014-12-02 14:02:35 -08:00
_pulls.scss	Update styles for Ruby Sass compat	2014-12-24 22:22:15 +02:00
_reset-filter.scss	Remove ancillary references to IE<9 in comments+docs	2014-12-16 19:06:57 -08:00
_resize.scss	convert to scss	2014-12-02 14:02:35 -08:00
_responsive-visibility.scss	Merge branch 'master' into v4	2015-03-29 00:08:54 -07:00
_size.scss	convert to scss	2014-12-02 14:02:35 -08:00
_tab-focus.scss	convert to scss	2014-12-02 14:02:35 -08:00
_table-row.scss	put all :hover styles within @media (hover: hover)	2015-01-22 11:37:37 -08:00
_text-emphasis.scss	Merge branch 'master' into v4	2015-03-29 00:08:54 -07:00
_text-truncate.scss	Use grid classes or mixins on .dl-horizontal, update docs to include it, removes auto truncate and makes .text-overflow mixin into a .text-truncate class and mixin combo for better granularity	2014-12-11 14:12:10 -08:00