0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Commit Graph

58 Commits

Author SHA1 Message Date
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
454cc55e31 remove justified button groups 2015-03-09 14:32:30 +00: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
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