Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed42fc9b76
							
						
					 | 
					
						
						
							
							line-height-base to line-height var
						
						
						
						
						
						
					 | 
					
						2015-06-22 23:24:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							75cf69a1ab
							
						
					 | 
					
						
						
							
							drop more -base, clean up var spacing
						
						
						
						
						
						
					 | 
					
						2015-06-22 18:57:56 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							0ca9b21c34
							
						
					 | 
					
						
						
							
							drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner
						
						
						
						
						
						
					 | 
					
						2015-06-22 18:53:04 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							4565281df3
							
						
					 | 
					
						
						
							
							rename -horizontal and -vertical vars to -x and -y for consistency
						
						
						
						
						
						
					 | 
					
						2015-06-22 16:33:17 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							169d2a4a78
							
						
					 | 
					
						
						
							
							Merge branch 'master' into v4
						
						
						
						
						
						
					 | 
					
						2015-06-18 23:56:43 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							b88c05d564
							
						
					 | 
					
						
						
							
							clean up comments and spacing
						
						
						
						
						
						
					 | 
					
						2015-04-18 11:15:40 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							06c2862d25
							
						
					 | 
					
						
						
							
							start stubbing out a new reboot section and file
						
						
						
						
						
						
					 | 
					
						2015-04-16 18:39:45 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							2f7bfb44c2
							
						
					 | 
					
						
						
							
							fixes
						
						
						
						
						
						
					 | 
					
						2015-03-29 00:12:19 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							58082cd83e
							
						
					 | 
					
						
						
							
							Merge branch 'master' into v4
						
						
						
						
						
						
						
						Conflicts:
	.gitignore
	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/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_includes/components/navbar.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/grid.html
	docs/_includes/css/overview.html
	docs/_includes/customizer-variables.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/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/third-party-support.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/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.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/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/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/migration.html
	js/affix.js
	js/alert.js
	js/button.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tests/visual/modal.html
	js/tooltip.js
	less/component-animations.less
	less/jumbotron.less
	less/mixins/background-variant.less
	less/mixins/buttons.less
	less/mixins/responsive-visibility.less
	less/mixins/text-emphasis.less
	less/navbar.less
	less/navs.less
	less/scaffolding.less
	less/tooltip.less
	less/utilities.less
	less/variables.less
	package.json
	scss/_buttons.scss
	scss/_forms.scss
	scss/_modal.scss 
						
						
					 | 
					
						2015-03-29 00:08:54 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chris Rebert
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e374bd010
							
						
					 | 
					
						
						
							
							put all :hover styles within @media (hover: hover)
						
						
						
						
						
						
					 | 
					
						2015-01-22 11:37:37 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							325748ff68
							
						
					 | 
					
						
						
							
							Merge branch 'master' into v4
						
						
						
						
						
						
						
						Conflicts:
	_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
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	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/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss 
						
						
					 | 
					
						2015-01-19 14:48:12 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chris Rebert
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b03c9ad63
							
						
					 | 
					
						
						
							
							[disabled] => :disabled
						
						
						
						
						
						
						
						:disabled is supported in IE9+ and all modern browsers 
						
						
					 | 
					
						2014-12-22 13:34:02 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Chris Rebert
							
						 
					 | 
					
						
						
						
						
							
						
						
							0766ecab60
							
						
					 | 
					
						
						
							
							Remove defunct background-image: none Firefox-on-Android workaround
						
						
						
						
						
						
						
						Mozilla fixed the bug circa Firefox 33-35:
    https://bugzilla.mozilla.org/show_bug.cgi?id=763671
Firefox 34 is the current version.
Firefox 35 should be current by the time Bootstrap v4 is released.
						
						
					 | 
					
						2014-12-16 19:41:11 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							fef873a840
							
						
					 | 
					
						
						
							
							fix all validation, turn off some settings, add sort order
						
						
						
						
						
						
					 | 
					
						2014-12-11 12:05:29 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mark Otto
							
						 
					 | 
					
						
						
						
						
							
						
						
							27df020852
							
						
					 | 
					
						
						
							
							convert to scss
						
						
						
						
						
						
					 | 
					
						2014-12-02 14:02:35 -08:00 | 
					
					
						
						
							
							
							
						
					 |