From f0cfe83e3725f9a3928da97a6e3085e79cb25309 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 18 Mar 2013 10:26:24 +0400 Subject: upgrade dojo to 1.8.3 (refs #570) --- lib/dijit/themes/tundra/form/Button.css | 8 +++-- lib/dijit/themes/tundra/form/Common.css | 15 +++++++--- lib/dijit/themes/tundra/form/Select.css | 52 +++++++++++++-------------------- 3 files changed, 37 insertions(+), 38 deletions(-) (limited to 'lib/dijit/themes/tundra/form') diff --git a/lib/dijit/themes/tundra/form/Button.css b/lib/dijit/themes/tundra/form/Button.css index 2c68aef04..d274745e9 100644 --- a/lib/dijit/themes/tundra/form/Button.css +++ b/lib/dijit/themes/tundra/form/Button.css @@ -18,6 +18,9 @@ text-align: center; padding: 0 0.3em; } +.tundra .dijitInputField { + padding: 0; /* set padding:0 for .tundra .dijitSelect .dijitButtonText but with a low priority rule that can be easily trumped by the user */ +} .tundra .dijitDisabled .dijitButtonText { color: #7F7F7F; @@ -112,12 +115,11 @@ .tundra .dijitDisabled .dijitUpArrowButton .dijitArrowButtonInner { background-position: -49px center; } -.dj_webkit .tundra .dijitSpinner .dijitUpArrowButton .dijitArrowButtonInner { - margin-top: -1px; /* image has too many blank pixels on top */ -} .dj_ie .tundra .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner { margin-top: -2px; /* image has too many blank pixels on top */ } +.dj_webkit .tundra .dijitSpinner .dijitUpArrowButton .dijitArrowButtonInner, +.dj_iequirks .tundra .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner, .dj_ie8 .tundra .dijitSpinner .dijitDownArrowButton .dijitArrowButtonInner { margin-top: -1px; /* image has too many blank pixels on top */ } 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; diff --git a/lib/dijit/themes/tundra/form/Select.css b/lib/dijit/themes/tundra/form/Select.css index b0290167a..3e0e77e0a 100644 --- a/lib/dijit/themes/tundra/form/Select.css +++ b/lib/dijit/themes/tundra/form/Select.css @@ -1,47 +1,39 @@ -.tundra .dijitSelect .dijitButtonNode { - padding: 0; -} -.tundra .dijitSelect .dijitButtonNode .dijitArrowButtonInner { - margin: 0 4px 0 5px; -} - /* Make unselected content portion "look" more like a text box and less like a button */ -.tundra .dijitSelect .dijitButtonContents { - padding-top: 1px; - background:#fff url("../images/validationInputBg.png") repeat-x top left; - #background:#fff url('../images/validationInputBg.gif') repeat-x top left; -} -.tundra .dijitSelectHover .dijitButtonContents, -.tundra .dijitSelectActive .dijitButtonContents, -.tundra .dijitSelectOpened .dijitButtonContents, -.tundra .dijitSelectDisabled .dijitButtonContents, -.tundra .dijitSelectReadOnly .dijitButtonContents{ +.tundra .dijitSelectError .dijitButtonContents, +.tundra .dijitSelectHover .dijitArrowButton, +.tundra .dijitSelectActive .dijitArrowButton, +.tundra .dijitSelectOpened .dijitArrowButton, +.tundra .dijitSelectDisabled .dijitArrowButton, +.tundra .dijitSelectReadOnly .dijitArrowButton { background: transparent none; } -.dj_ie .tundra .dijitSelect .dijitButtonContents { - padding-top: 0; +.tundra .dijitSelect .dijitArrowButton { + background: #fff url("../images/buttonEnabled.png") repeat-x bottom left; + border-width: 0; } /* Mirror DropDownButton */ -.tundra .dijitSelectDisabled .dijitButtonNode { - border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5; +.tundra .dijitSelectDisabled, +.tundra .dijitSelectDisabled TD { + border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5 !important; background:#e4e4e4 url("../images/buttonDisabled.png") top repeat-x; } -.dj_ie .tundra .dijitSelectDisabled .dijitButtonNode * { +.dj_ie .tundra .dijitSelectDisabled TD * { filter: gray() alpha(opacity=50); } -.tundra .dijitSelectHover .dijitButtonNode { - border-color:#a5beda; - border-bottom-color:#5c7590; - border-right-color:#5c7590; +.tundra .dijitSelectHover, +.tundra .dijitSelectHover TD { + border-color:#a5beda #5c7590 #5c7590 #a5beda !important; color:#243C5F; background:#fcfdff url("../images/buttonHover.png") repeat-x bottom; } -.tundra .dijitSelectActive .dijitButtonNode, -.tundra .dijitSelectOpened .dijitButtonNode { - border-color:#366dba; +.tundra .dijitSelectActive, +.tundra .dijitSelectOpened, +.tundra .dijitSelectActive TD, +.tundra .dijitSelectOpened TD { + border-color:#366dba !important; background: #ededed url("../images/buttonActive.png") bottom repeat-x; } @@ -53,5 +45,3 @@ .tundra .dijitSelectMenu .dijitMenuArrowCell { padding: 0.1em 0.2em; } - - -- cgit v1.2.3