rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 3.0.0-wip

Browse source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/javascript.mustache
	less/breadcrumbs.less
	less/tables.less
	less/tests/css-tests.html
This commit is contained in:
Mark Otto 2012-12-08 17:40:42 -08:00
commit bc0b94a3fd
47 changed files with 693 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

2
less/code.less
View file

@ -47,6 +47,8 @@ pre {
code {
padding: 0;
color: inherit;
white-space: pre;
white-space: pre-wrap;
background-color: transparent;
border: 0;
}