Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							e615ae053c
							
						
					 | 
					
						
						
							
							overhaul nav and shit again
						
						
						
						
						
						
						
						- drop the index pages save for examples
- comment out the extend section for now
- fix up spacing fix on team list 
						
						
					 | 
					
						2015-06-13 14:05:25 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							163dd5296e
							
						
					 | 
					
						
						
							
							move flexbox to getting started
						
						
						
						
						
						
					 | 
					
						2015-05-29 13:53:22 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							b455ed8def
							
						
					 | 
					
						
						
							
							add markdown toc stuff
						
						
						
						
						
						
					 | 
					
						2015-05-29 01:58:52 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd971c49b0
							
						
					 | 
					
						
						
							
							stub out flexbox layout docs
						
						
						
						
						
						
					 | 
					
						2015-05-22 23:20:21 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							37e543759b
							
						
					 | 
					
						
						
							
							scope grid example styles better
						
						
						
						
						
						
					 | 
					
						2015-04-23 01:30:55 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							7e86bfd9ac
							
						
					 | 
					
						
						
							
							change nav to use index files for each section; stub out index views for everything
						
						
						
						
						
						
					 | 
					
						2015-04-18 12:28:50 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							33e32bffc8
							
						
					 | 
					
						
						
							
							new headers, ad placements, intro paragraphs on several pages, etc
						
						
						
						
						
						
					 | 
					
						2015-01-19 20:03:08 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							1633da2ce8
							
						
					 | 
					
						
						
							
							remove unnecessary docs sections for media queries page
						
						
						
						
						
						
					 | 
					
						2015-01-19 15:44:53 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							325748ff68
							
						
					 | 
					
						
						
							
							Merge branch 'master' into v4
						
						
						
						
						
						
						
						Conflicts:
	_config.yml
	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
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.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.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/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss 
						
						
					 | 
					
						2015-01-19 14:48:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gleb Mazovetskiy
							
						 
					 | 
					
						
						
						
						
							
						
						
							3be590dd5b
							
						
					 | 
					
						
						
							
							docs: fix typo in media-queries.md
						
						
						
						
						
						
					 | 
					
						2015-01-08 21:17:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chris Rebert
							
						 
					 | 
					
						
						
						
						
							
						
						
							e651b48eb6
							
						
					 | 
					
						
						
							
							update responsive utility docs post-overhaul
						
						
						
						
						
						
					 | 
					
						2015-01-06 17:49:33 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chris Rebert
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff9c07f4aa
							
						
					 | 
					
						
						
							
							fix numerical typo in grid docs
						
						
						
						
						
						
					 | 
					
						2015-01-06 17:46:46 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb176a97e1
							
						
					 | 
					
						
						
							
							change values, remove grid column size row
						
						
						
						
						
						
					 | 
					
						2014-12-31 10:46:50 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chris Rebert
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6affe79b7
							
						
					 | 
					
						
						
							
							account for XL size tier in grid docs
						
						
						
						
						
						
					 | 
					
						2014-12-29 18:27:41 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca53c93f3d
							
						
					 | 
					
						
						
							
							no need to mention jquery in the layout scaffolding docs
						
						
						
						
						
						
					 | 
					
						2014-12-23 13:26:37 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1a3a007b6
							
						
					 | 
					
						
						
							
							tweak grid docs, add new tier
						
						
						
						
						
						
					 | 
					
						2014-12-04 21:02:04 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							156750941b
							
						
					 | 
					
						
						
							
							move media queries docs to new section of layout
						
						
						
						
						
						
					 | 
					
						2014-12-04 16:51:19 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a799af939
							
						
					 | 
					
						
						
							
							fixes and grunt
						
						
						
						
						
						
					 | 
					
						2014-11-30 21:01:50 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							86af1f39ab
							
						
					 | 
					
						
						
							
							Merge branch 'master' into derp
						
						
						
						
						
						
						
						Conflicts:
	Gruntfile.js
	_config.yml
	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/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.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/browser-bugs.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/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less 
						
						
					 | 
					
						2014-11-09 22:02:53 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							01816e4e10
							
						
					 | 
					
						
						
							
							add css resets outline section to scaffolding docs
						
						
						
						
						
						
					 | 
					
						2014-07-14 09:14:59 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdb0f8229e
							
						
					 | 
					
						
						
							
							move scaffolding stuff back to layout once more, split off the type docs to typography section
						
						
						
						
						
						
					 | 
					
						2014-07-14 08:34:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d55c3c0a3
							
						
					 | 
					
						
						
							
							move containers to layout section
						
						
						
						
						
						
					 | 
					
						2014-07-14 08:22:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							aa22440acb
							
						
					 | 
					
						
						
							
							move media to layout
						
						
						
						
						
						
					 | 
					
						2014-07-13 01:28:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							3753390242
							
						
					 | 
					
						
						
							
							make it a thing
						
						
						
						
						
						
					 | 
					
						2014-07-11 23:19:46 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							dad3cab24f
							
						
					 | 
					
						
						
							
							move responsive utils
						
						
						
						
						
						
					 | 
					
						2014-07-11 22:59:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							46f1fbe746
							
						
					 | 
					
						
						
							
							grid cleanup, nav rearranging
						
						
						
						
						
						
					 | 
					
						2014-07-11 22:58:43 -07:00 | 
					
					
						
						
							
							
							
						
					 |