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/soria/form/Button.css | 6 ++-- lib/dijit/themes/soria/form/Button_rtl.css | 6 +--- lib/dijit/themes/soria/form/Common.css | 18 +++++++--- lib/dijit/themes/soria/form/Select.css | 55 +++++++++++++---------------- lib/dijit/themes/soria/form/TimeTextBox.css | 2 +- 5 files changed, 43 insertions(+), 44 deletions(-) (limited to 'lib/dijit/themes/soria/form') diff --git a/lib/dijit/themes/soria/form/Button.css b/lib/dijit/themes/soria/form/Button.css index 9efe7ead8..e00c48f58 100644 --- a/lib/dijit/themes/soria/form/Button.css +++ b/lib/dijit/themes/soria/form/Button.css @@ -14,14 +14,14 @@ padding: 0.1em 0.2em 0.2em 0.2em; background: #bcd5f0 url("../images/buttonEnabled.png") repeat-x top left; } -.soria .dijitSelect .dijitButtonContents { - border-right: none; -} .soria .dijitButtonText { text-align: center; padding: 0 0.3em; } +.soria .dijitInputField { + padding: 0; /* set padding:0 for .soria .dijitSelect .dijitButtonText but with a low priority rule that can be easily trumped by the user */ +} .soria .dijitArrowButton { color: #111; diff --git a/lib/dijit/themes/soria/form/Button_rtl.css b/lib/dijit/themes/soria/form/Button_rtl.css index e2f3728f3..cf47470a9 100644 --- a/lib/dijit/themes/soria/form/Button_rtl.css +++ b/lib/dijit/themes/soria/form/Button_rtl.css @@ -1,7 +1,3 @@ -.dijitRtl .soria .dijitComboBox .dijitButtonNode { +.soria .dijitComboBoxRtl .dijitButtonNode { border-width: 0 0 0 1px; } -.dijitRtl .soria .dijitSelect .dijitButtonContents { - border-left: none; - border-right-width: 1px; -} diff --git a/lib/dijit/themes/soria/form/Common.css b/lib/dijit/themes/soria/form/Common.css index 42dfefa2e..d6ea6e275 100644 --- a/lib/dijit/themes/soria/form/Common.css +++ b/lib/dijit/themes/soria/form/Common.css @@ -10,11 +10,12 @@ dijit.form.ComboBox (partial) ****/ -.soria .dijitInputContainer input, -.soria .dijitTextBox { +.soria .dijitInputContainer input { margin: 0 0.1em; } +.soria .dijitSelect .dijitButtonContents, +.soria .dijitSelect, .soria .dijitTextBox, .soria .dijitTextArea { /* For all except dijit.form.NumberSpinner: the actual input element. @@ -23,26 +24,35 @@ */ background:#fff url("../images/validationInputBg.png") repeat-x top left; #background:#fff url('../images/validationInputBg.gif') repeat-x top left; +} +.soria .dijitSelect, +.soria .dijitTextBox, +.soria .dijitTextArea { border:1px solid #8ba0bd; } +.soria .dijitSelect .dijitArrowButton, .soria .dijitComboBox .dijitButtonNode { padding: 0 0.2em; } + +.soria .dijitSelect .dijitButtonContents, .soria .dijitTextBox .dijitButtonNode { /* line between the input area and the drop down button */ border-color: #8ba0bd; } +.soria .dijitSelectFocused, .soria .dijitTextBoxFocused, .soria .dijitTextAreaFocused { /* input field when focused (ie: typing affects it) */ border-color:#406b9b; } +.soria .dijitSelectFocused TD, .soria .dijitTextBoxFocused .dijitButtonNode, .soria .dijitSpinner .dijitUpArrowButtonActive, .soria .dijitSpinner .dijitDownArrowButtonActive { - border-left-color:#8ba0bd; + border-color:#8ba0bd; } .soria .dijitSpinnerFocused .dijitDownArrowButton, .soria .dijitSpinner .dijitUpArrowButtonActive, @@ -62,7 +72,7 @@ } /* Validation errors */ -.soria .dijitValidationIcon { +.soria .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/soria/form/Select.css b/lib/dijit/themes/soria/form/Select.css index 18567720e..895ab7eaa 100644 --- a/lib/dijit/themes/soria/form/Select.css +++ b/lib/dijit/themes/soria/form/Select.css @@ -1,46 +1,40 @@ -.soria .dijitSelect .dijitButtonNode { - padding: 0; -} - /* Make unselected "look" more like a text box and less like a button */ -.soria .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; -} -.soria .dijitSelectHover .dijitButtonContents, -.soria .dijitSelectActive .dijitButtonContents, -.soria .dijitSelectOpened .dijitButtonContents, -.soria .dijitSelectDisabled .dijitButtonContents, -.soria .dijitSelectReadOnly .dijitButtonContents{ +.soria .dijitSelectError .dijitButtonContents, +.soria .dijitSelectHover .dijitArrowButton, +.soria .dijitSelectActive .dijitArrowButton, +.soria .dijitSelectOpened .dijitArrowButton, +.soria .dijitSelectDisabled .dijitArrowButton, +.soria .dijitSelectReadOnly .dijitArrowButton { background: transparent none; } -.dj_ie .soria .dijitSelect .dijitButtonContents { - padding-top: 0; -} - .soria .dijitSelect .dijitArrowButton { - padding: 0 2px; + background: #bcd5f0 url("../images/buttonEnabled.png") repeat-x top left; + border-width: 0; } /* Mirror DropDownButton */ -.soria .dijitSelectDisabled .dijitButtonNode { - border-color: #b9bbdd #b9bbdd #b9bbdd #b9bbdd; - background:#c3d3e5 url("../images/buttonDisabled.png") top repeat-x; +.soria .dijitSelectDisabled, +.soria .dijitSelectDisabled TD { + border-color: #b9bbdd !important; + background:#c3d3e5 url("../images/buttonDisabled.png") top repeat-x; } -.dj_ie .soria .dijitSelectDisabled .dijitButtonNode * { +.dj_ie .soria .dijitSelectDisabled TD * { filter: gray() alpha(opacity=50); } -.soria .dijitSelectHover .dijitButtonNode { - color:#000; - background:#acc5e2 url("../images/buttonHover.png") repeat-x top left; +.soria .dijitSelectHover, +.soria .dijitSelectHover TD { + border-color:#a5beda #5c7590 #5c7590 #a5beda !important; + color:#000; + background:#acc5e2 url("../images/buttonHover.png") repeat-x top left; } -.soria .dijitSelectActive .dijitButtonNode, -.soria .dijitSelectOpened .dijitButtonNode { - border-color:#657c9c; - background: #91b4e5 url("../images/buttonActive.png") top left repeat-x; +.soria .dijitSelectActive, +.soria .dijitSelectOpened, +.soria .dijitSelectActive TD, +.soria .dijitSelectOpened TD { + border-color:#657c9c !important; + background: #91b4e5 url("../images/buttonActive.png") top left repeat-x; } /* Make the menu look more combobox-like */ @@ -51,4 +45,3 @@ .soria .dijitSelectMenu .dijitMenuArrowCell { padding: 0.1em 0.2em; } - diff --git a/lib/dijit/themes/soria/form/TimeTextBox.css b/lib/dijit/themes/soria/form/TimeTextBox.css index bf67b66d0..d450925b4 100644 --- a/lib/dijit/themes/soria/form/TimeTextBox.css +++ b/lib/dijit/themes/soria/form/TimeTextBox.css @@ -1 +1 @@ -@CHARSET "UTF-8"; \ No newline at end of file +@CHARSET "UTF-8"; -- cgit v1.2.3