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 /bootstrap.css | |
| 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 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/bootstrap.css b/bootstrap.css index acd0ae5c8..9d3f9d9b6 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Mon Jan 16 16:01:19 PST 2012 + * Date: Tue Jan 17 23:17:49 PST 2012 */ html, body { margin: 0; @@ -2940,27 +2940,24 @@ a.thumbnail:hover { padding: 0; } .accordion-group { - margin-bottom: 9px; - background-color: #eee; + background-color: #f5f5f5; -webkit-border-radius: 4px; -moz-border-radius: 4px; 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; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25); + margin: 0 0 2px; +} +.accordion-inner { + padding: 9px 15px; + border-top: 1px solid #e5e5e5; } .accordion .in { - display: block; + margin-bottom: 9px; } .carousel { position: relative; |