mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

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

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
	docs/javascript.html
	lib/accordion.less
This commit is contained in:
Mark Otto
2012-01-17 23:19:21 -08:00
parent f1a88eede3 7ec4e91324
commit 41a410b8e6
5 changed files with 60 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/accordion.less
+14 -11
View File
@@ -2,24 +2,27 @@
// ---------
.accordion {
padding: 0;
margin-bottom: @baseLineHeight;
}
.accordion-group {
margin-bottom: @baseLineHeight / 2;
background-color: #eee;
background-color: #f5f5f5;
.border-radius(4px);
}
.accordion-heading {
display: block;
padding: 9px 15px;
padding: 8px 15px;
border-bottom: 0;
}
.accordion-body {
display: none;
padding: 15px;
margin-left: 0;
border-top: 1px solid #ddd;
.box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
margin: 0 0 2px;
}
.accordion-inner {
padding: 9px 15px;
border-top: 1px solid #e5e5e5;
}
.accordion .in {
display: block;
margin-bottom: @baseLineHeight / 2;
}