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 
						 
				 
			
				
					
						
							
							
								Patrick H. Lauke 
							
						 
					 
					
						
						
						
						
							
						
						
							bb89657bcb 
							
						 
					 
					
						
						
							
							Assorted accessibility (and some consistency) fixes for documentation  
						
						... 
						
						
						
						Closes  #14951  by merging it. 
					
						2014-11-11 07:46:14 +01:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							41dbc53b9b 
							
						 
					 
					
						
						
							
							Fix a small typo in comment.  
						
						... 
						
						
						
						[ci skip] 
						
						
					 
					
						2014-10-23 09:11:12 +03:00 
						 
				 
			
				
					
						
							
							
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							9742bb2ee4 
							
						 
					 
					
						
						
							
							Fix   #14164 : move Windows Phone 8 IE10 viewport bug workaround script to footer of pages  
						
						
						
						
					 
					
						2014-07-27 17:01:34 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							a5dbd936a6 
							
						 
					 
					
						
						
							
							Nuke IE8 stuff from docs  
						
						
						
						
					 
					
						2014-07-09 02:41:57 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							93a7421f2c 
							
						 
					 
					
						
						
							
							.btn-default to .btn-secondary  
						
						
						
						
					 
					
						2014-07-08 17:14:14 -07:00 
						 
				 
			
				
					
						
							
							
								Jim Frode Hoff 
							
						 
					 
					
						
						
						
						
							
						
						
							29d97d07ef 
							
						 
					 
					
						
						
							
							Update cover.css  
						
						... 
						
						
						
						Moved the inset box-shadow to .site-wrapper in order to keep the shadow at the edges even if content exceeds viewport and needs scrolling. 
						
						
					 
					
						2014-06-23 22:50:38 +02:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							29d00e0cd7 
							
						 
					 
					
						
						
							
							Move apple-touch-icon-precomposed.png and favicon.ico in docs root.  
						
						... 
						
						
						
						This way, it works in all browsers. 
						
						
					 
					
						2014-06-09 01:14:44 +03:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							cae7dee236 
							
						 
					 
					
						
						
							
							Revert 4f9270cc20c29cd3fbb0664379d620d14bb24a91.  
						
						... 
						
						
						
						The validator doesn't choke anymore on this and even though it's not spec compliant, it's needed for some IE versions. So until we move favicon.ico in root, this should do the job. 
						
						
					 
					
						2014-05-22 10:55:28 +03:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							7a765d1f8b 
							
						 
					 
					
						
						
							
							Update jQuery to v1.11.1.  
						
						
						
						
					 
					
						2014-05-13 08:33:23 +03:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							ed98b3dfc0 
							
						 
					 
					
						
						
							
							Update html5shiv to 3.7.2.  
						
						
						
						
					 
					
						2014-05-10 09:23:53 +03:00 
						 
				 
			
				
					
						
							
							
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							a84a3693b1 
							
						 
					 
					
						
						
							
							add ie-emulation-modes-warning.js to docs & examples  
						
						
						
						
					 
					
						2014-04-27 22:08:44 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							fe11ac77a2 
							
						 
					 
					
						
						
							
							Merge pull request  #13390  from twbs/ie10-viewport-bug  
						
						... 
						
						
						
						add IE10 viewport bug workaround to examples 
						
						
					 
					
						2014-04-24 18:50:30 -07:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							52b6a32145 
							
						 
					 
					
						
						
							
							Use the new respond.js URL.  
						
						
						
						
					 
					
						2014-04-21 19:12:43 +03:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							a549e8c332 
							
						 
					 
					
						
						
							
							Update html5shiv to v3.7.1.  
						
						
						
						
					 
					
						2014-04-21 19:11:23 +03:00 
						 
				 
			
				
					
						
							
							
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							448086f95a 
							
						 
					 
					
						
						
							
							add IE10 viewport bug workaround to examples  
						
						... 
						
						
						
						Closes  #13379 . 
					
						2014-04-20 16:09:49 -07:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							4f9270cc20 
							
						 
					 
					
						
						
							
							Switch to icon instead of shortcut icon to fix the HTML validation tests.  
						
						
						
						
					 
					
						2014-03-24 09:28:40 +02:00 
						 
				 
			
				
					
						
							
							
								Bas Bosman 
							
						 
					 
					
						
						
						
						
							
						
						
							cb7eb674ac 
							
						 
					 
					
						
						
							
							Add autoprefixer  
						
						
						
						
					 
					
						2014-03-07 09:01:54 +01:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							ef49635ae2 
							
						 
					 
					
						
						
							
							Fix csslint errors.  
						
						
						
						
					 
					
						2014-02-27 11:15:53 +02:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							9f668a5573 
							
						 
					 
					
						
						
							
							Add examples/**/*.css in csscomb task.  
						
						
						
						
					 
					
						2014-02-04 10:39:02 +02:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							8939268a33 
							
						 
					 
					
						
						
							
							Update jQuery to v1.11.0.  
						
						... 
						
						
						
						Also, use Google's CDN per #11369 . 
						
						
					 
					
						2014-01-30 20:50:17 +02:00 
						 
				 
			
				
					
						
							
							
								Zlatan Vasović 
							
						 
					 
					
						
						
						
						
							
						
						
							cf8f1ec0cd 
							
						 
					 
					
						
						
							
							Improve <meta> tags  
						
						
						
						
					 
					
						2014-01-19 13:27:17 +01:00 
						 
				 
			
				
					
						
							
							
								Julian Thilo 
							
						 
					 
					
						
						
						
						
							
						
						
							67594cb544 
							
						 
					 
					
						
						
							
							Fix holder.js links in examples  
						
						... 
						
						
						
						Replaces links to holder.js with links to the new docs.min.js.
The uncompressed holder.js file is now in docs/assets/js/vendor,
which is excluded from Jekyll builds. In turn, Holder is now
included in docs.min.js, which is smaller than holder.js,
so this should make everybody happy. :) 
						
						
					 
					
						2014-01-18 22:58:05 +01:00 
						 
				 
			
				
					
						
							
							
								wangsai 
							
						 
					 
					
						
						
						
						
							
						
						
							e4508bb37c 
							
						 
					 
					
						
						
							
							fix assets links in all examples  
						
						
						
						
					 
					
						2014-01-01 22:29:13 +08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c829bc0c 
							
						 
					 
					
						
						
							
							Rearrange repository contents because muahahahahahaha  
						
						
						
						
					 
					
						2013-12-28 22:47:03 -08:00