Skip to content

Commit 6074b06

Browse files
committed
Accordion: Use ui-accordion-header-active class.
1 parent ba43357 commit 6074b06

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

themes/base/jquery.ui.accordion.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
*/
1010
/* IE/Win - Fix animation bug - #4615 */
1111
.ui-accordion { width: 100%; }
12-
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
13-
.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
12+
.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 2px; zoom: 1; }
13+
.ui-accordion .ui-accordion-header-active { border-bottom: 0; }
1414
.ui-accordion .ui-accordion-heading { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
1515
.ui-accordion-icons .ui-accordion-heading { padding-left: 2.2em; }
1616
.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
17-
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
17+
.ui-accordion .ui-accordion-content { padding: 1em 2.2em; overflow: auto; display: none; zoom: 1; }
1818
.ui-accordion .ui-accordion-content-active { display: block; }

ui/jquery.ui.accordion.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
*/
1414
(function( $, undefined ) {
1515

16-
// TODO: use ui-accordion-header-active class and fix styling
1716
$.widget( "ui.accordion", {
1817
version: "@VERSION",
1918
options: {
@@ -58,7 +57,7 @@ $.widget( "ui.accordion", {
5857
options.active += this.headers.length;
5958
}
6059
self.active = self._findActive( options.active )
61-
.addClass( "ui-state-default ui-state-active" )
60+
.addClass( "ui-accordion-header-active ui-state-active" )
6261
.toggleClass( "ui-corner-all" )
6362
.toggleClass( "ui-corner-top" );
6463
self.active.next().addClass( "ui-accordion-content-active" );
@@ -131,7 +130,7 @@ $.widget( "ui.accordion", {
131130
// clean up headers
132131
this.headers
133132
.unbind( ".accordion" )
134-
.removeClass( "ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
133+
.removeClass( "ui-accordion-header ui-accordion-header-active ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
135134
.removeAttr( "role" )
136135
.removeAttr( "aria-expanded" )
137136
.removeAttr( "aria-selected" )
@@ -335,15 +334,15 @@ $.widget( "ui.accordion", {
335334

336335
// switch classes
337336
active
338-
.removeClass( "ui-state-active ui-corner-top" )
339-
.addClass( "ui-state-default ui-corner-all" )
337+
.removeClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
338+
.addClass( "ui-corner-all" )
340339
.children( ".ui-accordion-header-icon" )
341340
.removeClass( options.icons.activeHeader )
342341
.addClass( options.icons.header );
343342
if ( !clickedIsActive ) {
344343
clicked
345-
.removeClass( "ui-state-default ui-corner-all" )
346-
.addClass( "ui-state-active ui-corner-top" )
344+
.removeClass( "ui-corner-all" )
345+
.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
347346
.children( ".ui-accordion-header-icon" )
348347
.removeClass( options.icons.header )
349348
.addClass( options.icons.activeHeader );

0 commit comments

Comments
 (0)