1 files changed, 19 insertions, 45 deletions

diff --git a/lib/dijit/themes/claro/form/Select.less b/lib/dijit/themes/claro/form/Select.less
index 0e7426112..3c2cac682 100644
--- a/lib/dijit/themes/claro/form/Select.less
+++ b/lib/dijit/themes/claro/form/Select.less
@@ -19,101 +19,75 @@
 
 @import "../variables";
 
-.claro .dijitSelect .dijitButtonText {
-	padding: @textbox-padding;
-}
-
 /* normal status */
-.claro .dijitSelect {
-	border: 1px solid @border-color;
-	background-color: @textbox-background-color;
-	border-collapse: separate;
-}
-.dj_ie6 .claro .dijitSelect,
-.dj_ie6 .claro .dijitSelect .dijitButtonNode {
-	background-image:none;
-}
-
-.claro .dijitSelect .dijitButtonContents {
-	border: 0 solid @border-color;
-	border-right-width: 1px;
+.claro .dijitSelect .dijitArrowButtonContainer {
+	border: 1px solid @arrowbutton-inner-border-color;
 }
 
 .claro .dijitSelect .dijitArrowButton {
 	padding: 0;
-	border: 1px solid @arrowbutton-inner-border-color;
-	border-top:none;
 	background-color: @arrowbutton-background-color;
-	background-image: url("../@{image-form-highlight}");
-	background-repeat:repeat-x;
+	.standard-gradient("../");
 }
 
 .claro .dijitSelect .dijitArrowButton .dijitArrowButtonInner {
-	background-image: url("../@{image-form-common-arrows}");
-	background-position:-35px 70%;
-	background-repeat: no-repeat;
-	width:16px;
 	height:16px;
 }
 
 /* hover status */
 .claro .dijitSelectHover {
-	border: 1px solid @hovered-border-color;
 	background-color: @textbox-hovered-background-color;
-	background-image: url("../@{image-form-textbox-background}");
+	.textbox-background-image;
 	background-repeat: repeat-x;
 }
 
-.claro .dijitSelectHover .dijitButtonContents {
+.claro .dijitSelectFocused,
+.claro .dijitSelectHover {
 	border-color:@hovered-border-color;
 }
 
 .claro .dijitSelectHover .dijitArrowButton {
 	background-color:@arrowbutton-hovered-background-color;
 }
+
 .claro .dijitSelectHover .dijitArrowButton .dijitArrowButtonInner {
-	background-position:-70px 70%;
+	background-position:-70px 53%;
 }
 
 /* focused status */
-.claro .dijitSelectFocused {
-	border: 1px solid @focused-border-color;
-}
-.claro .dijitSelectFocused .dijitButtonContents {
-	border-color:@focused-border-color;
-}
 .claro .dijitSelectFocused .dijitArrowButton {
 	background-color:#7dbefa;		// TODO.  Mailed Jason about inconsistent ComboBox/Spinner behavior.
-	background-position:0 -177px;
+	.active-gradient("../");
+}
+
+.claro .dijitSelectFocused .dijitArrowButton {
 	border: none;
-	padding: 0 1px;
+	padding: 1px;
 }
+
 .claro .dijitSelectFocused .dijitArrowButton .dijitArrowButtonInner {
-	background-position:-70px 70%;
-	margin-bottom: 1px;
+	background-position:-70px 53%;
 }
 
 /* disable status */
 .claro .dijitSelectDisabled {
-	border: 1px solid @disabled-border-color;
+	border-color: @disabled-border-color;
 	background-color: @disabled-background-color;
 	background-image: none;
 	color: @disabled-text-color;
 }
-.claro .dijitSelectDisabled .dijitArrowButton { 
-	background-color: @disabled-background-color;
-}
+
 .claro .dijitSelectDisabled .dijitArrowButton .dijitArrowButtonInner {
-	background-position:0 70%
+	background-position:0 53%
 }
 
 /* Dropdown menu style for select */
-
 .claro .dijitSelectMenu td.dijitMenuItemIconCell,
 .claro .dijitSelectMenu td.dijitMenuArrowCell { 
 	/* so that arrow and icon cells from MenuItem are not displayed */
 	display: none;  
 }
+
 .claro .dijitSelectMenu td.dijitMenuItemLabel {
 	/* line up menu text with text in select box (in LTR and RTL modes) */
 	padding: @textbox-padding;