bootstrap/scss
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
..
mixins Merge branch 'master' into v4 2015-03-29 00:08:54 -07:00
.csscomb.json
.csslintrc
.scss-lint.yml
_alert.scss un-nest .alert-heading & .alert-link 2014-12-29 16:03:22 -08:00
_animation.scss
_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 remove justified button groups 2015-03-09 14:32:30 +00:00
_buttons.scss Merge branch 'master' into v4 2015-03-29 00:08:54 -07:00
_card.scss put all :hover styles within @media (hover: hover) 2015-01-22 11:37:37 -08:00
_carousel.scss Images are responsive by default 2015-03-11 19:19:03 +00:00
_close.scss put all :hover styles within @media (hover: hover) 2015-01-22 11:37:37 -08:00
_code.scss
_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-29 00:08:54 -07: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 Merge branch 'master' into v4 2015-03-29 00:08:54 -07: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 Merge branch 'master' into v4 2015-03-29 00:08:54 -07:00
_nav.scss Merge branch 'master' into v4 2015-03-29 00:08:54 -07: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
_progress.scss
_responsive-embed.scss Merge branch 'master' into v4 2015-03-01 13:44:10 -08:00
_scaffolding.scss Merge branch 'master' into v4 2015-03-29 00:08:54 -07: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-03-29 00:08:54 -07:00
_type.scss fix validation, run grunt dist 2015-03-01 14:11:22 -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 Merge branch 'master' into v4 2015-03-29 00:08:54 -07:00
bootstrap.scss Temporarily revert "Rename scss/bootstrap.scss -> scss/_bootstrap.scss" 2015-01-18 15:00:58 -08:00