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/layout/TabContainer.css | 42 ++++++------------- .../themes/tundra/layout/TabContainer_rtl.css | 48 ---------------------- 2 files changed, 13 insertions(+), 77 deletions(-) (limited to 'lib/dijit/themes/tundra/layout') 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