diff options
author | Richard Beales <[email protected]> | 2013-03-18 07:32:01 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-18 07:32:01 +0000 |
commit | 7c97d17aaf373339a8bcd917ad59ca6018148f0d (patch) | |
tree | 5a3c04f0f9529be392c1263d3feb75806eb43797 /lib/dijit/themes/nihilo/form | |
parent | 70db7424e7068701e60cc5bcdfe8f858be508179 (diff) | |
parent | c670a80ddd9b03bd4ea6d940a9ed682fd26248d7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'lib/dijit/themes/nihilo/form')
-rw-r--r-- | lib/dijit/themes/nihilo/form/Button.css | 7 | ||||
-rw-r--r-- | lib/dijit/themes/nihilo/form/Button_rtl.css | 6 | ||||
-rw-r--r-- | lib/dijit/themes/nihilo/form/Common.css | 19 | ||||
-rw-r--r-- | lib/dijit/themes/nihilo/form/Select.css | 46 | ||||
-rw-r--r-- | lib/dijit/themes/nihilo/form/TimeTextBox.css | 2 |
5 files changed, 38 insertions, 42 deletions
diff --git a/lib/dijit/themes/nihilo/form/Button.css b/lib/dijit/themes/nihilo/form/Button.css index 90e1ee2cc..83c719b25 100644 --- a/lib/dijit/themes/nihilo/form/Button.css +++ b/lib/dijit/themes/nihilo/form/Button.css @@ -16,14 +16,13 @@ background: #fff url("../images/buttonEnabled.png") repeat-x top left; } -.nihilo .dijitSelect .dijitButtonContents { - border-right: none; -} - .nihilo .dijitButtonText { text-align: center; padding: 0 0.3em; } +.nihilo .dijitInputField { + padding: 0; /* set padding:0 for .nihilo .dijitSelect .dijitButtonText but with a low priority rule that can be easily trumped by the user */ +} .nihilo .dijitComboBox .dijitButtonNode { border-width: 0 0 0 1px; diff --git a/lib/dijit/themes/nihilo/form/Button_rtl.css b/lib/dijit/themes/nihilo/form/Button_rtl.css index 60d4c4da4..07886d058 100644 --- a/lib/dijit/themes/nihilo/form/Button_rtl.css +++ b/lib/dijit/themes/nihilo/form/Button_rtl.css @@ -1,8 +1,4 @@ -.dijitRtl .nihilo .dijitComboBox .dijitButtonNode { +.nihilo .dijitComboBoxRtl .dijitButtonNode { border-width: 0 0 0 1px; } -.dijitRtl .nihilo .dijitSelect .dijitButtonContents { - border-left: none; - border-right-width: 1px; -} diff --git a/lib/dijit/themes/nihilo/form/Common.css b/lib/dijit/themes/nihilo/form/Common.css index b67195f4b..31bf95ee3 100644 --- a/lib/dijit/themes/nihilo/form/Common.css +++ b/lib/dijit/themes/nihilo/form/Common.css @@ -10,11 +10,12 @@ dijit.form.ComboBox (partial) ****/ -.nihilo .dijitInputContainer input, -.nihilo .dijitTextBox { +.nihilo .dijitInputContainer input { margin: 0 0.1em; } +.nihilo .dijitSelect .dijitButtonContents, +.nihilo .dijitSelect, .nihilo .dijitTextBox, .nihilo .dijitTextArea { /* For all except dijit.form.NumberSpinner: the actual input element. @@ -23,26 +24,34 @@ */ background:#fff url("../images/validationInputBg.png") repeat-x top left; #background:#fff url('../images/validationInputBg.gif') repeat-x top left; +} +.nihilo .dijitSelect, +.nihilo .dijitTextBox, +.nihilo .dijitTextArea { border:1px solid #d3d3d3; } +.nihilo .dijitSelect .dijitArrowButton, .nihilo .dijitComboBox .dijitButtonNode { - padding: 0 0.2em !important; + padding: 0 0.2em; } +.nihilo .dijitSelect .dijitButtonContents, .nihilo .dijitTextBox .dijitButtonNode { /* line between the input area and the drop down button */ border-color: #d3d3d3; } +.nihilo .dijitSelectFocused, .nihilo .dijitTextBoxFocused, .nihilo .dijitTextAreaFocused { /* input field when focused (ie: typing affects it) */ border-color:#b3b3b3; } +.nihilo .dijitSelectFocused TD, .nihilo .dijitTextBoxFocused .dijitButtonNode, .nihilo .dijitSpinner .dijitUpArrowButtonActive, .nihilo .dijitSpinner .dijitDownArrowButtonActive { - border-left-color:#d3d3d3; + border-color:#d3d3d3; } .nihilo .dijitSpinnerFocused .dijitDownArrowButton, .nihilo .dijitSpinner .dijitUpArrowButtonActive, @@ -62,7 +71,7 @@ } /* Validation errors */ -.nihilo .dijitValidationIcon { +.nihilo .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/nihilo/form/Select.css b/lib/dijit/themes/nihilo/form/Select.css index 61967e550..6e6a9c442 100644 --- a/lib/dijit/themes/nihilo/form/Select.css +++ b/lib/dijit/themes/nihilo/form/Select.css @@ -1,45 +1,38 @@ -.nihilo .dijitSelect .dijitButtonNode { - padding: 0; -} - -/* Make unselected "look" more like a text box and less like a button */ -.nihilo .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; -} -.nihilo .dijitSelectHover .dijitButtonContents, -.nihilo .dijitSelectActive .dijitButtonContents, -.nihilo .dijitSelectOpened .dijitButtonContents, -.nihilo .dijitSelectDisabled .dijitButtonContents, -.nihilo .dijitSelectReadOnly .dijitButtonContents{ +.nihilo .dijitSelectError .dijitButtonContents, +.nihilo .dijitSelectHover .dijitArrowButton, +.nihilo .dijitSelectActive .dijitArrowButton, +.nihilo .dijitSelectOpened .dijitArrowButton, +.nihilo .dijitSelectDisabled .dijitArrowButton, +.nihilo .dijitSelectReadOnly .dijitArrowButton { background: transparent none; } -.dj_ie .nihilo .dijitSelect .dijitButtonContents { - padding-top: 0; -} .nihilo .dijitSelect .dijitArrowButton { - padding: 0 2px; + background: #bcd5f0 url("../images/buttonEnabled.png") repeat-x top left; + border-width: 0; } /* Mirror DropDownButton */ -.nihilo .dijitSelectDisabled .dijitButtonNode { - border-color: #dedede; +.nihilo .dijitSelectDisabled, +.nihilo .dijitSelectDisabled TD { + border-color: #dedede !important; background:#fafafa url("../images/buttonDisabled.png") top repeat-x; } -.dj_ie .nihilo .dijitSelectDisabled .dijitButtonNode * { +.dj_ie .nihilo .dijitSelectDisabled TD * { filter: gray() alpha(opacity=50); } -.nihilo .dijitSelectHover .dijitButtonNode { +.nihilo .dijitSelectHover, +.nihilo .dijitSelectHover TD { color:#000; background:#fcfcfc url("../images/buttonHover.png") repeat-x top left; } -.nihilo .dijitSelectActive .dijitButtonNode, -.nihilo .dijitSelectOpened .dijitButtonNode { - border-color:#dedede; +.nihilo .dijitSelectActive, +.nihilo .dijitSelectOpened, +.nihilo .dijitSelectActive TD, +.nihilo .dijitSelectOpened TD { + border-color:#dedede !important; background: #f5f5f5 url("../images/buttonActive.png") top left repeat-x; } @@ -51,4 +44,3 @@ .nihilo .dijitSelectMenu .dijitMenuArrowCell { padding: 0.1em 0.2em; } - diff --git a/lib/dijit/themes/nihilo/form/TimeTextBox.css b/lib/dijit/themes/nihilo/form/TimeTextBox.css index bf67b66d0..d450925b4 100644 --- a/lib/dijit/themes/nihilo/form/TimeTextBox.css +++ b/lib/dijit/themes/nihilo/form/TimeTextBox.css @@ -1 +1 @@ -@CHARSET "UTF-8";
\ No newline at end of file +@CHARSET "UTF-8"; |