diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-01-31 12:48:00 -0500 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-01-31 12:48:00 -0500 |
| commit | 5a55d68eca60b52cbd1ae1ab48a6c9b1f8817ef1 (patch) | |
| tree | 63643e9dfc1f265051ff65d441ce943121864398 | |
| parent | 3919256abd7b91dcc8437c245f98d623103f97e0 (diff) | |
| download | jquery-ui-5a55d68eca60b52cbd1ae1ab48a6c9b1f8817ef1.tar.gz jquery-ui-5a55d68eca60b52cbd1ae1ab48a6c9b1f8817ef1.zip | |
Accordion: Moved the ui-accordion-icons class to the headers to properly style nested accordions with varying settings of icons and no icons. Fixes #7880 - Nested accordion.
| -rw-r--r-- | themes/base/jquery.ui.accordion.css | 4 | ||||
| -rw-r--r-- | ui/jquery.ui.accordion.js | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css index c69118384..0a07f0309 100644 --- a/themes/base/jquery.ui.accordion.css +++ b/themes/base/jquery.ui.accordion.css @@ -12,7 +12,9 @@ .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 2px; zoom: 1; } .ui-accordion .ui-accordion-header-active { border-bottom: 0; } .ui-accordion .ui-accordion-heading { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } -.ui-accordion-icons .ui-accordion-heading { padding-left: 2.2em; } +.ui-accordion-icons a.ui-accordion-heading { padding-left: 2.2em; } +.ui-accordion-noicons a.ui-accordion-heading { padding-left: .7em; } +.ui-accordion-icons .ui-accordion-icons a.ui-accordion-heading { padding-left: 2.2em; } .ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } .ui-accordion .ui-accordion-content { padding: 1em 2.2em; overflow: auto; display: none; zoom: 1; } .ui-accordion .ui-accordion-content-active { display: block; } diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 97549cb10..6c486c7b1 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -119,13 +119,15 @@ $.widget( "ui.accordion", { this.active.children( ".ui-accordion-header-icon" ) .removeClass( icons.header ) .addClass( icons.activeHeader ); - this.element.addClass( "ui-accordion-icons" ); + this.headers.addClass( "ui-accordion-icons" ); } }, _destroyIcons: function() { - this.headers.children( ".ui-accordion-header-icon" ).remove(); - this.element.removeClass( "ui-accordion-icons" ); + this.headers + .removeClass( "ui-accordion-icons" ) + .children( ".ui-accordion-header-icon" ) + .remove(); }, _destroy: function() { |