Mark Otto b648a77ed3 Merge branch 'master' into v4 ... Conflicts: 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/fonts/glyphicons-halflings-regular.eot dist/fonts/glyphicons-halflings-regular.svg dist/fonts/glyphicons-halflings-regular.ttf dist/fonts/glyphicons-halflings-regular.woff docs/_data/glyphicons.yml docs/_includes/components/alerts.html docs/_includes/components/badges.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/labels.html docs/_includes/components/media.html docs/_includes/components/navbar.html docs/_includes/components/navs.html docs/_includes/components/pagination.html docs/_includes/components/panels.html docs/_includes/components/progress-bars.html docs/_includes/css/buttons.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/responsive-utilities.html docs/_includes/css/sass.html docs/_includes/css/tables.html docs/_includes/css/type.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/download.html docs/_includes/getting-started/examples.html docs/_includes/getting-started/whats-included.html docs/_includes/js/affix.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/overview.html docs/_includes/js/tabs.html docs/_includes/nav/components.html docs/_includes/nav/css.html docs/_includes/nav/javascript.html docs/_includes/nav/main.html docs/about.html docs/assets/css/docs.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.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/fonts/glyphicons-halflings-regular.eot docs/dist/fonts/glyphicons-halflings-regular.svg docs/dist/fonts/glyphicons-halflings-regular.ttf docs/dist/fonts/glyphicons-halflings-regular.woff docs/examples/carousel/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/non-responsive/non-responsive.css docs/examples/sticky-footer-navbar/index.html docs/examples/theme/index.html fonts/glyphicons-halflings-regular.eot fonts/glyphicons-halflings-regular.svg fonts/glyphicons-halflings-regular.ttf fonts/glyphicons-halflings-regular.woff less/_carousel.less less/_forms.less less/glyphicons.less		2014-11-30 20:17:45 -08:00
..
mixins	disable shadows on buttons for now	2014-11-25 17:47:32 -08: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	Merge branch 'master' into derp	2014-11-09 22:02:53 -08: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 v4	2014-11-30 20:17:45 -08:00
_buttons.less	Merge branch 'master' into derp	2014-11-09 22:02:53 -08:00
_card.less	cards	2014-08-05 17:12:24 -07:00
_carousel.less	Merge branch 'master' into v4	2014-11-30 20:17:45 -08: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	Merge branch 'master' into v4	2014-11-30 20:17:45 -08:00
_forms.less	Merge branch 'master' into v4	2014-11-30 20:17:45 -08:00
_grid.less	switch to max-width on containers	2014-10-27 03:07:34 -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-11-09 22:02:53 -08:00
_media.less	Merge branch 'master' into v4	2014-11-30 20:17:45 -08: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-11-09 22:02:53 -08:00
_nav.less	Merge branch 'master' into derp	2014-11-09 22:02:53 -08:00
_navbar.less	Merge branch 'master' into derp	2014-11-09 22:02:53 -08:00
_normalize.less	Merge branch 'master' into derp	2014-10-26 22:31:59 -07:00
_pager.less	Merge branch 'master' into derp	2014-11-09 22:02:53 -08:00
_pagination.less	Merge branch 'master' into derp	2014-11-09 22:02:53 -08:00
_popover.less	Merge branch 'master' into derp	2014-11-09 22:02:53 -08: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	Merge branch 'master' into derp	2014-11-09 22:02:53 -08: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	color contrast for links, gets us to 4.63:1	2014-11-09 23:01:50 -08:00
bootstrap.less	cards	2014-08-05 17:12:24 -07:00