Merge remote-tracking branch 'upstream/master'

1 files changed, 7 insertions, 9 deletions

diff --git a/lib/dijit/themes/claro/layout/AccordionContainer.less b/lib/dijit/themes/claro/layout/AccordionContainer.less
index b3aa62248..fd4308c30 100644
--- a/lib/dijit/themes/claro/layout/AccordionContainer.less
+++ b/lib/dijit/themes/claro/layout/AccordionContainer.less
@@ -43,16 +43,12 @@
 }
 .claro .dijitAccordionTitle {
 	background-color: transparent;	/* pick up color from dijitAccordionInnerContainer */
-	background-image: url("../@{image-layout-accordion}");
-	background-position:0 0;
-	background-repeat:repeat-x;
+	.standard-gradient("../");
 	padding: 5px 7px 2px 7px;
 	min-height:17px;
 	color:@unselected-text-color;
 }
-.dj_ie6 .claro .dijitAccordionTitle {
-	background-image: none;
-}
+
 .claro .dijitAccordionContainer .dijitAccordionChildWrapper {
 	/* this extends the blue trim styling of the title bar to wrapping around the node.
 	 * done by setting margin
@@ -75,7 +71,7 @@
 	.transition-duration(.1s);
 }
 .claro .dijitAccordionInnerContainerActive .dijitAccordionTitle {
-	background-position:0 -136px;
+	.active-gradient("../");
 	color:@selected-text-color;
 }
 
@@ -87,7 +83,7 @@
 }
 .claro .dijitAccordionInnerContainerSelected .dijitAccordionTitle {
 	color:@selected-text-color;
-	background-position: 0 0;	/* avoid effect when clicking the title of the open pane */
+	.standard-gradient("../");	/* avoid effect when clicking the title of the open pane */
 }
 
 /* Hovering open or closed pane */
@@ -97,6 +93,8 @@
 	color:@hovered-text-color;
 }
 
+// TODO: why do we have any hover effect on the selected pane?
+// Since you can't click it, there shouldn't be a hover effect.
 .claro .dijitAccordionInnerContainerHover,
 .claro .dijitAccordionInnerContainerSelectedActive {
 	/* note: clicking the currently selected Accordion pane should have no effect, so treating same as hover. */
@@ -108,6 +106,6 @@
 .claro .dijitAccordionInnerContainerSelectedHover .dijitAccordionChildWrapper,
 .claro .dijitAccordionInnerContainerSelectedActive .dijitAccordionChildWrapper {
 	background-color:@pane-background-color;
-	border:1px solid @hovered-border-color !important;
+	border:1px solid @hovered-border-color;
 	.box-shadow(inset 0 0 3px rgba(0, 0, 0, .25));
 }