Robert Burns 
							
						 
					 
					
						
						
						
						
							
						
						
							1816483baa 
							
						 
					 
					
						
						
							
							Add carousel indicators to example  
						
						
						
						
					 
					
						2013-04-01 09:29:43 -04:00 
						 
				 
			
				
					
						
							
							
								Robert Burns 
							
						 
					 
					
						
						
						
						
							
						
						
							e183dd46a2 
							
						 
					 
					
						
						
							
							Update carousel-caption btn styles  
						
						
						
						
					 
					
						2013-04-01 09:27:49 -04:00 
						 
				 
			
				
					
						
							
							
								Robert Burns 
							
						 
					 
					
						
						
						
						
							
						
						
							d299ff4fce 
							
						 
					 
					
						
						
							
							Fix image paths and carousel controls for carousel example  
						
						
						
						
					 
					
						2013-03-31 21:47:02 -04:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							b96ab36d38 
							
						 
					 
					
						
						
							
							add some container padding for examples  
						
						
						
						
					 
					
						2013-03-31 11:24:31 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							6c1ed5638b 
							
						 
					 
					
						
						
							
							actually readd the padding and set it to smaller amount for narrow viewports  
						
						
						
						
					 
					
						2013-03-30 22:54:31 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							70ba9a880e 
							
						 
					 
					
						
						
							
							remove padding form sign in form example  
						
						
						
						
					 
					
						2013-03-30 22:53:35 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							601013ca04 
							
						 
					 
					
						
						
							
							drop .muted for .text-muted  
						
						
						
						
					 
					
						2013-03-30 00:11:38 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							d5303906bd 
							
						 
					 
					
						
						
							
							Remove grid example; update grid classes in examples  
						
						
						
						
					 
					
						2013-03-26 17:17:39 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							1e9be3644c 
							
						 
					 
					
						
						
							
							remove .navbar-inner from starter template  
						
						
						
						
					 
					
						2013-03-26 12:31:03 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							954dcc0dc5 
							
						 
					 
					
						
						
							
							Merge branch '3.0.0-wip' of  https://github.com/psylabs/bootstrap  into psylabs-3.0.0-wip  
						
						... 
						
						
						
						Conflicts:
	less/tests/navbar-fixed-top.html
	less/tests/navbar-static-top.html
	less/tests/navbar.html 
						
						
					 
					
						2013-03-26 12:28:00 -07:00 
						 
				 
			
				
					
						
							
							
								mo 
							
						 
					 
					
						
						
						
						
							
						
						
							ab09fb25b9 
							
						 
					 
					
						
						
							
							Fixed the navbar toggle in example templates by changing all the ".btn .btn-navbar" to ".navbar-toggle"  
						
						
						
						
					 
					
						2013-03-25 18:13:13 -07:00 
						 
				 
			
				
					
						
							
							
								mo 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e9d9d544 
							
						 
					 
					
						
						
							
							Fixed all the .brand in navbar to .navbar-brand  
						
						
						
						
					 
					
						2013-03-25 17:46:44 -07:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							ea01e8bbc4 
							
						 
					 
					
						
						
							
							nuke remaining less/tests/ files and move grid over to examples dir  
						
						
						
						
					 
					
						2013-02-26 00:49:21 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							5b3b11c02a 
							
						 
					 
					
						
						
							
							moved examples added  
						
						
						
						
					 
					
						2013-02-26 00:42:24 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							9b3262cb15 
							
						 
					 
					
						
						
							
							more narrow jumbotron example fixes in the mobile first arena  
						
						
						
						
					 
					
						2013-02-17 19:04:38 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							c6f341bd17 
							
						 
					 
					
						
						
							
							Refactor some common classes from docs css and examples, then prevent examples from using docs.css  
						
						
						
						
					 
					
						2013-02-17 18:58:40 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							dba9eea98d 
							
						 
					 
					
						
						
							
							revamp narrow jumbotron to avoid conflicts with docs .masthead  
						
						
						
						
					 
					
						2013-02-17 18:48:00 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							e74fb39080 
							
						 
					 
					
						
						
							
							Nuke the fluid example since it's no longer applicable  
						
						
						
						
					 
					
						2013-02-16 01:43:23 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							bcb6dd5ee6 
							
						 
					 
					
						
						
							
							fix spelling as pointed out by @jodytate that got nuked in the merge  
						
						
						
						
					 
					
						2013-02-14 23:51:35 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							aa5f090371 
							
						 
					 
					
						
						
							
							Make example pages use Jekyll; add sticky footer navbar image to examples  
						
						
						
						
					 
					
						2013-02-14 23:38:00 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							e45f12ad42 
							
						 
					 
					
						
						
							
							rearrange jekyll and docs  
						
						
						
						
					 
					
						2013-02-12 12:44:41 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							8b9733b288 
							
						 
					 
					
						
						
							
							nuke what we don't need for jekyll  
						
						
						
						
					 
					
						2013-02-12 12:25:05 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							43da258bd9 
							
						 
					 
					
						
						
							
							Merge branch '2.3.0-wip' into 3.0.0-wip  
						
						... 
						
						
						
						Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/examples/hero.html
	less/buttons.less
	less/carousel.less
	less/close.less
	less/dropdowns.less
	less/labels-badges.less
	less/mixins.less
	less/navbar.less
	less/navs.less
	less/pagination.less
	less/responsive-navbar.less
	less/scaffolding.less
	less/sprites.less
	less/thumbnails.less
	less/type.less 
						
						
					 
					
						2013-02-05 19:53:44 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							15c7e73abd 
							
						 
					 
					
						
						
							
							Merge branch '2.3.0-wip' of  https://github.com/patrickhlauke/bootstrap  into patrickhlauke-2.3.0-wip  
						
						... 
						
						
						
						Conflicts:
	docs/assets/css/bootstrap.css
	less/navbar.less 
						
						
					 
					
						2013-02-05 19:39:49 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							2553d74b54 
							
						 
					 
					
						
						
							
							Merge branch '2.3.0-wip' into 3.0.0-wip  
						
						... 
						
						
						
						Conflicts:
	docs/examples/hero.html
	docs/examples/sticky-footer-navbar.html 
						
						
					 
					
						2013-02-01 10:34:25 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							7d655c3549 
							
						 
					 
					
						
						
							
							Use button element instead of a for responsive navbar buttons  
						
						
						
						
					 
					
						2013-02-01 10:33:36 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							725cf7f6ec 
							
						 
					 
					
						
						
							
							start to refactor justified nav example  
						
						
						
						
					 
					
						2013-02-01 10:32:08 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							7528b6e10a 
							
						 
					 
					
						
						
							
							button element instead of href-less a tag for navbar button  
						
						
						
						
					 
					
						2013-02-01 10:30:48 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							755f1776da 
							
						 
					 
					
						
						
							
							Refactor jumbotron-narrow.html example  
						
						... 
						
						
						
						* Make it mobile-first
* Add a handful of comments to explain CSS
* Instead of an <hr> between custom header and jumbotron, use border for a tighter mobile layout 
						
						
					 
					
						2013-01-31 18:34:12 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							19b5ebcf24 
							
						 
					 
					
						
						
							
							Rename marketing-narrow to jumbotron-narrow for mo betta naming schemes  
						
						
						
						
					 
					
						2013-01-31 18:25:44 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							dfdf343825 
							
						 
					 
					
						
						
							
							Refactor jumbotron example:  
						
						... 
						
						
						
						* Add hella CSS comments
* Reduce padding on body to height of navbar, then set top margin on jumbotron at +768px
* Wrap marketing copy and footer in an extra div so we can set some padding for ideal responsive views 
						
						
					 
					
						2013-01-31 18:22:47 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							061d2849a6 
							
						 
					 
					
						
						
							
							Update starter template to include left/right padding on inner container; also include body padding  
						
						
						
						
					 
					
						2013-01-31 18:06:56 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							64bc5dc91f 
							
						 
					 
					
						
						
							
							remove .navbar-inner from sticky footer navbar  
						
						
						
						
					 
					
						2013-01-19 09:40:26 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							1a88367b72 
							
						 
					 
					
						
						
							
							mo betta links between sticky footer examples  
						
						
						
						
					 
					
						2013-01-19 09:39:56 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							7c9295d44b 
							
						 
					 
					
						
						
							
							update sticky footer templates  
						
						
						
						
					 
					
						2013-01-19 09:34:08 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							411e6b18cb 
							
						 
					 
					
						
						
							
							unified and simplified sign in form example  
						
						
						
						
					 
					
						2013-01-18 01:52:16 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							82bfa965a7 
							
						 
					 
					
						
						
							
							cleanup more examples  
						
						
						
						
					 
					
						2013-01-18 01:37:31 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							d4cb7077fe 
							
						 
					 
					
						
						
							
							mo betta justified nav  
						
						
						
						
					 
					
						2013-01-18 01:33:55 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							604f76dcf8 
							
						 
					 
					
						
						
							
							overhaul justified nav example  
						
						
						
						
					 
					
						2013-01-17 21:05:23 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							8111e307b9 
							
						 
					 
					
						
						
							
							Remove docs and prettify css from examples thus far; update narrow page  
						
						
						
						
					 
					
						2013-01-17 20:39:38 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							caed3a9dbb 
							
						 
					 
					
						
						
							
							fix up jumbotron example  
						
						
						
						
					 
					
						2013-01-17 20:35:59 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							6466fe00a1 
							
						 
					 
					
						
						
							
							Rename hero.html to jumbotron.html  
						
						
						
						
					 
					
						2013-01-17 20:32:07 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							ac3c907799 
							
						 
					 
					
						
						
							
							finish updating starter template  
						
						
						
						
					 
					
						2013-01-17 20:30:19 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							1b128b3431 
							
						 
					 
					
						
						
							
							comment tweaks and updating starter template  
						
						
						
						
					 
					
						2013-01-17 20:28:05 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							f9ee99cf6f 
							
						 
					 
					
						
						
							
							Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing  
						
						
						
						
					 
					
						2013-01-14 00:11:55 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							aaf80d410a 
							
						 
					 
					
						
						
							
							fix username navbar text in fluid example for responsive variations  
						
						
						
						
					 
					
						2013-01-12 00:20:13 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							53f9e25150 
							
						 
					 
					
						
						
							
							Comment fix  
						
						
						
						
					 
					
						2013-01-11 20:30:56 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							649d8c985e 
							
						 
					 
					
						
						
							
							Remove navbar links from sticky footer navbar example  
						
						
						
						
					 
					
						2013-01-11 11:00:45 -08:00 
						 
				 
			
				
					
						
							
							
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							839f83c610 
							
						 
					 
					
						
						
							
							Merge branch 'wilfra-patch-2' into 2.3.0-wip  
						
						
						
						
					 
					
						2013-01-11 10:58:17 -08:00 
						 
				 
			
				
					
						
							
							
								William Franceschine 
							
						 
					 
					
						
						
						
						
							
						
						
							cf852c1f62 
							
						 
					 
					
						
						
							
							Update docs/examples/marketing-narrow.html  
						
						... 
						
						
						
						Updated copyright to 2013 
						
						
					 
					
						2013-01-10 02:14:14 -08:00