diff options
| author | Mark Otto <[email protected]> | 2012-01-17 23:19:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-17 23:19:21 -0800 |
| commit | 41a410b8e631ddcc958568402f1ea1616f2a982d (patch) | |
| tree | f86607032e77ebaa161a0c0f7f64c1e0a8e1b643 /lib | |
| parent | f1a88eede391cbb4beaadce60768a351724d7633 (diff) | |
| parent | 7ec4e91324e6e490291f3de22e1127c4fa55f82a (diff) | |
| download | bootstrap-41a410b8e631ddcc958568402f1ea1616f2a982d.tar.xz bootstrap-41a410b8e631ddcc958568402f1ea1616f2a982d.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
bootstrap.min.css
docs/javascript.html
lib/accordion.less
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/accordion.less | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lib/accordion.less b/lib/accordion.less index 25e8fec63..b7542b18f 100644 --- a/lib/accordion.less +++ b/lib/accordion.less @@ -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; } |