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

Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

Browse source 
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
This commit is contained in:
Jacob Thornton 2012-07-24 00:24:25 -07:00
commit 5b2f2ed821
25 changed files with 9474 additions and 9172 deletions
Download patch file Download diff file Expand all files Collapse all files

36
docs/assets/css/docs.css
View file

@ -29,6 +29,9 @@ h3 code {
body > .navbar-fixed-top {
font-size: 13px;
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.15);
-moz-box-shadow: 0 5px 15px rgba(0,0,0,.15);
box-shadow: 0 5px 15px rgba(0,0,0,.15);
}
/* Change the docs' brand */
@ -407,6 +410,8 @@ hr.soften {
/* Custom, larger checkbox labels */
.download .checkbox {
padding: 6px 10px 6px 25px;
font-size: 13px;
line-height: 18px;
color: #555;
background-color: #f9f9f9;
-webkit-border-radius: 3px;
@ -964,3 +969,34 @@ form.bs-docs-example {
width: auto;
}
}
@media (min-width: 979px) {
.masthead,
.subhead {
position: fixed;
top: 40px;
right: 0;
left: 0;
}
.masthead {
height: 380px;
}
.subhead {
height: 130px; /* +80px pdding */
}
.bs-docs-canvas {
position: absolute;
width: 100%;
z-index: 10;
background-color: #fff;
-webkit-box-shadow: 0 -5px 15px rgba(0,0,0,.15);
-moz-box-shadow: 0 -5px 15px rgba(0,0,0,.15);
box-shadow: 0 -5px 15px rgba(0,0,0,.15);
}
.masthead + .bs-docs-canvas {
top: 530px;
}
.subhead + .bs-docs-canvas {
top: 250px;
}
}