Starsam80 
							
						 
					 
					
						
						
						
						
							
						
						
							a996eb344d 
							
						 
					 
					
						
						
							
							Fix segmented buttons in input group docs ( #20489 )  
						
						 
						
						... 
						
						
						
						Fixes  #20484  
						
						
					 
					
						2016-09-04 17:50:39 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							9c3ba540b4 
							
						 
					 
					
						
						
							
							add example of multiple add-ons to docs  
						
						 
						
						
						
						
					 
					
						2016-02-07 23:48:47 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Vicary Archangel 
							
						 
					 
					
						
						
						
						
							
						
						
							c0f931d050 
							
						 
					 
					
						
						
							
							Multiple input-group-addon support  
						
						 
						
						... 
						
						
						
						1. Invert `:first-child` into `:not(:last-child)` and vice versa
2. Remove double border at the left of `.form-control`
3. Shifts negative margins of `.btn` and `.btn-group` to retain
rightmost border when using at the left of `.form-control`. 
						
						
					 
					
						2015-12-09 16:40:32 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							23a7c6b1a6 
							
						 
					 
					
						
						
							
							Docs: Fix flavor text in input group example that got borked at some point  
						
						 
						
						... 
						
						
						
						[skip sauce] 
						
						
					 
					
						2015-12-06 12:02:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							eaf3f16fc6 
							
						 
					 
					
						
						
							
							Add input group example with btns on both sides for completeness+testing  
						
						 
						
						... 
						
						
						
						[skip sauce] 
						
						
					 
					
						2015-11-15 14:15:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Heinrich Fenkart 
							
						 
					 
					
						
						
						
						
							
						
						
							73a88dbe86 
							
						 
					 
					
						
						
							
							Docs: Update all dropdowns to new HTML structure  
						
						 
						
						
						
						
					 
					
						2015-08-21 00:18:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							c064eef67b 
							
						 
					 
					
						
						
							
							Massive cleanup  
						
						 
						
						... 
						
						
						
						- Simpler main nav on all pages
- Back to purple masthead on homepage instead of dark graphite
- Active link styles on the main nav
- Cleaned up sidebar nav
- New docs layout name
- Homepage copy edits
- Updated bright purple docs color 
						
						
					 
					
						2015-08-14 22:45:55 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							fed0d8a2d4 
							
						 
					 
					
						
						
							
							restore page headers, use partial and page frontmatter to organize it  
						
						 
						
						
						
						
					 
					
						2015-08-05 17:47:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							1ddc3f5e21 
							
						 
					 
					
						
						
							
							Merge branch 'master' into v4m  
						
						 
						
						
						
						
					 
					
						2015-08-04 22:29:45 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							169d2a4a78 
							
						 
					 
					
						
						
							
							Merge branch 'master' into v4  
						
						 
						
						
						
						
					 
					
						2015-06-18 23:56:43 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							b455ed8def 
							
						 
					 
					
						
						
							
							add markdown toc stuff  
						
						 
						
						
						
						
					 
					
						2015-05-29 01:58:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							5f2872c561 
							
						 
					 
					
						
						
							
							input groups: drop the tooltips warning, move accessibility notice to a sub section  
						
						 
						
						
						
						
					 
					
						2015-03-09 14:48:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							81259b9c4c 
							
						 
					 
					
						
						
							
							simplify input group docs to remove two notices, condense some language  
						
						 
						
						
						
						
					 
					
						2015-03-09 14:46:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							0e5d17d5f6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into v4  
						
						 
						
						... 
						
						
						
						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
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/breadcrumbs.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/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.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/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	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/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json 
						
						
					 
					
						2015-01-03 20:08:58 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							9f2aeafe85 
							
						 
					 
					
						
						
							
							Merge branch 'master' into derp  
						
						 
						
						... 
						
						
						
						Conflicts:
	Gruntfile.js
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.svg
	docs/_includes/components/badges.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/pagination.html
	docs/_includes/css/forms.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/home-nav.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.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/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/browser-bugs.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.svg
	less/_button-group.less
	less/_jumbotron.less
	less/_variables.less
	less/mixins/vendor-prefixes.less
	less/panels.less
	less/thumbnails.less
	package.json 
						
						
					 
					
						2014-09-17 15:21:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							7d3ad78fc7 
							
						 
					 
					
						
						
							
							markdownify input group  
						
						 
						
						
						
						
					 
					
						2014-07-13 01:12:02 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							5904bacbb3 
							
						 
					 
					
						
						
							
							frontmatter that shit up  
						
						 
						
						
						
						
					 
					
						2014-07-13 00:59:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							ba74329ba6 
							
						 
					 
					
						
						
							
							move input group  
						
						 
						
						
						
						
					 
					
						2014-07-12 02:13:05 -07:00