1 files changed, 24 insertions, 6 deletions

diff --git a/lib/dijit/themes/claro/form/Common.less b/lib/dijit/themes/claro/form/Common.less
index 729867a67..742a43ff7 100644
--- a/lib/dijit/themes/claro/form/Common.less
+++ b/lib/dijit/themes/claro/form/Common.less
@@ -6,9 +6,16 @@
 
 /* 'dijitTextBox' refers to 'dijit(TextBox|DateTextBox|CurrencyTextBox|...)' */
 
+.claro .dijitTextBox,
+.claro .dijitInputInner {
+    // .dijitInputInner selector needed for ValidationTextBox on IE6 because <input> doesn't inherit
+    // the color setting from the ancestor div.dijitTextBox
+	color: @text-color;
+}
+
 .claro .dijitTextBoxError .dijitValidationContainer {
 	background-color: @erroricon-background-color;
-	background-image: url('images/error.png');
+	background-image: url("../@{image-form-error}");
 	background-position: top center;
 	border: solid @erroricon-background-color 0;
 	border-left-width: 1px;
@@ -60,7 +67,7 @@
 }
 .claro .dijitTextBoxHover {
 	background-color: @textbox-hovered-background-color;
-	background-image: url('images/textBox_back.png');
+	background-image: url("../@{image-form-textbox-background}");
 	background-repeat: repeat-x;
 }
 
@@ -82,7 +89,7 @@
 }
 .claro .dijitTextBoxFocused {
 	background-color: @textbox-focused-background-color;
-	background-image: url('images/textBox_back.png');
+	background-image: url("../@{image-form-textbox-background}");
 	background-repeat: repeat-x;
 }
 .claro .dijitTextBoxFocused .dijitInputContainer {
@@ -103,15 +110,26 @@
 .claro .dijitTextBoxDisabled .dijitInputContainer {
 	background-color: @textbox-disabled-background-color;
 	background-image: none;
+}
+.claro .dijitTextBoxDisabled,
+.claro .dijitTextBoxDisabled .dijitInputInner {
 	color: @disabled-text-color;
 }
+.dj_webkit .claro .dijitTextBoxDisabled input {
+    /* because WebKit lightens disabled input/textarea no matter what color you specify */
+	color: darken(@disabled-text-color, 5%)
+}
+.dj_webkit .claro textarea.dijitTextAreaDisabled {
+    /* because WebKit lightens disabled input/textarea no matter what color you specify */
+	color: darken(@disabled-text-color, 40%)
+}
 
 /*========================= for special widgets =========================*/
 
 /* Input boxes with an arrow (for a drop down) */
 
 .claro .dijitComboBox .dijitArrowButtonInner {
-	background-image: url("images/commonFormArrows.png");
+	background-image: url("../@{image-form-common-arrows}");
 	background-position:-35px 53%;
 	background-repeat: no-repeat;
 	margin: 0;
@@ -136,7 +154,7 @@
 
 .claro .dijitComboBox .dijitButtonNode {
 	background-color: @arrowbutton-background-color;
-	background-image: url("images/formHighlight.png");
+	background-image: url("../@{image-form-highlight}");
 	background-repeat:repeat-x;
 }
 
@@ -191,4 +209,4 @@
 }
 .dj_borderbox .claro .dijitComboBoxFocused .dijitHasDropDownOpen .dijitArrowButtonInner {
 	width:16px;				// when no border, then back to 16px just like content-box sizing
-}
\ No newline at end of file
+}