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

Merge branch '2.2.2-wip' into exploratory

Browse source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
This commit is contained in:
Mark Otto 2012-11-30 00:13:30 -08:00
commit fca35c0dba
29 changed files with 789 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/assets/css/docs.css
View file

@ -831,6 +831,7 @@ form.bs-docs-example {
/* When affixed, space properly */
.bs-docs-sidenav {
top: 0;
width: 218px;
margin-top: 30px;
margin-right: 0;
}
@ -838,7 +839,7 @@ form.bs-docs-example {
/* Tablet to desktop
------------------------- */
@media (min-width: 768px) and (max-width: 980px) {
@media (min-width: 768px) and (max-width: 979px) {
/* Remove any padding from the body */
body {
padding-top: 0;