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/Common.css | 18 ++++--- lib/dijit/themes/tundra/form/Button.css | 8 ++-- lib/dijit/themes/tundra/form/Common.css | 15 ++++-- lib/dijit/themes/tundra/form/Select.css | 52 +++++++++------------ lib/dijit/themes/tundra/images/dndNoCopy.png | Bin 699 -> 1332 bytes lib/dijit/themes/tundra/images/dndNoMove.png | Bin 677 -> 991 bytes lib/dijit/themes/tundra/layout/TabContainer.css | 42 ++++++----------- .../themes/tundra/layout/TabContainer_rtl.css | 48 ------------------- 8 files changed, 58 insertions(+), 125 deletions(-) (limited to 'lib/dijit/themes/tundra') diff --git a/lib/dijit/themes/tundra/Common.css b/lib/dijit/themes/tundra/Common.css index eb3e341f7..82a133bec 100644 --- a/lib/dijit/themes/tundra/Common.css +++ b/lib/dijit/themes/tundra/Common.css @@ -1,16 +1,14 @@ -/* DnD avatar-specific settings */ -/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */ -.tundra .dojoDndItemBefore { - border-top: 2px solid #369; +/* DnD hovered and selected node(s) */ +.tundra .dojoDndItemOver { + background-image: url(images/treeHover.png); } - -.tundra .dojoDndItemAfter { - border-bottom: 2px solid #369; +.tundra .dojoDndItemAnchor, +.tundra .dojoDndItemSelected { + background-color: #E2EBFE; } -.tundra .dojoDndItemOver { - cursor:pointer; -} +/* DnD avatar-specific settings */ +/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */ .tundra table.dojoDndAvatar { -moz-border-radius: 0; border: 1px solid #ccc; border-collapse: collapse; background-color: #fff; font-size: 75%; color: black;} .tundra .dojoDndAvatar td { border: none; } 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; } - - diff --git a/lib/dijit/themes/tundra/images/dndNoCopy.png b/lib/dijit/themes/tundra/images/dndNoCopy.png index 9bf9c3396..998c2f269 100644 Binary files a/lib/dijit/themes/tundra/images/dndNoCopy.png and b/lib/dijit/themes/tundra/images/dndNoCopy.png differ diff --git a/lib/dijit/themes/tundra/images/dndNoMove.png b/lib/dijit/themes/tundra/images/dndNoMove.png index cb8bd8bdd..e909173e0 100644 Binary files a/lib/dijit/themes/tundra/images/dndNoMove.png and b/lib/dijit/themes/tundra/images/dndNoMove.png differ diff --git a/lib/dijit/themes/tundra/layout/TabContainer.css b/lib/dijit/themes/tundra/layout/TabContainer.css index 667da4ad9..a6676c673 100644 --- a/lib/dijit/themes/tundra/layout/TabContainer.css +++ b/lib/dijit/themes/tundra/layout/TabContainer.css @@ -9,15 +9,11 @@ .tundra .dijitTab { line-height:normal; margin-right:4px; /* space between one tab and the next in top/bottom mode */ - padding:0; + padding:2px 8px 2px 9px; border:1px solid #ccc; background:#e2e2e2 url("../images/tabEnabled.png") repeat-x; } -.tundra .dijitTabInnerDiv { - padding:2px 8px 2px 9px; -} - .tundra .dijitTabSpacer { display: none; } @@ -37,7 +33,7 @@ bottom: 2px; } -/* checked tab*/ +/* selected tab */ .tundra .dijitTabChecked { /* the selected tab (with or without hover) */ background-color:#fff; @@ -98,12 +94,11 @@ border: none; top: 0; /* to override top: 1px/-1px for normal tabs */ } -.tundra .dijitTabContainerTabListNested .dijitTab .dijitTabContent { -} -.tundra .dijitTabContainerTabListNested .dijitTabHover .dijitTabContent .tabLabel { + +.tundra .dijitTabContainerTabListNested .dijitTabHover .tabLabel { text-decoration: underline; } -.tundra .dijitTabContainerTabListNested .dijitTabChecked .dijitTabContent .tabLabel { +.tundra .dijitTabContainerTabListNested .dijitTabChecked .tabLabel { text-decoration: underline; font-weight: bold; /*background:#f3f3f3;*/ @@ -149,7 +144,7 @@ border-top: none; } -/* checked tabs */ +/* selected tab */ .tundra .dijitTabContainerTop-tabs .dijitTabChecked { border-bottom-color:white; } @@ -192,7 +187,7 @@ border-bottom: none; } -/* checked tabs */ +/* selected tab */ .tundra .dijitTabContainerBottom-tabs .dijitTabChecked { border-top-color:white; } @@ -222,7 +217,7 @@ border-right: none; } -/* checked tabs */ +/* selected tab */ .tundra .dijitTabContainerRight-tabs .dijitTabChecked { border-left-color:white; } @@ -245,12 +240,12 @@ height: 100%; } -/* left conatiner */ +/* left container */ .tundra .dijitTabContainerLeft-container { border-left: none; } -/* checked tabs */ +/* selected tab */ .tundra .dijitTabContainerLeft-tabs .dijitTabChecked { border-right-color:white; } @@ -292,29 +287,18 @@ } .tundra .dijitTabContainerBottom .tabStripButton { - padding-top: 2px; + padding-top: 3px; } -.tundra .tabStrip-disabled .tabStripButton .dijitTabInnerDiv { +.tundra .tabStrip-disabled .tabStripButton { padding-bottom: 3px; padding-top: 1px; } -.tundra .tabStripButton .dijitTabInnerDiv { +.tundra .tabStripButton { padding: 3px 2px 4px 2px; } -.dj_ie6 .tundra .tabStripButton .dijitTabInnerDiv, -.dj_ie7 .tundra .tabStripButton .dijitTabInnerDiv, -.dj_opera .tundra .tabStripButton .dijitTabInnerDiv { - padding-bottom: 5px; -} -.dj_ie6 .tundra .tabStrip-disabled .tabStripButton .dijitTabInnerDiv, -.dj_ie7 .tundra .tabStrip-disabled .tabStripButton .dijitTabInnerDiv, -.dj_opera .tundra .tabStrip-disabled .tabStripButton .dijitTabInnerDiv { - padding-bottom: 4px; -} - .tundra .dijitTabStripIcon { height: 14px; width: 14px; diff --git a/lib/dijit/themes/tundra/layout/TabContainer_rtl.css b/lib/dijit/themes/tundra/layout/TabContainer_rtl.css index fb8e28e9b..6e5ba7580 100644 --- a/lib/dijit/themes/tundra/layout/TabContainer_rtl.css +++ b/lib/dijit/themes/tundra/layout/TabContainer_rtl.css @@ -1,51 +1,3 @@ .tundra .dijitTabRtl { - -moz-box-orient:horizontal; - text-align: right; -} - -.tundra .dijitTabRtl .dijitTabInnerDiv { padding:2px 9px 2px 8px; } - -.tundra .tabStrip-disabled .tabStripButtonRtl .dijitTabInnerDiv { - /* this is not special for RTL mode, but just here to override rule above (for enabled tabstrip) */ - padding-bottom: 3px; - padding-top: 1px; -} - -.tundra .tabStripButtonRtl .dijitTabInnerDiv { - padding: 3px 2px 4px 2px; -} - -.tundra .dijitTabPaneWrapper { - #zoom: 1; -} - -.dj_ie-rtl .tundra .dijitTabContainerLeft-tabs { - margin-left: 1px !important; -} - -.dj_ie-rtl .tundra .dijitTabContainerRight-tabs { - margin-right: 1px !important; -} - -.tundra .dijitTabContainerLeft-tabs .dijitTabRtl, -.tundra .dijitTabContainerRight-tabs .dijitTabRtl { - margin-left:0; -} - -.dj_ie .tundra .dijitTabRtl .dijitTabInnerDiv { - /* without this the tab label and icon become invisible, as though they were set to visibility:hidden */ - width : 0.1% !important; -} - - - -.dj_iequirks-rtl .tundra .dijitTabContainerTopNone, -.dj_iequirks-rtl .tundra .dijitTabContainerBottomNone { - /* this strange rule prevents IE6 bug in themeTesterQuirk.html?dir=rtl upon closing - * "Closable" tab, where the other tabs disappear - */ - border-left: 1px solid #fff; - border-right: 1px solid #fff; -} -- cgit v1.2.3