From 1354d17270961fff662d40f90521223f8fd0d73b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 14 Aug 2012 18:59:10 +0400 Subject: update dojo to 1.7.3 --- .../themes/claro/layout/AccordionContainer.css | 21 +++++------ .../themes/claro/layout/AccordionContainer.less | 7 ++-- lib/dijit/themes/claro/layout/BorderContainer.css | 8 ++--- lib/dijit/themes/claro/layout/BorderContainer.less | 4 +-- lib/dijit/themes/claro/layout/TabContainer.css | 42 +++++++++++----------- lib/dijit/themes/claro/layout/TabContainer.less | 26 +++++++------- 6 files changed, 51 insertions(+), 57 deletions(-) (limited to 'lib/dijit/themes/claro/layout') diff --git a/lib/dijit/themes/claro/layout/AccordionContainer.css b/lib/dijit/themes/claro/layout/AccordionContainer.css index f76947959..34831764c 100644 --- a/lib/dijit/themes/claro/layout/AccordionContainer.css +++ b/lib/dijit/themes/claro/layout/AccordionContainer.css @@ -50,15 +50,12 @@ background-color: transparent; /* pick up color from dijitAccordionInnerContainer */ - background-image: url("images/accordion.png"); + background-image: url("../layout/images/accordion.png"); background-position: 0 0; background-repeat: repeat-x; padding: 5px 7px 2px 7px; min-height: 17px; - color: #4a4a4a; -} -.claro .dijitAccordionTitleHover { - color: #000000; + color: #494949; } .dj_ie6 .claro .dijitAccordionTitle { background-image: none; @@ -69,7 +66,7 @@ */ background-color: #ffffff; - border: 1px solid #769dc0; + border: 1px solid #759dc0; margin: 0 2px 2px; } .claro .dijitAccordionContainer .dijitAccordionContainer-child { @@ -79,8 +76,8 @@ } /* Active state for closed pane */ .claro .dijitAccordionInnerContainerActive { - border: 1px solid #769dc0; - background-color: #7dbefa; + border: 1px solid #759dc0; + background-color: #7dbdfa; -webkit-transition-duration: 0.1s; -moz-transition-duration: 0.1s; transition-duration: 0.1s; @@ -91,7 +88,7 @@ } /* Open (a.k.a. selected) pane */ .claro .dijitAccordionInnerContainerSelected { - border-color: #769dc0; + border-color: #759dc0; background-color: #cfe5fa; } .claro .dijitAccordionInnerContainerSelected .dijitAccordionTitle { @@ -101,7 +98,7 @@ } /* Hovering open or closed pane */ -.claro .dijitAccordionInnerContainerHover dijitAccordionTitle { +.claro .dijitAccordionInnerContainerHover .dijitAccordionTitle { /* both open and closed */ color: #000000; @@ -109,7 +106,7 @@ .claro .dijitAccordionInnerContainerHover, .claro .dijitAccordionInnerContainerSelectedActive { /* note: clicking the currently selected Accordion pane should have no effect, so treating same as hover. */ - border: 1px solid #769dc0; + border: 1px solid #759dc0; background-color: #abd6ff; -webkit-transition-duration: 0.2s; -moz-transition-duration: 0.2s; @@ -117,7 +114,7 @@ } .claro .dijitAccordionInnerContainerSelectedHover .dijitAccordionChildWrapper, .claro .dijitAccordionInnerContainerSelectedActive .dijitAccordionChildWrapper { background-color: #ffffff; - border: 1px solid #769dc0 !important; + border: 1px solid #759dc0 !important; -webkit-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.25); -moz-box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.25); box-shadow: inset 0 0 3px rgba(0, 0, 0, 0.25); diff --git a/lib/dijit/themes/claro/layout/AccordionContainer.less b/lib/dijit/themes/claro/layout/AccordionContainer.less index 01f4427f4..b3aa62248 100644 --- a/lib/dijit/themes/claro/layout/AccordionContainer.less +++ b/lib/dijit/themes/claro/layout/AccordionContainer.less @@ -43,16 +43,13 @@ } .claro .dijitAccordionTitle { background-color: transparent; /* pick up color from dijitAccordionInnerContainer */ - background-image: url("images/accordion.png"); + background-image: url("../@{image-layout-accordion}"); background-position:0 0; background-repeat:repeat-x; padding: 5px 7px 2px 7px; min-height:17px; color:@unselected-text-color; } -.claro .dijitAccordionTitleHover { - color:@hovered-text-color; -} .dj_ie6 .claro .dijitAccordionTitle { background-image: none; } @@ -95,7 +92,7 @@ /* Hovering open or closed pane */ -.claro .dijitAccordionInnerContainerHover dijitAccordionTitle { +.claro .dijitAccordionInnerContainerHover .dijitAccordionTitle { /* both open and closed */ color:@hovered-text-color; } diff --git a/lib/dijit/themes/claro/layout/BorderContainer.css b/lib/dijit/themes/claro/layout/BorderContainer.css index ede2a56c5..8c0a5fa96 100644 --- a/lib/dijit/themes/claro/layout/BorderContainer.css +++ b/lib/dijit/themes/claro/layout/BorderContainer.css @@ -86,17 +86,17 @@ Splitters and gutters: /* hovered splitter */ .claro .dijitSplitterHHover { font-size: 1px; - background: url("images/splitterHorizontalHover.png") no-repeat center top; + background: url("../layout/images/splitterHorizontalHover.png") no-repeat center top; } .claro .dijitSplitterHHover .dijitSplitterThumb { - background: #769dc0 none; + background: #759dc0 none; } .claro .dijitSplitterVHover { font-size: 1px; - background: url("images/splitterVerticalHover.png") no-repeat center left; + background: url("../layout/images/splitterVerticalHover.png") no-repeat center left; } .claro .dijitSplitterVHover .dijitSplitterThumb { - background: #769dc0 none; + background: #759dc0 none; } .dj_ie6 .dijitSplitterHHover, .dj_ie6 .claro .dijitSplitterVHover { background-color: #cfe5fa; diff --git a/lib/dijit/themes/claro/layout/BorderContainer.less b/lib/dijit/themes/claro/layout/BorderContainer.less index 17c4b63cb..b7c672e63 100644 --- a/lib/dijit/themes/claro/layout/BorderContainer.less +++ b/lib/dijit/themes/claro/layout/BorderContainer.less @@ -97,7 +97,7 @@ Splitters and gutters: /* hovered splitter */ .claro .dijitSplitterHHover { font-size: 1px; - background: url("images/splitterHorizontalHover.png") no-repeat center top; + background: url("../@{image-layout-splitter-horizontal-hover}") no-repeat center top; } @@ -107,7 +107,7 @@ Splitters and gutters: .claro .dijitSplitterVHover { font-size: 1px; - background: url("images/splitterVerticalHover.png") no-repeat center left; + background: url("../@{image-layout-splitter-vertical-hover}") no-repeat center left; } .claro .dijitSplitterVHover .dijitSplitterThumb { diff --git a/lib/dijit/themes/claro/layout/TabContainer.css b/lib/dijit/themes/claro/layout/TabContainer.css index 030e4b761..641b921ec 100644 --- a/lib/dijit/themes/claro/layout/TabContainer.css +++ b/lib/dijit/themes/claro/layout/TabContainer.css @@ -60,7 +60,7 @@ border-color: #b5bcc7; } .claro .dijitTabCloseButton { - background: url("images/tabClose.png") no-repeat; + background: url("../layout/images/tabClose.png") no-repeat; width: 14px; height: 14px; margin-left: 5px; @@ -85,7 +85,7 @@ -webkit-transition-duration: 0.35s; -moz-transition-duration: 0.35s; transition-duration: 0.35s; - color: #4a4a4a; + color: #494949; } .claro .dijitTabHover .dijitTabInnerDiv { background-color: #abd6ff; @@ -95,7 +95,7 @@ color: #000000; } .claro .dijitTabActive .dijitTabInnerDiv { - background-color: #7dbefa; + background-color: #7dbdfa; color: #000000; -webkit-transition-duration: 0.1s; -moz-transition-duration: 0.1s; @@ -109,10 +109,10 @@ border: 1px solid #b5bcc7; } .claro .dijitTabHover .dijitTabContent { - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitTabActive .dijitTabContent { - border-color: #769dc0; + border-color: #759dc0; } .claro .dijitTabChecked .dijitTabContent { color: #000000; @@ -140,7 +140,7 @@ .claro .dijitTabContainerTop-tabs .dijitTabContent { padding: 3px 6px; border-bottom-width: 0; - background-image: url("images/tabTop.png"); + background-image: url("../layout/images/tabTop.png"); background-position: 0 0; background-repeat: repeat-x; min-width: 60px; @@ -152,7 +152,7 @@ } /* normal status */ .claro .dijitTabContainerTop-tabs .dijitTabInnerDiv { - background-image: url("images/tabTop.png"); + background-image: url("../layout/images/tabTop.png"); background-position: 0 -248px; background-position: bottom; background-repeat: repeat-x; @@ -183,7 +183,7 @@ .claro .dijitTabContainerBottom-tabs .dijitTabContent { padding: 3px 6px; border-top-width: 0; - background-image: url("images/tabBottom.png"); + background-image: url("../layout/images/tabBottom.png"); background-position: 0 -249px; background-repeat: repeat-x; background-position: bottom; @@ -195,7 +195,7 @@ } /* normal status */ .claro .dijitTabContainerBottom-tabs .dijitTabInnerDiv { - background-image: url("images/tabBottom.png"); + background-image: url("../layout/images/tabBottom.png"); background-position: top; background-repeat: repeat-x; -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04); @@ -228,13 +228,13 @@ } /* normal status */ .claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv { - background-image: url("images/tabLeft.png"); + background-image: url("../layout/images/tabLeft.png"); background-position: -347px -340px; background-repeat: repeat-y; } .claro .dijitTabContainerLeft-tabs .dijitTabContent { padding: 3px 8px 4px 4px; - background-image: url("images/tabLeft.png"); + background-image: url("../layout/images/tabLeft.png"); background-repeat: repeat-y; background-position: 0 0; } @@ -262,13 +262,13 @@ } /* normal status */ .claro .dijitTabContainerRight-tabs .dijitTabInnerDiv { - background-image: url("images/tabRight.png"); + background-image: url("../layout/images/tabRight.png"); background-repeat: repeat-y; background-position: -1px -347px; } .claro .dijitTabContainerRight-tabs .dijitTabContent { padding: 3px 8px 4px 4px; - background-image: url("images/tabRight.png"); + background-image: url("../layout/images/tabRight.png"); background-position: right top; background-repeat: repeat-y; } @@ -304,19 +304,19 @@ } /************ left/right scroll buttons + menu button ************/ .claro .tabStripButton { - background-color: #e9f4fe; + background-color: #e5f2fe; border: 1px solid #b5bcc7; } .claro .dijitTabListContainer-top .tabStripButton { padding: 4px 3px; margin-top: 7px; - background-image: url("images/tabTop.png"); + background-image: url("../layout/images/tabTop.png"); background-position: 0 0; } .claro .dijitTabListContainer-bottom .tabStripButton { padding: 5px 3px; margin-bottom: 4px; - background-image: url("images/tabTop.png"); + background-image: url("../layout/images/tabTop.png"); background-position: 0 -248px; background-position: bottom; } @@ -324,7 +324,7 @@ background-color: #abd6ff; } .claro .tabStripButtonActive { - background-color: #7dbefa; + background-color: #7dbdfa; } .claro .dijitTabStripIcon { height: 15px; @@ -393,7 +393,7 @@ box-shadow: none; } .claro .dijitTabContainerTabListNested .dijitTabHover .dijitTabContent { - background-color: #e9f4fe; + background-color: #e5f2fe; border: solid 1px #cfe5fa; padding: 3px; -webkit-transition-duration: 0.2s; @@ -404,16 +404,16 @@ text-decoration: none; } .claro .dijitTabContainerTabListNested .dijitTabActive .dijitTabContent { - border: solid 1px #769dc0; + border: solid 1px #759dc0; padding: 3px; - background: #abd6ff url("images/tabNested.png") repeat-x; + background: #abd6ff url("../layout/images/tabNested.png") repeat-x; -webkit-transition-duration: 0.1s; -moz-transition-duration: 0.1s; transition-duration: 0.1s; } .claro .dijitTabContainerTabListNested .dijitTabChecked .dijitTabContent { padding: 3px; - border: solid 1px #769dc0; + border: solid 1px #759dc0; background-position: 0 105px; background-color: #cfe5fa; } diff --git a/lib/dijit/themes/claro/layout/TabContainer.less b/lib/dijit/themes/claro/layout/TabContainer.less index 691900eba..16947ff9c 100644 --- a/lib/dijit/themes/claro/layout/TabContainer.less +++ b/lib/dijit/themes/claro/layout/TabContainer.less @@ -62,7 +62,7 @@ border-color: @border-color; } .claro .dijitTabCloseButton { - background: url("images/tabClose.png") no-repeat; + background: url("../@{image-layout-tab-close}") no-repeat; width: 14px; height: 14px; margin-left: 5px; @@ -135,7 +135,7 @@ .claro .dijitTabContainerTop-tabs .dijitTabContent { padding:3px 6px; border-bottom-width: 0; - background-image:url("images/tabTop.png"); + background-image:url("../@{image-layout-tab-top}"); background-position:0 0; background-repeat:repeat-x; min-width: 60px; @@ -148,7 +148,7 @@ /* normal status */ .claro .dijitTabContainerTop-tabs .dijitTabInnerDiv { - background-image:url("images/tabTop.png"); + background-image:url("../@{image-layout-tab-top}"); background-position:0 -248px; background-position:bottom; background-repeat:repeat-x; @@ -176,7 +176,7 @@ .claro .dijitTabContainerBottom-tabs .dijitTabContent { padding:3px 6px; border-top-width: 0; - background-image: url("images/tabBottom.png"); + background-image: url("../@{image-layout-tab-bottom}"); background-position:0 -249px; background-repeat: repeat-x; background-position:bottom; @@ -188,7 +188,7 @@ } /* normal status */ .claro .dijitTabContainerBottom-tabs .dijitTabInnerDiv { - background-image: url("images/tabBottom.png"); + background-image: url("../@{image-layout-tab-bottom}"); background-position: top; background-repeat: repeat-x; .box-shadow(0 1px 1px rgba(0, 0, 0, 0.04)); @@ -218,13 +218,13 @@ } /* normal status */ .claro .dijitTabContainerLeft-tabs .dijitTabInnerDiv { - background-image: url("images/tabLeft.png"); + background-image: url("../@{image-layout-tab-left}"); background-position: -347px -340px; background-repeat: repeat-y; } .claro .dijitTabContainerLeft-tabs .dijitTabContent { padding:3px 8px 4px 4px; - background-image: url("images/tabLeft.png"); + background-image: url("../@{image-layout-tab-left}"); background-repeat: repeat-y; background-position:0 0; } @@ -249,13 +249,13 @@ } /* normal status */ .claro .dijitTabContainerRight-tabs .dijitTabInnerDiv { - background-image: url("images/tabRight.png"); + background-image: url("../@{image-layout-tab-right}"); background-repeat: repeat-y; background-position: -1px -347px; } .claro .dijitTabContainerRight-tabs .dijitTabContent { padding:3px 8px 4px 4px; - background-image: url("images/tabRight.png"); + background-image: url("../@{image-layout-tab-right}"); background-position:right top; background-repeat: repeat-y; } @@ -298,13 +298,13 @@ .claro .dijitTabListContainer-top .tabStripButton { padding: 4px 3px; margin-top:7px; - background-image: url("images/tabTop.png"); + background-image: url("../@{image-layout-tab-top}"); background-position:0 0; } .claro .dijitTabListContainer-bottom .tabStripButton { padding:5px 3px; margin-bottom:4px; - background-image: url("images/tabTop.png"); + background-image: url("../@{image-layout-tab-top}"); background-position:0 -248px; background-position:bottom; } @@ -318,7 +318,7 @@ height:15px; width:15px; margin: 0 auto; - background:url("../form/images/buttonArrows.png") no-repeat -75px 50%; + background:url("../@{image-form-button-arrows}") no-repeat -75px 50%; background-color: transparent; } .claro .dijitTabStripSlideRightIcon{ @@ -382,7 +382,7 @@ .claro .dijitTabContainerTabListNested .dijitTabActive .dijitTabContent { border:solid 1px @nestedtab-selected-border-color; padding: 3px; - background: @nestedtab-selected-background-color url("images/tabNested.png") repeat-x; + background: @nestedtab-selected-background-color url("../@{image-layout-tab-nested}") repeat-x; .transition-duration(.1s); } .claro .dijitTabContainerTabListNested .dijitTabChecked .dijitTabContent { -- cgit v1.2.3