From 81bea17aefb26859f825b9293c7c99192874806e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 8 Nov 2011 20:40:44 +0400 Subject: upgrade Dojo to 1.6.1 --- .../themes/tundra/layout/AccordionContainer.css | 8 +- lib/dijit/themes/tundra/layout/BorderContainer.css | 22 +++- lib/dijit/themes/tundra/layout/ContentPane.css | 10 +- lib/dijit/themes/tundra/layout/SplitContainer.css | 3 + lib/dijit/themes/tundra/layout/TabContainer.css | 128 +++++++++++++++++---- .../themes/tundra/layout/TabContainer_rtl.css | 21 +++- 6 files changed, 159 insertions(+), 33 deletions(-) (limited to 'lib/dijit/themes/tundra/layout') diff --git a/lib/dijit/themes/tundra/layout/AccordionContainer.css b/lib/dijit/themes/tundra/layout/AccordionContainer.css index 6479956e6..c5621efab 100644 --- a/lib/dijit/themes/tundra/layout/AccordionContainer.css +++ b/lib/dijit/themes/tundra/layout/AccordionContainer.css @@ -1,20 +1,26 @@ +/* Accordion */ .tundra .dijitAccordionContainer { border-color: #ccc; background-color: #fff; } + +/* common */ + .tundra .dijitAccordionTitle { background:#fafafa url("../images/titleBar.png") repeat-x bottom left; border-top: 1px solid #bfbfbf; padding: 4px 4px 4px 8px; } + .tundra .dijitAccordionTitleHover { background: #f8fafd url("../images/accordionItemHover.gif") bottom repeat-x; } + .tundra .dijitAccordionTitleSelected { background: #f9f9f9 url("../images/accordionItemActive.gif") bottom repeat-x; font-weight: bold; border-top: 1px solid #aaaaaa; border-bottom: 1px solid #bfbfbf; padding: 4px 4px 4px 8px; -} +} \ No newline at end of file diff --git a/lib/dijit/themes/tundra/layout/BorderContainer.css b/lib/dijit/themes/tundra/layout/BorderContainer.css index 076460f15..0dd1b1b51 100644 --- a/lib/dijit/themes/tundra/layout/BorderContainer.css +++ b/lib/dijit/themes/tundra/layout/BorderContainer.css @@ -1,49 +1,63 @@ +/* BorderContainer */ .tundra .dijitBorderContainer { background-color: #fcfcfc; padding: 5px; } + .tundra .dijitSplitContainer-child, .tundra .dijitBorderContainer-child { - + /* By default put borders on all children of BorderContainer, + * to give illusion of borders on the splitters themselves. + */ border: 1px #ccc solid; } + .tundra .dijitBorderContainer-dijitTabContainerTop, .tundra .dijitBorderContainer-dijitTabContainerBottom, .tundra .dijitBorderContainer-dijitTabContainerLeft, .tundra .dijitBorderContainer-dijitTabContainerRight { - + /* except that TabContainer defines borders on it's sub-nodes (tablist and dijitTabPaneWrapper), + * so override rule setting border on domNode + */ border: none; } + .tundra .dijitBorderContainer-dijitBorderContainer { - + /* also, make nested BorderContainers look like a single big widget with lots of splitters */ border: none; - padding: 0px; + padding: 0; } + .tundra .dijitSplitterH, .tundra .dijitGutterH { background:#fcfcfc; border:0; height:5px; } + .tundra .dijitSplitterH .dijitSplitterThumb { background:#B0B0B0 none; height:1px; top:2px; width:19px; } + .tundra .dijitSplitterV, .tundra .dijitGutterV { background:#fcfcfc; border:0; width:5px; } + .tundra .dijitSplitterV .dijitSplitterThumb { background:#B0B0B0 none; height:19px; left:2px; width:1px; } + +/* active splitter */ .tundra .dijitSplitterActive { font-size: 1px; background-image: none; diff --git a/lib/dijit/themes/tundra/layout/ContentPane.css b/lib/dijit/themes/tundra/layout/ContentPane.css index 8b470b938..21d25d524 100644 --- a/lib/dijit/themes/tundra/layout/ContentPane.css +++ b/lib/dijit/themes/tundra/layout/ContentPane.css @@ -1,7 +1,10 @@ +/* ContentPane */ .tundra .dijitContentPane { - padding: 0px; + padding: 0; } + +/* nested layouts */ .tundra .dijitTabContainerTop-dijitContentPane, .tundra .dijitTabContainerLeft-dijitContentPane, .tundra .dijitTabContainerBottom-dijitContentPane, @@ -10,8 +13,9 @@ background-color: #fff; padding: 5px; } + .tundra .dijitSplitContainer-dijitContentPane, .tundra .dijitBorderContainer-dijitContentPane { - background-color: #fff; + background-color: #fff; /* override background-color setting on parent .dijitBorderContainer */ padding: 5px; -} +} \ No newline at end of file diff --git a/lib/dijit/themes/tundra/layout/SplitContainer.css b/lib/dijit/themes/tundra/layout/SplitContainer.css index 278503116..5a3eed6c9 100644 --- a/lib/dijit/themes/tundra/layout/SplitContainer.css +++ b/lib/dijit/themes/tundra/layout/SplitContainer.css @@ -5,6 +5,7 @@ border-right:1px solid #bfbfbf; width:7px; } + .tundra .dijitSplitContainerSizerH .thumb { background:url("../images/splitContainerSizerV-thumb.png") no-repeat #ccc; left:1px; @@ -12,6 +13,7 @@ height:19px; overflow: hidden; } + .tundra .dijitSplitContainerSizerV { background:url("../images/splitContainerSizerH.png") repeat-x #fff; border:0; @@ -19,6 +21,7 @@ border-bottom:1px solid #bfbfbf; height:7px; } + .tundra .dijitSplitContainerSizerV .thumb { background:url("../images/splitContainerSizerH-thumb.png") no-repeat #ccc; top:1px; diff --git a/lib/dijit/themes/tundra/layout/TabContainer.css b/lib/dijit/themes/tundra/layout/TabContainer.css index 8e859b9b4..667da4ad9 100644 --- a/lib/dijit/themes/tundra/layout/TabContainer.css +++ b/lib/dijit/themes/tundra/layout/TabContainer.css @@ -1,42 +1,51 @@ - +/* Tabs, shared classes */ .tundra .dijitTabPaneWrapper { background:#fff; border:1px solid #ccc; margin: 0; padding: 0; } + .tundra .dijitTab { line-height:normal; - margin-right:4px; - padding:0px; + margin-right:4px; /* space between one tab and the next in top/bottom mode */ + padding:0; border:1px solid #ccc; background:#e2e2e2 url("../images/tabEnabled.png") repeat-x; } + .tundra .dijitTabInnerDiv { padding:2px 8px 2px 9px; } + .tundra .dijitTabSpacer { display: none; } + .tundra .dijitTabContainer .tabStripRBtn { margin-right: 20px; } .tundra .dijitTabContainer .tabStripLBtn { margin-left: 20px; } + .tundra .nowrapTabStrip .dijitTab { top: 2px; } .tundra .dijitTabContainerBottom .nowrapTabStrip .dijitTab { - top: 0px; + top: 0; bottom: 2px; } + +/* checked tab*/ .tundra .dijitTabChecked { - + /* the selected tab (with or without hover) */ background-color:#fff; border-color: #ccc; background-image:none; } + +/* hovered tab */ .tundra .dijitTabHover { color: #243C5F; border-top-color:#92a0b3; @@ -45,38 +54,49 @@ border-bottom-color:#92a0b3; background:#e2e2e2 url("../images/tabHover.gif") repeat-x; } + .tundra .dijitTabContainerTop .dijitTabHover { border-bottom-color:#ccc; } + .tundra .dijitTabContainerBottom .dijitTabHover { border-top-color:#ccc; } + .tundra .dijitTabContainerLeft .dijitTabHover { border-right-color:#ccc; } + .tundra .dijitTabContainerRight .dijitTabHover { border-left-color:#ccc; } + .tundra .dijitTabContainer .dijitTabCheckedHover { color: inherit; border:1px solid #ccc; background:#fff; } + .tundra .dijitTab .tabLabel { - + /* make sure tabs w/close button and w/out close button are same height, even w/small (<12px) font */ min-height: 12px; display: inline-block; } + +/* Nested Tabs */ + .tundra .dijitTabContainerNested .dijitTabListWrapper { height: auto; } + .tundra .dijitTabContainerNested .dijitTabContainerTop-tabs { border-bottom: 1px solid #CCC; } + .tundra .dijitTabContainerTabListNested .dijitTab { background: none; border: none; - top: 0px; + top: 0; /* to override top: 1px/-1px for normal tabs */ } .tundra .dijitTabContainerTabListNested .dijitTab .dijitTabContent { } @@ -86,11 +106,14 @@ .tundra .dijitTabContainerTabListNested .dijitTabChecked .dijitTabContent .tabLabel { text-decoration: underline; font-weight: bold; - + /*background:#f3f3f3;*/ } .tundra .dijitTabContainer .dijitTabPaneWrapperNested { - border: none; + border: none; /* prevent double border */ } + +/* Close button */ + .tundra .dijitTabCloseButton { background: url("../images/tabClose.png") no-repeat right top; width: 12px; @@ -99,33 +122,45 @@ .dj_ie6 .tundra .dijitTabCloseButton { background-image : url("../images/tabClose.gif"); } + .tundra .dijitTabCloseButtonHover { background-image : url("../images/tabCloseHover.png"); } .dj_ie6 .tundra .dijitTabCloseButtonHover { background-image : url("../images/tabCloseHover.gif"); } + +/* ================================ */ +/* top tabs */ + .tundra .dijitTabContainerTop-tabs { - margin-bottom: 0px; + margin-bottom: 0; border-color: #cccccc; padding-left: 3px; background-position: bottom; } .tundra .dijitTabContainerTop-tabs .dijitTab { - top: 0px; + top: 0; margin-bottom: -1px; } + +/* top container */ .tundra .dijitTabContainerTop-container { border-top: none; } + +/* checked tabs */ .tundra .dijitTabContainerTop-tabs .dijitTabChecked { border-bottom-color:white; } + .tundra .dijitTabContainerTop-tabs, .tundra .dijitTabContainerBottom-tabs { padding-left: 3px; padding-right: 3px; } + +/* strip */ .tundra .dijitTabContainerTopStrip { border-top: 1px solid #CCC; border-right: 1px solid #CCC; @@ -133,96 +168,142 @@ padding-top: 2px; background: #f2f2f2; } + .tundra .dijitTabContainerTopNone { - padding-top: 0px; + padding-top: 0; } + + +/* ================================ */ +/* bottom tabs */ .tundra .dijitTabContainerBottom-tabs { - margin-top: 0px; + margin-top: 0; border-color: #cccccc; background-position: top; padding-left: 3px; } .tundra .dijitTabContainerBottom-tabs .dijitTab { - bottom: 0px; + bottom: 0; margin-top: -1px; } + +/* bottom container */ .tundra .dijitTabContainerBottom-container { border-bottom: none; } + +/* checked tabs */ .tundra .dijitTabContainerBottom-tabs .dijitTabChecked { border-top-color:white; } + +/* strip */ .tundra .dijitTabContainerBottomStrip { padding-bottom: 2px; border: 1px solid #ccc; background: #f2f2f2; border-top: none; } + +/* ================================ */ +/* right tabs */ .tundra .dijitTabContainerRight-tabs { border-color: #ccc; height: 100%; padding-top: 3px; } + .tundra .dijitTabContainerRightStrip { margin-left: -1px; } + +/* right container */ .tundra .dijitTabContainerRight-container { border-right: none; } + +/* checked tabs */ .tundra .dijitTabContainerRight-tabs .dijitTabChecked { border-left-color:white; } + +/* strip */ .tundra .dijitTabContainerRightStrip { padding-right: 2px; border: 1px solid #ccc; } + .tundra .dijitTabContainerRightStrip { background: #f2f2f2; } + +/* ================================ */ +/* left tabs */ .tundra .dijitTabContainerLeft-tabs { border-color: #ccc; padding-top: 3px; height: 100%; } + +/* left conatiner */ .tundra .dijitTabContainerLeft-container { border-left: none; } + +/* checked tabs */ .tundra .dijitTabContainerLeft-tabs .dijitTabChecked { border-right-color:white; } + +/* strip */ .tundra .dijitTabContainerLeftStrip { padding-left: 2px; border: 1px solid #ccc; background: #f2f2f2; border-right: none; } + +/* ================================ */ +/* left/right tabs */ .tundra .dijitTabContainerLeft-tabs .dijitTab, .tundra .dijitTabContainerRight-tabs .dijitTab { - margin-right:0px; - margin-bottom:4px; + margin-right:0; + margin-bottom:4px; /* space between one tab and the next in left/right mode */ } + +/* ================================ */ + +/* this resets the tabcontainer stripe when within a contentpane */ .tundra .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs { - border-left: 0px solid #ccc; - border-top: 0px solid #ccc; - border-right: 0px solid #ccc; - padding-top: 0px; - padding-left: 0px; + border-left: 0 solid #ccc; + border-top: 0 solid #ccc; + border-right: 0 solid #ccc; + padding-top: 0; + padding-left: 0; } + +/* ================================ */ + +/* Menu and slider control styles */ .tundra .dijitTabContainer .tabStripButton { margin-right: 0; padding-top: 2px; z-index: 12; } + .tundra .dijitTabContainerBottom .tabStripButton { padding-top: 2px; } + .tundra .tabStrip-disabled .tabStripButton .dijitTabInnerDiv { padding-bottom: 3px; padding-top: 1px; } + .tundra .tabStripButton .dijitTabInnerDiv { padding: 3px 2px 4px 2px; } + .dj_ie6 .tundra .tabStripButton .dijitTabInnerDiv, .dj_ie7 .tundra .tabStripButton .dijitTabInnerDiv, .dj_opera .tundra .tabStripButton .dijitTabInnerDiv { @@ -233,17 +314,22 @@ .dj_opera .tundra .tabStrip-disabled .tabStripButton .dijitTabInnerDiv { padding-bottom: 4px; } + .tundra .dijitTabStripIcon { height: 14px; width: 14px; background: url(../images/spriteRoundedIconsSmall.png) no-repeat left top ; } + .dj_ie6 .tundra .dijitTabStripIcon { background-image: url(../images/spriteRoundedIconsSmall.gif); } + .tundra .dijitTabStripSlideRightIcon { background-position: -30px top; } + .tundra .dijitTabStripMenuIcon { background-position: -15px top; } + diff --git a/lib/dijit/themes/tundra/layout/TabContainer_rtl.css b/lib/dijit/themes/tundra/layout/TabContainer_rtl.css index 1811a5b6c..fb8e28e9b 100644 --- a/lib/dijit/themes/tundra/layout/TabContainer_rtl.css +++ b/lib/dijit/themes/tundra/layout/TabContainer_rtl.css @@ -2,37 +2,50 @@ -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:0px; + 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