github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-04-24 03:00:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Mark Otto
2011-11-29 22:35:58 -08:00
parent b36df46310 08d0aff19f
commit cbb291b8ab
32 changed files with 1372 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
docs/assets/css/docs.css
View File

@@ -330,6 +330,13 @@ body > .navbar-fixed .brand:hover {
margin-left: 10px;
}
/* scrollspy docs */
.scrollspy-example {
overflow: auto;
height: 200px;
position: relative;
}
/* Popover docs
-------------------------------------------------- */
@@ -492,3 +499,19 @@ h2 + table {
}
}
#accordion dt a{
display:block;
padding: 9px 15px;
line-height: 1;
background-color: whiteSmoke;
border: 1px solid #EEE;
border-top-color: #fff;
}
#accordion dt:first-child a {
border-top-color:#eee;
}
#accordion dd p {
padding: 10px;
}