Mark Otto d6b0f45fb7 Merge branch 'master' into derp ... 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 docs/_includes/components/dropdowns.html docs/_includes/components/media.html docs/_includes/components/navs.html docs/_includes/components/progress-bars.html docs/_includes/components/responsive-embed.html docs/_includes/css/buttons.html docs/_includes/css/forms.html docs/_includes/css/less.html docs/_includes/css/overview.html docs/_includes/css/responsive-utilities.html docs/_includes/customizer-variables.html docs/_includes/getting-started/browser-device-support.html docs/_includes/getting-started/grunt.html docs/_includes/getting-started/template.html docs/_includes/header.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/nav/components.html docs/_includes/nav/getting-started.html 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/docs.min.js docs/assets/js/raw-files.min.js docs/browser-bugs.html docs/components.html docs/components/navbar.md docs/css.html 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/examples/blog/index.html docs/examples/carousel/index.html docs/examples/cover/index.html docs/examples/dashboard/index.html docs/examples/grid/index.html docs/examples/jumbotron-narrow/index.html docs/examples/jumbotron/index.html docs/examples/justified-nav/index.html docs/examples/navbar-fixed-top/index.html docs/examples/navbar-static-top/index.html docs/examples/navbar/index.html docs/examples/non-responsive/index.html docs/examples/offcanvas/index.html docs/examples/signin/index.html docs/examples/starter-template/index.html docs/examples/sticky-footer-navbar/index.html docs/examples/sticky-footer/index.html docs/examples/theme/index.html docs/examples/tooltip-viewport/index.html docs/getting-started.html docs/javascript.html docs/migration.html less/_animation.less less/_modal.less less/_navbar.less less/_variables.less less/glyphicons.less less/navs.less less/panels.less less/progress-bars.less		2014-10-26 22:31:59 -07:00
..
mixins	rename media query mixins to .media-*	2014-09-17 21:57:51 -07:00
.csscomb.json	Update grunt-csscomb.	2014-07-22 08:25:35 +03:00
.csslintrc	Merge branch 'master' into derp	2014-08-04 15:09:23 -07:00
_alert.less	rename imported files to preface with underscore; rerun grunt dist	2014-08-04 15:36:41 -07:00
_animation.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_badge.less	rename imported files to preface with underscore; rerun grunt dist	2014-08-04 15:36:41 -07:00
_breadcrumb.less	rename imported files to preface with underscore; rerun grunt dist	2014-08-04 15:36:41 -07:00
_button-group.less	Merge branch 'master' into derp	2014-09-17 15:21:31 -07:00
_buttons.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_card.less	cards	2014-08-05 17:12:24 -07:00
_carousel.less	more media query mixins	2014-09-17 21:56:27 -07:00
_close.less	rename imported files to preface with underscore; rerun grunt dist	2014-08-04 15:36:41 -07:00
_code.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_dropdown.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_forms.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_grid.less	more media query mixins	2014-09-17 21:56:27 -07:00
_input-group.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_jumbotron.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_labels.less	rename imported files to preface with underscore; rerun grunt dist	2014-08-04 15:36:41 -07:00
_list-group.less	Merge branch 'master' into derp	2014-09-17 15:21:31 -07:00
_media.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_mixins.less	Add reference to media query partial.	2014-09-17 21:53:36 -07:00
_modal.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_nav.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_navbar.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_normalize.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_pager.less	Merge branch 'master' into derp	2014-09-17 15:21:31 -07:00
_pagination.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_popover.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_print.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_progress.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_responsive-embed.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_scaffolding.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_tables.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_tooltip.less	Swap -small and -large variables for -sm and -lg	2014-09-21 16:04:37 -07:00
_type.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_utilities-responsive.less	rename media query mixins to .media-*	2014-09-17 21:57:51 -07:00
_utilities.less	Move text and background utilties from _type to _utilities	2014-09-18 19:15:01 -07:00
_variables.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
bootstrap.less	cards	2014-08-05 17:12:24 -07:00
theme.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00