Merge remote-tracking branch 'upstream/master'

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/dijit/themes/tundra/form/Common.css b/lib/dijit/themes/tundra/form/Common.css
index 96899e138..2122184da 100644
--- a/lib/dijit/themes/tundra/form/Common.css
+++ b/lib/dijit/themes/tundra/form/Common.css
@@ -10,8 +10,7 @@
 		dijit.form.ComboBox (partial)
  ****/
 
-.tundra .dijitInputContainer input,
-.tundra .dijitTextBox {
+.tundra .dijitInputContainer input {
 	margin: 0 0.1em;
 }
 
@@ -19,6 +18,8 @@
 	padding: 3px;
 }
 
+.tundra .dijitSelect .dijitButtonContents,
+.tundra .dijitSelect,
 .tundra .dijitTextBox {
 	/* 	For all except dijit.form.NumberSpinner:  the actual input element.
 		For TextBox, ComboBox, Spinner: the div that contains the input.
@@ -26,13 +27,17 @@
 	*/
 	background:#fff url("../images/validationInputBg.png") repeat-x top left;
 	#background:#fff url('../images/validationInputBg.gif') repeat-x top left;
+}
+.tundra .dijitSelect,
+.tundra .dijitTextBox {
 	border:1px solid #b3b3b3;
 }
 
-/* ComboBox specific rules*/
+.tundra .dijitSelect .dijitArrowButton,
 .tundra .dijitComboBox .dijitButtonNode {
 	padding: 0 0.2em;
 }
+.tundra .dijitSelect .dijitButtonContents,
 .tundra .dijitTextBox .dijitButtonNode {
 	/* line between the input area and the drop down button, and also between
 	 * the up and down buttons of a spinner
@@ -40,10 +45,12 @@
 	border-color: #9b9b9b;
 }
 
+.tundra .dijitSelectFocused,
 .tundra .dijitTextBoxFocused {
 	/* input field when focused (ie: typing affects it) */
 	border-color:#406b9b;
 }
+.tundra .dijitSelectFocused TD,
 .tundra .dijitTextBoxFocused .dijitButtonNode {
 	border-color:#366dba;
 }
@@ -59,7 +66,7 @@
 }
 
 /* Validation errors  */
-.tundra .dijitValidationIcon {
+.tundra .dijitValidationTextBoxError .dijitValidationIcon {
 	/* prevent height change when widget goes from valid to invalid state */
 	width: 16px;
 	background: transparent url('../images/warning.png') no-repeat center center;