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/nihilo/Common.css | 14 +- lib/dijit/themes/nihilo/Dialog.css | 10 +- lib/dijit/themes/nihilo/form/Button.css | 7 +- lib/dijit/themes/nihilo/form/Button_rtl.css | 6 +- lib/dijit/themes/nihilo/form/Common.css | 19 +- lib/dijit/themes/nihilo/form/Select.css | 46 ++--- lib/dijit/themes/nihilo/form/TimeTextBox.css | 2 +- lib/dijit/themes/nihilo/images/dndNoCopy.png | Bin 699 -> 1332 bytes lib/dijit/themes/nihilo/images/dndNoMove.png | Bin 677 -> 991 bytes .../nihilo/images/tabBottomActiveSpriteLR.gif | Bin 291 -> 0 bytes .../nihilo/images/tabBottomEnabledSpriteLR.gif | Bin 266 -> 0 bytes .../nihilo/images/tabBottomHoverSpriteLR.gif | Bin 388 -> 0 bytes lib/dijit/themes/nihilo/images/tabLeftChecked.gif | Bin 303 -> 0 bytes lib/dijit/themes/nihilo/images/tabRightChecked.gif | Bin 300 -> 0 bytes lib/dijit/themes/nihilo/images/tabStripe.gif | Bin 54 -> 0 bytes lib/dijit/themes/nihilo/images/tabStripeBottom.gif | Bin 432 -> 0 bytes lib/dijit/themes/nihilo/images/tabStripeLeft.gif | Bin 432 -> 0 bytes lib/dijit/themes/nihilo/images/tabStripeRight.gif | Bin 432 -> 0 bytes lib/dijit/themes/nihilo/layout/TabContainer.css | 226 +++++++-------------- 19 files changed, 110 insertions(+), 220 deletions(-) delete mode 100644 lib/dijit/themes/nihilo/images/tabBottomActiveSpriteLR.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabBottomEnabledSpriteLR.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabBottomHoverSpriteLR.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabLeftChecked.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabRightChecked.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabStripe.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabStripeBottom.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabStripeLeft.gif delete mode 100644 lib/dijit/themes/nihilo/images/tabStripeRight.gif (limited to 'lib/dijit/themes/nihilo') diff --git a/lib/dijit/themes/nihilo/Common.css b/lib/dijit/themes/nihilo/Common.css index 498699083..1a1c7f930 100644 --- a/lib/dijit/themes/nihilo/Common.css +++ b/lib/dijit/themes/nihilo/Common.css @@ -1,17 +1,9 @@ -/* DnD avatar-specific settings */ -/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */ -.nihilo .dojoDndItemBefore { - border-top: 2px solid #369; -} - -.nihilo .dojoDndItemAfter { - border-bottom: 2px solid #369; -} - .nihilo .dojoDndItemOver { - cursor:pointer; + background-image: url(images/treeHover.png); } +/* DnD avatar-specific settings */ +/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */ .nihilo table.dojoDndAvatar { -moz-border-radius: 0; border: 1px solid #ccc; border-collapse: collapse; background-color: #fff; font-size: 75%; color: black;} .nihilo .dojoDndAvatar td { border: none; } .nihilo .dojoDndAvatar tr { border: none; } diff --git a/lib/dijit/themes/nihilo/Dialog.css b/lib/dijit/themes/nihilo/Dialog.css index 4affeb866..248260467 100644 --- a/lib/dijit/themes/nihilo/Dialog.css +++ b/lib/dijit/themes/nihilo/Dialog.css @@ -67,15 +67,7 @@ } .nihilo .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 #d3d3d3; padding:0.45em; 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"; diff --git a/lib/dijit/themes/nihilo/images/dndNoCopy.png b/lib/dijit/themes/nihilo/images/dndNoCopy.png index 9bf9c3396..998c2f269 100644 Binary files a/lib/dijit/themes/nihilo/images/dndNoCopy.png and b/lib/dijit/themes/nihilo/images/dndNoCopy.png differ diff --git a/lib/dijit/themes/nihilo/images/dndNoMove.png b/lib/dijit/themes/nihilo/images/dndNoMove.png index cb8bd8bdd..e909173e0 100644 Binary files a/lib/dijit/themes/nihilo/images/dndNoMove.png and b/lib/dijit/themes/nihilo/images/dndNoMove.png differ diff --git a/lib/dijit/themes/nihilo/images/tabBottomActiveSpriteLR.gif b/lib/dijit/themes/nihilo/images/tabBottomActiveSpriteLR.gif deleted file mode 100644 index 6803db442..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabBottomActiveSpriteLR.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabBottomEnabledSpriteLR.gif b/lib/dijit/themes/nihilo/images/tabBottomEnabledSpriteLR.gif deleted file mode 100644 index b6b08ce48..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabBottomEnabledSpriteLR.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabBottomHoverSpriteLR.gif b/lib/dijit/themes/nihilo/images/tabBottomHoverSpriteLR.gif deleted file mode 100644 index 010b08ae9..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabBottomHoverSpriteLR.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabLeftChecked.gif b/lib/dijit/themes/nihilo/images/tabLeftChecked.gif deleted file mode 100644 index d59fd4a5b..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabLeftChecked.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabRightChecked.gif b/lib/dijit/themes/nihilo/images/tabRightChecked.gif deleted file mode 100644 index d32f44e3c..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabRightChecked.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabStripe.gif b/lib/dijit/themes/nihilo/images/tabStripe.gif deleted file mode 100644 index a93467520..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabStripe.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabStripeBottom.gif b/lib/dijit/themes/nihilo/images/tabStripeBottom.gif deleted file mode 100644 index 64c3376bd..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabStripeBottom.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabStripeLeft.gif b/lib/dijit/themes/nihilo/images/tabStripeLeft.gif deleted file mode 100644 index d607a45f7..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabStripeLeft.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/images/tabStripeRight.gif b/lib/dijit/themes/nihilo/images/tabStripeRight.gif deleted file mode 100644 index 9778cedf7..000000000 Binary files a/lib/dijit/themes/nihilo/images/tabStripeRight.gif and /dev/null differ diff --git a/lib/dijit/themes/nihilo/layout/TabContainer.css b/lib/dijit/themes/nihilo/layout/TabContainer.css index 21266577e..dba38c3fa 100644 --- a/lib/dijit/themes/nihilo/layout/TabContainer.css +++ b/lib/dijit/themes/nihilo/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 */ @import url("../Menu.css"); @@ -28,54 +24,25 @@ padding: 0; } -.nihilo .dijitTabInnerDiv { - padding:0 3px 0 0; - margin: 0 0 0 4px; - background: url("../images/tabContainerSprite.gif") no-repeat; - background-position: right -400px; -} - .nihilo .dijitTab { + padding:3px 6px 3px 4px; + background: url("../images/tabContainerSprite.gif") repeat-x 0 -350px; + 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; + margin: 0 1px; /* space between one tab and the next in top/bottom mode */ color: #6d6d6d; + border: 1px #dedede solid; border-bottom: 1px #ccc solid; } -.nihilo .dijitTabInnerDiv .dijitTabContent { - padding:3px 3px 3px 4px; - background: url("../images/tabContainerSprite.gif") repeat-x 0 -350px; - position: relative; -} - /* hovered tab */ .nihilo .dijitTabHover { color: #243C5F; - background: url("../images/tabContainerSprite.gif") no-repeat 0 -150px; -} - -.nihilo .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -250px; -} - -.nihilo .dijitTabHover .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabContainerSprite.gif") repeat-x 0 -200px; } -/* checked tab*/ -.nihilo .dijitTabChecked -{ - /* the selected tab (with or without hover) */ - background: url("../images/tabContainerSprite.gif") no-repeat 0 -0; -} - -.nihilo .dijitTabChecked .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -100px; -} - -.nihilo .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { +/* selected tab */ +.nihilo .dijitTabChecked { background: url("../images/tabContainerSprite.gif") repeat-x 0 -50px; color: #243C5F !important; } @@ -95,11 +62,7 @@ border: none; top: 0; /* override top:1px setting of top-level tabs */ } -.nihilo .dijitTabContainerTabListNested .dijitTab .dijitTabInnerDiv, -.nihilo .dijitTabContainerTabListNested .dijitTab .dijitTabContent { - background: none; -} -.nihilo .dijitTabContainerTabListNested .dijitTabHover .dijitTabContent .tabLabel { +.nihilo .dijitTabContainerTabListNested .dijitTabHover .tabLabel { text-decoration: underline; } .nihilo .dijitTabContainerTabListNested .dijitTabChecked .tabLabel { @@ -142,6 +105,10 @@ background-position: bottom; padding-left: 3px; } +.nihilo .dijitTabContainerTop-tabs .dijitTab { + border-radius: 4px 4px 0 0; + -moz-border-radius: 4px 4px 0 0; +} .dj_ie6 .nihilo .dijitTabListContainer-top, .dj_ie7 .nihilo .dijitTabListContainer-top { @@ -163,7 +130,7 @@ border-top: none; } -/* checked tabs */ +/* selected tab */ .nihilo .dijitTabContainerTop-tabs .dijitTabChecked { border-bottom-color: #f8f8f8; } @@ -187,68 +154,43 @@ background-position: top; padding-left: 3px; } - -.dj_ie6 .nihilo .dijitTabListContainer-bottom, -.dj_ie7 .nihilo .dijitTabListContainer-bottom { - z-index: 3; -} - -.dj_ie6 .nihilo .dijitTabContainerBottom-tabs, -.dj_ie7 .nihilo .dijitTabContainerBottom-tabs { - border-top: 1px solid #ccc; - margin-top: -1px; -} - -/* bottom container */ -.nihilo .dijitTabContainerBottom-container { - border-bottom: none; -} - .nihilo .dijitTabContainerBottom-tabs .dijitTab { - border-bottom: none; - border-top: 1px solid #ccc; - background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom left; -} - -/* checked tabs */ -.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked { - border-top-color: #f8f8f8; -} - -.nihilo .dijitTabContainerBottom-tabs .dijitTabInnerDiv .dijitTabContent { - padding-top: 3px; - padding-bottom: 3px; - background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left; + border-radius: 0 0 4px 4px; + -moz-border-radius: 0 0 4px 4px; + border-bottom: none; + border-top: 1px solid #ccc; + padding-top: 3px; + padding-bottom: 3px; + background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left; } -.nihilo .dijitTabContainerBottom-tabs .dijitTabInnerDiv { - background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom right; -} .nihilo .dijitTabContainerBottom-tabs .dijitTabHover { color: #243C5F; - background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom left; -} - -.nihilo .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom right; -} - -.nihilo .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabBottomHoverC.gif") repeat-x bottom left; } .nihilo .dijitTabContainerBottom-tabs .dijitTabChecked { /* the selected tab (with or without hover) */ - background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom left; + border-top-color: #f8f8f8; + background: url("../images/tabBottomActiveC.gif") repeat-x bottom left; } -.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv { - background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom right; + +.dj_ie6 .nihilo .dijitTabListContainer-bottom, +.dj_ie7 .nihilo .dijitTabListContainer-bottom { + z-index: 3; } -.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { - background: url("../images/tabBottomActiveC.gif") repeat-x bottom left; +.dj_ie6 .nihilo .dijitTabContainerBottom-tabs, +.dj_ie7 .nihilo .dijitTabContainerBottom-tabs { + border-top: 1px solid #ccc; + margin-top: -1px; +} + +/* bottom container */ +.nihilo .dijitTabContainerBottom-container { + border-bottom: none; } /* strip */ @@ -264,14 +206,15 @@ .nihilo .dijitTabContainerTop-spacer { height: 2px; border: 1px solid #ccc; - background: #f8f8f8; } .nihilo .dijitTabContainerTop-spacer { margin-top: -1px; + background: #f3f3f3; } .nihilo .dijitTabContainerBottom-spacer { margin-bottom: -1px; + background: #f8f8f8; } @@ -281,49 +224,42 @@ border-color: #ccc; padding-top: 3px; } +.nihilo .dijitTabContainerRight-tabs .dijitTab { + border-radius: 0 4px 4px 0; + -moz-border-radius: 0 4px 4px 0; + border-left: 1px solid #ccc; + border-bottom: 1px solid #dedede !important; +} + .nihilo .dijitTabContainerRight .dijitTabListWrapper { padding-right: 3px; } +.nihilo .dijitTabContainerRight-tabs .dijitTabChecked { + border-left: 1px solid #f8f8f8; +} + /* right container */ .nihilo .dijitTabContainerRight-container { border-right: none; } -.nihilo .dijitTabContainerRight-tabs .dijitTab { - border-bottom: none; - border-left: 1px solid #ccc; - border-bottom: 1px solid #dedede !important; -} - - -/* some odd ie bug when borders dissapear when setting a bottom margin, this sortof helps */ -.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabInnerDiv { +/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */ +.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTab { border-bottom: solid #fff 1px; } -/* checked tabs */ +/* selected tab */ .nihilo .dijitTabContainerRight-tabs .dijitTabChecked { border-left-color: #f8f8f8; } -.nihilo .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_ie .nihilo .dijitTabContainerRight-tabs .dijitTabChecked .dijitTabInnerDiv, -.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabCheckedHover .dijitTabInnerDiv { +/* some odd ie bug when borders disappear when setting a bottom margin, this sort of helps */ +.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabChecked, +.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabCheckedHover { border-bottom: solid #efefef 1px; } -.nihilo .dijitTabContainerRight-tabs .dijitTab { - background: url("../images/tabContainerSprite.gif") no-repeat left -350px; -} -.nihilo .dijitTabContainerRight-tabs .dijitTabHover .dijitTab { - background: url("../images/tabContainerSprite.gif") no-repeat left -200px; -} - /* strip */ .nihilo .dijitTabContainerRightStrip { padding-right: 2px; @@ -338,35 +274,26 @@ border-color: #ccc; padding-top: 3px; } - -/* left conatiner */ -.nihilo .dijitTabContainerLeft-container { - border-left: none; -} - .nihilo .dijitTabContainerLeft-tabs .dijitTab { - border-right: 1px solid #ccc; - border-bottom: 1px solid #dedede; + border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-right: 1px solid #ccc; + border-bottom: 1px solid #dedede; } -/* checked tabs */ +/* selected tab */ .nihilo .dijitTabContainerLeft-tabs .dijitTabChecked { border-right: 1px solid #f8f8f8; } -.nihilo .dijitTabContainerLeft-tabs .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -350px; -} -.nihilo .dijitTabContainerLeft-tabs .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -200px; -} -.nihilo .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, -.nihilo .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { - background: url("../images/tabLeftChecked.gif") no-repeat right top; +/* left container */ +.nihilo .dijitTabContainerLeft-container { + border-left: none; } -.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, -.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { + +.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabChecked, +.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabCheckedHover { border-bottom: solid #efefef 1px; } @@ -389,8 +316,7 @@ /* left/right tabs */ .nihilo .dijitTabContainerLeft-tabs .dijitTab, .nihilo .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 */ @@ -419,7 +345,7 @@ /* ================================ */ -/* this resets the tabcontainer stripe when within a contentpane */ +/* this resets the tabcontainer strip when within a contentpane */ .nihilo .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs { border-left: 0 solid #ccc; border-top: 0 solid #ccc; @@ -433,10 +359,7 @@ /* Menu and slider control styles */ .nihilo .dijitTabContainer .tabStripButton { margin-right: 0; -} - -.nihilo .tabStripButton .dijitTabInnerDiv .dijitTabContent { - padding: 5px 0 6px; + padding: 5px 3px 6px 0px; } .dj_ie6 .nihilo .tabStripButton .dijitTabInnerDiv .dijitTabContent, @@ -445,10 +368,6 @@ padding-bottom: 7px; } -.nihilo .tabStrip-disabled .tabStripButton .dijitTabInnerDiv .dijitTabContent { - padding: 3px 0 5px; -} - .dj_ie6 .nihilo .tabStrip-disabled .tabStripButton .dijitTabInnerDiv .dijitTabContent, .dj_ie7 .nihilo .tabStrip-disabled .tabStripButton .dijitTabInnerDiv .dijitTabContent, .dj_opera .nihilo .tabStrip-disabled .tabStripButton .dijitTabInnerDiv .dijitTabContent { @@ -482,15 +401,6 @@ } .nihilo .dijitTabContainer .tabStripButton-bottom { - background: transparent url(../images/tabBottomEnabledSpriteLR.gif) no-repeat scroll left bottom; border-bottom: medium none; border-top: 1px solid #CCCCCC; } - -.nihilo .dijitTabContainer .tabStripButton-bottom .dijitTabInnerDiv { - background: transparent url(../images/tabBottomEnabledSpriteLR.gif) no-repeat scroll right bottom; -} - -.nihilo .dijitTabContainer .tabStripButton-bottom .dijitTabContent { - background: transparent; -} \ No newline at end of file -- cgit v1.2.3