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/Common.css | 19 +- lib/dijit/themes/soria/Dialog.css | 10 +- 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 +- lib/dijit/themes/soria/images/dndNoCopy.png | Bin 699 -> 1332 bytes lib/dijit/themes/soria/images/dndNoMove.png | Bin 677 -> 991 bytes .../soria/images/tabBottomActiveSpriteLR.gif | Bin 741 -> 0 bytes .../themes/soria/images/tabBottomHoverSpriteLR.gif | Bin 569 -> 0 bytes lib/dijit/themes/soria/images/tabLeftChecked.gif | Bin 795 -> 2005 bytes lib/dijit/themes/soria/images/tabRightChecked.gif | Bin 793 -> 2003 bytes lib/dijit/themes/soria/images/tabStripe.gif | Bin 54 -> 0 bytes lib/dijit/themes/soria/images/tabStripeBottom.gif | Bin 54 -> 0 bytes lib/dijit/themes/soria/images/tabStripeLeft.gif | Bin 54 -> 0 bytes lib/dijit/themes/soria/images/tabStripeRight.gif | Bin 54 -> 0 bytes lib/dijit/themes/soria/layout/TabContainer.css | 233 +++++++-------------- 18 files changed, 125 insertions(+), 224 deletions(-) delete mode 100644 lib/dijit/themes/soria/images/tabBottomActiveSpriteLR.gif delete mode 100644 lib/dijit/themes/soria/images/tabBottomHoverSpriteLR.gif delete mode 100644 lib/dijit/themes/soria/images/tabStripe.gif delete mode 100644 lib/dijit/themes/soria/images/tabStripeBottom.gif delete mode 100644 lib/dijit/themes/soria/images/tabStripeLeft.gif delete mode 100644 lib/dijit/themes/soria/images/tabStripeRight.gif (limited to 'lib/dijit/themes/soria') diff --git a/lib/dijit/themes/soria/Common.css b/lib/dijit/themes/soria/Common.css index d5a7c9df6..93efae7ba 100644 --- a/lib/dijit/themes/soria/Common.css +++ b/lib/dijit/themes/soria/Common.css @@ -1,16 +1,15 @@ -/* DnD avatar-specific settings */ -/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */ -.soria .dojoDndItemBefore { - border-top: 2px solid #369; +/* DnD hovered and selected node(s) */ +.soria .dojoDndItemOver { + background-image: url(images/treeHover.png); } - -.soria .dojoDndItemAfter { - border-bottom: 2px solid #369; +.soria .dojoDndItemAnchor, +.soria .dojoDndItemSelected { + background-color: #B8CBEC; } -.soria .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. */ .soria table.dojoDndAvatar { -moz-border-radius: 0; border: 1px solid #ccc; border-collapse: collapse; background-color: #fff; font-size: 75%; color: black;} .soria .dojoDndAvatar td { border: none; } diff --git a/lib/dijit/themes/soria/Dialog.css b/lib/dijit/themes/soria/Dialog.css index 1e0503a0b..956df8d5e 100644 --- a/lib/dijit/themes/soria/Dialog.css +++ b/lib/dijit/themes/soria/Dialog.css @@ -67,15 +67,7 @@ } .soria .dijitTooltipContainer { - /* - The part with the text. - - NOTE: - FF doesn't clip images used as CSS bgs if you specify a border - radius. If you use a solid color, it does. Webkit gets it right. - Sigh. - background: #ffffff url("images/popupMenuBg.gif") repeat-x bottom left; - */ + /* The part with the text. */ background-color: #fff; border:1px solid #cbcbcb; padding:0.45em; 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"; diff --git a/lib/dijit/themes/soria/images/dndNoCopy.png b/lib/dijit/themes/soria/images/dndNoCopy.png index 9bf9c3396..998c2f269 100644 Binary files a/lib/dijit/themes/soria/images/dndNoCopy.png and b/lib/dijit/themes/soria/images/dndNoCopy.png differ diff --git a/lib/dijit/themes/soria/images/dndNoMove.png b/lib/dijit/themes/soria/images/dndNoMove.png index cb8bd8bdd..e909173e0 100644 Binary files a/lib/dijit/themes/soria/images/dndNoMove.png and b/lib/dijit/themes/soria/images/dndNoMove.png differ diff --git a/lib/dijit/themes/soria/images/tabBottomActiveSpriteLR.gif b/lib/dijit/themes/soria/images/tabBottomActiveSpriteLR.gif deleted file mode 100644 index 7c2ed86d2..000000000 Binary files a/lib/dijit/themes/soria/images/tabBottomActiveSpriteLR.gif and /dev/null differ diff --git a/lib/dijit/themes/soria/images/tabBottomHoverSpriteLR.gif b/lib/dijit/themes/soria/images/tabBottomHoverSpriteLR.gif deleted file mode 100644 index 59f3edd60..000000000 Binary files a/lib/dijit/themes/soria/images/tabBottomHoverSpriteLR.gif and /dev/null differ diff --git a/lib/dijit/themes/soria/images/tabLeftChecked.gif b/lib/dijit/themes/soria/images/tabLeftChecked.gif index 3e7475aa5..439aa6b44 100644 Binary files a/lib/dijit/themes/soria/images/tabLeftChecked.gif and b/lib/dijit/themes/soria/images/tabLeftChecked.gif differ diff --git a/lib/dijit/themes/soria/images/tabRightChecked.gif b/lib/dijit/themes/soria/images/tabRightChecked.gif index ec4b65936..cfffd1e70 100644 Binary files a/lib/dijit/themes/soria/images/tabRightChecked.gif and b/lib/dijit/themes/soria/images/tabRightChecked.gif differ diff --git a/lib/dijit/themes/soria/images/tabStripe.gif b/lib/dijit/themes/soria/images/tabStripe.gif deleted file mode 100644 index 51a2d40aa..000000000 Binary files a/lib/dijit/themes/soria/images/tabStripe.gif and /dev/null differ diff --git a/lib/dijit/themes/soria/images/tabStripeBottom.gif b/lib/dijit/themes/soria/images/tabStripeBottom.gif deleted file mode 100644 index 41b1ac0f6..000000000 Binary files a/lib/dijit/themes/soria/images/tabStripeBottom.gif and /dev/null differ diff --git a/lib/dijit/themes/soria/images/tabStripeLeft.gif b/lib/dijit/themes/soria/images/tabStripeLeft.gif deleted file mode 100644 index b2214fa41..000000000 Binary files a/lib/dijit/themes/soria/images/tabStripeLeft.gif and /dev/null differ diff --git a/lib/dijit/themes/soria/images/tabStripeRight.gif b/lib/dijit/themes/soria/images/tabStripeRight.gif deleted file mode 100644 index bff311553..000000000 Binary files a/lib/dijit/themes/soria/images/tabStripeRight.gif and /dev/null differ diff --git a/lib/dijit/themes/soria/layout/TabContainer.css b/lib/dijit/themes/soria/layout/TabContainer.css index b96d16955..38a1a77e1 100644 --- a/lib/dijit/themes/soria/layout/TabContainer.css +++ b/lib/dijit/themes/soria/layout/TabContainer.css @@ -1,9 +1,5 @@ /** * dijit.layout.TabContainer - * - * To style TabContainer with rounded corners - * you can use these classes: .dijitTab (left), .dijitTabContent (center), dijitTabInnerDiv (right) - * For tabs aligned to top you can style a stripe div right underneath the tabs using .dijitTabStripe */ /* Classes for all types of tabs (top/bottom/left/right) */ @@ -32,68 +28,39 @@ padding-left: 0; } -.soria .dijitTabInnerDiv { - padding:0 3px 0 0; - margin: 0 0 0 4px; - background: url("../images/tabContainerSprite.gif") no-repeat; - background-position: right -400px; -} - .soria .dijitTab { + padding:4px 6px 2px 4px; + background: url("../images/tabContainerSprite.gif") repeat-x 0 -351px; + position: relative; line-height:normal; margin:0 2px 0 0; /* space between one tab and the next in top/bottom mode */ - padding:0; - background: url("../images/tabContainerSprite.gif") no-repeat 0 -300px; color: #243C5F; + border: 1px #8BA0BD solid; border-bottom: 1px #B1BADF solid; } -.soria .dijitTabInnerDiv .dijitTabContent { - padding:4px 3px 2px 4px; - background: url("../images/tabContainerSprite.gif") repeat-x 0 -350px; - position: relative; -} - - - -.soria .dijitTabListWrapper { - z-index: 10; -} - /* hovered tab */ .soria .dijitTabHover { color: #243C5F; - background: url("../images/tabContainerSprite.gif") no-repeat 0 -150px; -} - -.soria .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -250px; + background: url("../images/tabContainerSprite.gif") repeat-x 0 -201px; } -.soria .dijitTabHover .dijitTabInnerDiv .dijitTabContent { - background: url("../images/tabContainerSprite.gif") repeat-x 0 -200px; -} - -/* checked tab*/ +/* selected tab*/ .soria .dijitTabChecked { - /* the selected tab (with or without hover) */ - background: url("../images/tabContainerSprite.gif") no-repeat 0 -0; + background: url("../images/tabContainerSprite.gif") repeat-x 0 -51px; + color: #243C5F !important; } -.soria .dijitTabChecked .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -100px; -} -.soria .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { - background: url("../images/tabContainerSprite.gif") repeat-x 0 -50px; - color: #243C5F !important; +.soria .dijitTabListWrapper { + z-index: 10; } + /* Nested Tabs */ .soria .dijitTabContainerTabListNested { - background: #F0F4FC; background: #D9E9F9; border: none; } @@ -102,11 +69,7 @@ border: none; top: 0; /* override top:1px setting of top-level tabs */ } -.soria .dijitTabContainerTabListNested .dijitTab .dijitTabInnerDiv, -.soria .dijitTabContainerTabListNested .dijitTab .dijitTabContent { - background: none; -} -.soria .dijitTabContainerTabListNested .dijitTabHover .dijitTabContent .tabLabel { +.soria .dijitTabContainerTabListNested .dijitTabHover .tabLabel { text-decoration: underline; } .soria .dijitTabContainerTabListNested .dijitTabChecked .tabLabel { @@ -146,6 +109,10 @@ border-color: #B1BADF; padding-left: 3px; } +.soria .dijitTabContainerTop-tabs .dijitTab { + border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; +} .soria .dijitTabContainerTopNoStrip { padding-top: 3px; @@ -160,12 +127,12 @@ border-bottom: none; } -/*non-checked tabs */ +/*unselected tabs */ .soria .dijitTabContainerTop-tabs .dijitTab { top: 1px; } -/* checked tabs */ +/* selected tabs */ .soria .dijitTabContainerTop-tabs .dijitTabChecked { border-bottom-color: #94b4e6; } @@ -202,59 +169,32 @@ float: left; } -/* bottom container */ -.soria .dijitTabContainerBottom-container { - border-bottom: none; -} - .soria .dijitTabContainerBottom-tabs .dijitTab { - border-bottom: none; - border-top: 1px solid #B1BADF; - background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom left; -} - -/* checked tabs */ -.soria .dijitTabContainerBottom-tabs .dijitTabChecked { - border-top-color:#94b4e6; -} - - -.soria .dijitTabContainerBottom-tabs .dijitTabInnerDiv .dijitTabContent { - padding-top: 3px; - padding-bottom: 3px; - background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left; -} - -.soria .dijitTabContainerBottom-tabs .dijitTabInnerDiv { - background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom right; + border-bottom: none; + border-top: 1px solid #B1BADF; + border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + padding-top: 3px; + padding-bottom: 3px; + background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left; } .soria .dijitTabContainerBottom-tabs .dijitTabHover { - color: #243C5F; - background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom left; -} - -.soria .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom right; -} - -.soria .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabBottomHoverC.gif") repeat-x bottom left; } -.soria .dijitTabContainerBottom-tabs .dijitTabChecked { - /* the selected tab (with or without hover) */ - background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom left; +.soria .dijitTabContainerBottom-tabs .dijitTabChecked { + border-top-color:#94b4e6; + background: url("../images/tabBottomActiveC.gif") repeat-x bottom left; } -.soria .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv { - background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom right; -} -.soria .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { - background: url("../images/tabBottomActiveC.gif") repeat-x bottom left; +/* bottom container */ +.soria .dijitTabContainerBottom-container { + border-bottom: none; } + /* strip */ .soria .dijitTabContainerBottomStrip { padding-bottom: 2px; @@ -288,51 +228,44 @@ border-color: #ccc; padding-top: 3px; } +.soria .dijitTabContainerRight-tabs .dijitTab { + border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-bottom: none; + border-left: 1px solid #B1BADF; + border-bottom: 1px solid #B1BADF !important; + padding: 4px 6px 2px 8px; +} + +.soria .dijitTabContainerRight-tabs .dijitTabChecked { + border-left-color: #94b4e6; + background: url("../images/tabRightChecked.gif") no-repeat left top !important; +} + /* right container */ .soria .dijitTabContainerRight-container { border-right: none; } -.soria .dijitTabContainerRight-tabs .dijitTab { - border-bottom: none; - border-left: 1px solid #B1BADF; - border-bottom: 1px solid #B1BADF !important; -} - -/* some odd ie bug when borders dissapear when setting a bottom margin, this sortof helps */ -.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTabInnerDiv, -.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTabInnerDiv { +/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */ +.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTab, +.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTab { border-bottom: solid #B1BADF 1px; margin-bottom: -1px; } -/* checked tabs */ -.soria .dijitTabContainerRight-tabs .dijitTabChecked { - border-left-color: #94b4e6; -} - -.soria .dijitTabContainerRight-tabs .dijitTabChecked { - background: url("../images/tabRightChecked.gif") no-repeat left top !important; -} -/* some odd ie bug when borders dissapear when setting a bottom margin, this sortof helps */ -.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTabChecked .dijitTabInnerDiv, -.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTabChecked .dijitTabInnerDiv, -.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTabCheckedHover .dijitTabInnerDiv, -.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTabCheckedHover .dijitTabInnerDiv { +/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */ +.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTabChecked, +.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTabChecked, +.dj_ie6 .soria .dijitTabContainerRight-tabs .dijitTabCheckedHover, +.dj_ie7 .soria .dijitTabContainerRight-tabs .dijitTabCheckedHover { border-bottom: solid #94b4e6 1px; margin-bottom: -1px; } -.soria .dijitTabContainerRight-tabs .dijitTab { - background: url("../images/tabContainerSprite.gif") no-repeat left -350px; -} -.soria .dijitTabContainerRight-tabs .dijitTabHover .dijitTab { - background: url("../images/tabContainerSprite.gif") no-repeat left -200px; -} - /* strip */ .soria .dijitTabContainerRightStrip { padding-right: 2px; @@ -348,43 +281,34 @@ padding-top: 3px; height: 100%; } - -/* left conatiner */ -.soria .dijitTabContainerLeft-container { - border-left: none; -} - .soria .dijitTabContainerLeft-tabs .dijitTab { - border-right: 1px solid #B1BADF; - border-bottom: 1px solid #B1BADF; + border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-right: 1px solid #B1BADF; + border-bottom: 1px solid #B1BADF; } -/* checked tabs */ .soria .dijitTabContainerLeft-tabs .dijitTabChecked { border-right: 1px solid #94b4e6; + background: url("../images/tabLeftChecked.gif") no-repeat right top; } -.soria .dijitTabContainerLeft-tabs .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -350px; -} -.soria .dijitTabContainerLeft-tabs .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -200px; -} -.soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, -.soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { - background: url("../images/tabLeftChecked.gif") no-repeat right top; +/* left container */ +.soria .dijitTabContainerLeft-container { + border-left: none; } -.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTabInnerDiv, -.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTabInnerDiv { + +.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTab, +.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTab { border-bottom: solid #B1BADF 1px; margin-bottom: -1px; } -.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, -.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, -.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv, -.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { +.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTab, +.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTab, +.dj_ie6 .soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTab, +.dj_ie7 .soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTab { border-bottom: solid #94b4e6 1px; margin-bottom: -1px; } @@ -401,8 +325,7 @@ /* left/right tabs */ .soria .dijitTabContainerLeft-tabs .dijitTab, .soria .dijitTabContainerRight-tabs .dijitTab { - margin-right:auto; - margin-bottom:2px; /* space between one tab and the next in left/right mode */ + margin: 1px 0; /* space between one tab and the next in left/right mode */ } /* left/right tabstrip */ @@ -421,7 +344,7 @@ } /* ================================ */ -/* this resets the tabcontainer stripe when within a contentpane */ +/* this resets the tabcontainer strip when within a contentpane */ .soria .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs { border-left: 0 solid #ccc; border-top: 0 solid #ccc; @@ -441,19 +364,11 @@ margin-top: 1px; } -.soria .tabStripButton .dijitTabContent{ - padding: 6px 0 5px 0; -} - .dj_ie6 .soria .tabStripButton .dijitTabContent, .dj_ie7 .soria .tabStripButton .dijitTabContent { padding-top: 7px; } -.soria .tabStrip-disabled .tabStripButton .dijitTabContent { - padding: 5px 0 3px 0; -} - .dj_ie6 .soria .tabStrip-disabled .tabStripButton .dijitTabContent, .dj_ie7 .soria .tabStrip-disabled .tabStripButton .dijitTabContent { padding-top: 6px; @@ -465,14 +380,10 @@ border-top: 1px solid #B1BADF; } -.soria .dijitTabContainer .tabStripButton-bottom .dijitTabInnerDiv { +.soria .dijitTabContainer .tabStripButton-bottom .dijitTab { background: transparent url(../images/tabBottomEnabledSpriteLR.gif) no-repeat scroll right bottom; } -.soria .dijitTabContainer .tabStripButton-bottom .dijitTabContent { - background: transparent; -} - .soria .dijitTabStripIcon { height: 14px; width: 14px; -- cgit v1.2.3