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 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							6b7d6565de 
							
						 
					 
					
						
						
							
							Examples: Make use of the footer tag instead of a div.  
						
						
						
						
					 
					
						2014-10-30 08:08:06 +02:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							f07477d290 
							
						 
					 
					
						
						
							
							Merge branch 'master' into derp  
						
						... 
						
						
						
						Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/progress-bars.less
	less/theme.less 
						
						
					 
					
						2014-10-26 22:59:02 -07:00 
						 
				 
			
				
					
						
							
							
								Baraa 
							
						 
					 
					
						
						
						
						
							
						
						
							f0fd6df63a 
							
						 
					 
					
						
						
							
							Removed unnecessary new lines that were inconsistent with current style.  
						
						
						
						
					 
					
						2014-10-26 22:33:55 -07:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							41dbc53b9b 
							
						 
					 
					
						
						
							
							Fix a small typo in comment.  
						
						... 
						
						
						
						[ci skip] 
						
						
					 
					
						2014-10-23 09:11:12 +03: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 
						 
				 
			
				
					
						
							
							
								Chris Rebert 
							
						 
					 
					
						
						
						
						
							
						
						
							b2088366a3 
							
						 
					 
					
						
						
							
							Wrap .pagination & .pager in <nav> to improve accessibility  
						
						
						
						
					 
					
						2014-09-08 20:52:07 -07: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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Lewis Cowper 
							
						 
					 
					
						
						
						
						
							
						
						
							4e2b92f310 
							
						 
					 
					
						
						
							
							[trivial] Updated dates  
						
						
						
						
					 
					
						2014-03-18 00:18:01 +00:00 
						 
				 
			
				
					
						
							
							
								Bas Bosman 
							
						 
					 
					
						
						
						
						
							
						
						
							cb7eb674ac 
							
						 
					 
					
						
						
							
							Add autoprefixer  
						
						
						
						
					 
					
						2014-03-07 09:01:54 +01:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							645eebba61 
							
						 
					 
					
						
						
							
							Merge pull request  #12894  from lipis/patch-2  
						
						... 
						
						
						
						Removed margin-bottom from last p of .blog-footer 
						
						
					 
					
						2014-03-06 21:11:00 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							a4df363174 
							
						 
					 
					
						
						
							
							grunt after merging  #12917  
						
						
						
						
					 
					
						2014-03-04 14:35:23 -08:00 
						 
				 
			
				
					
						
							
							
								Lipis 
							
						 
					 
					
						
						
						
						
							
						
						
							e872955737 
							
						 
					 
					
						
						
							
							Removed margin-bottom from last p of .blog-footer  
						
						
						
						
					 
					
						2014-03-02 11:03:09 +01:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							3ab2324df0 
							
						 
					 
					
						
						
							
							Remove double semicolon.  
						
						
						
						
					 
					
						2014-02-04 10:39:02 +02:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							9f668a5573 
							
						 
					 
					
						
						
							
							Add examples/**/*.css in csscomb task.  
						
						
						
						
					 
					
						2014-02-04 10:39:02 +02:00 
						 
				 
			
				
					
						
							
							
								XhmikosR 
							
						 
					 
					
						
						
						
						
							
						
						
							48118576f1 
							
						 
					 
					
						
						
							
							Examples: fix csslint errors.  
						
						
						
						
					 
					
						2014-02-04 09:04:40 +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 
						 
				 
			
				
					
						
							
							
								Julian Thilo 
							
						 
					 
					
						
						
						
						
							
						
						
							7fcfe61f4d 
							
						 
					 
					
						
						
							
							Update copyright notices in all places  
						
						... 
						
						
						
						- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files 
						
						
					 
					
						2014-01-07 01:05:24 +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