Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							a70c50d1f7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into 3.0.0-wip  
						
						 
						
						... 
						
						
						
						Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/index.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/responsive.less
	package.json 
						
						
							
						
					 
					
						2013-03-01 12:37:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							77e8e2aee9 
							
						 
					 
					
						
						
							
							Fix alignment of .navbar-brand  
						
						 
						
						
						
						
							
						
					 
					
						2013-03-01 00:50:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							492c249537 
							
						 
					 
					
						
						
							
							improve navbar toggle and hide code snippets on mobile devices for now  
						
						 
						
						
						
						
							
						
					 
					
						2013-03-01 00:18:10 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							2e3ba4afe6 
							
						 
					 
					
						
						
							
							redo the buttons examples  
						
						 
						
						
						
						
							
						
					 
					
						2013-03-01 00:04:41 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							ba633949dc 
							
						 
					 
					
						
						
							
							customize navbar in docs  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 23:36:54 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							38ba057dee 
							
						 
					 
					
						
						
							
							Fixes   #6998 : disabled background color properly on pagination  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 23:23:05 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							5a30e52aac 
							
						 
					 
					
						
						
							
							Fixes   #6995 : Add disabled navbar nav link support  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 23:20:58 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							4418c82888 
							
						 
					 
					
						
						
							
							Fixes   #6954 : properly reset grid classes within tables  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 22:47:32 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat-kun 
							
						 
					 
					
						
						
						
						
							
						
						
							eb24718add 
							
						 
					 
					
						
						
							
							Merge pull request  #7111  from twitter/2.3.1-wip  
						
						 
						
						... 
						
						
						
						2.3.1 wip 
						
						
							
  v2.3.1
 
						
					 
					
						2013-02-28 21:24:27 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							bfc4aaf6e8 
							
						 
					 
					
						
						
							
							Holy fucking shit fix that input group with buttons rounded corner noise  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 21:19:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							6b2a010357 
							
						 
					 
					
						
						
							
							update changelog  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 21:16:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							839b0c893f 
							
						 
					 
					
						
						
							
							shiiiit  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 21:15:33 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							0992a85932 
							
						 
					 
					
						
						
							
							woops that should stay 2.3.0  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 21:00:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							3469339068 
							
						 
					 
					
						
						
							
							2.3.1  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 20:55:14 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							cec434a4c3 
							
						 
					 
					
						
						
							
							rebuild  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 20:48:48 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							2f27d9851c 
							
						 
					 
					
						
						
							
							whitespace  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 20:48:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							a61322c2fb 
							
						 
					 
					
						
						
							
							WHOOPS ( >_>)  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 20:46:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							01e0f8c653 
							
						 
					 
					
						
						
							
							only pass unique options through to child nodes in tooltips  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 20:39:07 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							cf998040ec 
							
						 
					 
					
						
						
							
							rebuild  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 19:49:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							ef80765726 
							
						 
					 
					
						
						
							
							pass true to cycle  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 19:47:01 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							b19eb88b5a 
							
						 
					 
					
						
						
							
							Fixes   #6935 : Use standard decimal points for .opacity() mixin  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 19:46:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							0dea8b0c74 
							
						 
					 
					
						
						
							
							Fixes   #6897 : Print styles get own .less file  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 19:42:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								fat 
							
						 
					 
					
						
						
						
						
							
						
						
							40b7a909a6 
							
						 
					 
					
						
						
							
							le sigh  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 19:37:30 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							9d763e805b 
							
						 
					 
					
						
						
							
							Remove margin between buttons in button groups; use border-radius mixins to avoid reseting border-radii that don't need resetting  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 19:34:02 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							877d64dd77 
							
						 
					 
					
						
						
							
							remove auto regen  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-28 19:32:39 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							81a0306cce 
							
						 
					 
					
						
						
							
							add new example thumbnails; update links to point to new windows  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-26 00:56:06 -08: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 
							
						 
					 
					
						
						
						
						
							
						
						
							e2e5580c0e 
							
						 
					 
					
						
						
							
							nuke glyphicons changes in buttons for now because it's whack  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-26 00:44:15 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							5b3b11c02a 
							
						 
					 
					
						
						
							
							moved examples added  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-26 00:42:24 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							91660a0489 
							
						 
					 
					
						
						
							
							Move navbar examples to /examples directory  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-26 00:37:59 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							e1bb94c383 
							
						 
					 
					
						
						
							
							try out new table-based type example  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-24 01:29:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							16111a5e45 
							
						 
					 
					
						
						
							
							Merge pull request  #6967  from twitter/readme_npm_fix  
						
						 
						
						... 
						
						
						
						Update readme npm instructions 
						
						
							
						
					 
					
						2013-02-21 13:10:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							c6343a9d4a 
							
						 
					 
					
						
						
							
							Merge pull request  #6990  from acmetech/3.0.0-wip  
						
						 
						
						... 
						
						
						
						Additional minor updates to the docs 
						
						
							
						
					 
					
						2013-02-19 16:09:18 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Pietschker 
							
						 
					 
					
						
						
						
						
							
						
						
							1780873173 
							
						 
					 
					
						
						
							
							forgot navbar-fixed-bottom in the commit  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-19 14:54:56 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Pietschker 
							
						 
					 
					
						
						
						
						
							
						
						
							ba7b1e8234 
							
						 
					 
					
						
						
							
							tweak the position of the fixed to top/bottom navbars to remove double border  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-19 14:50:44 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Pietschker 
							
						 
					 
					
						
						
						
						
							
						
						
							ec9b01e691 
							
						 
					 
					
						
						
							
							remove the search-query class and increase the width  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-19 14:40:05 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Pietschker 
							
						 
					 
					
						
						
						
						
							
						
						
							62b54605a7 
							
						 
					 
					
						
						
							
							replace navbar-search with navbar-form  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-19 14:35:48 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Pietschker 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7e5214e3 
							
						 
					 
					
						
						
							
							remove navbar-inner  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-19 14:32:28 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							a1913cbe7e 
							
						 
					 
					
						
						
							
							Merge pull request  #6979  from acmetech/3.0.0-wip  
						
						 
						
						... 
						
						
						
						Minor fixes to docs 
						
						
							
						
					 
					
						2013-02-18 18:26:26 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Pietschker 
							
						 
					 
					
						
						
						
						
							
						
						
							722ba5f227 
							
						 
					 
					
						
						
							
							added missing slash in the src for Gather Content  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-18 21:03:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tom Pietschker 
							
						 
					 
					
						
						
						
						
							
						
						
							4c00f290f2 
							
						 
					 
					
						
						
							
							fix incorrect section id for labels  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-18 20:57:54 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							023568fe3d 
							
						 
					 
					
						
						
							
							Navbar realignment:  
						
						 
						
						... 
						
						
						
						* Change .brand to .navbar-brand
* Change .btn-navbar to .navbar-toggle
* Redesign navbar toggle to be a bit lighter and wider
* Center align the navbar brand with a max-width of 200px (to minimize hit area) while still centering 
						
						
							
						
					 
					
						2013-02-18 01:28:35 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							f51862f158 
							
						 
					 
					
						
						
							
							remove unused include  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-18 01:27:08 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							acdffe696c 
							
						 
					 
					
						
						
							
							Bring back the label, make it scale somewhat with the font-size of the parent using percentages and ems  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-17 22:20:49 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							f6ec2c5dac 
							
						 
					 
					
						
						
							
							Drop the recently added .counter class for .badge  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-17 21:06:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							d3cc8f79f4 
							
						 
					 
					
						
						
							
							remove old todo comment  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-17 20:26:44 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							53091be6d2 
							
						 
					 
					
						
						
							
							remove unnecessary select border reset  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-17 20:26:21 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							e2d829e511 
							
						 
					 
					
						
						
							
							fix inaccurate text classes code  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-17 20:23:31 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							82d059de87 
							
						 
					 
					
						
						
							
							fix broken marketing section with updated class  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-17 20:18:29 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mark Otto 
							
						 
					 
					
						
						
						
						
							
						
						
							159167041f 
							
						 
					 
					
						
						
							
							forgot about those quotes  
						
						 
						
						
						
						
							
						
					 
					
						2013-02-17 19:15:09 -08:00