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 --- lib/dijit/themes/claro/Calendar.less | 74 +++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 34 deletions(-) (limited to 'lib/dijit/themes/claro/Calendar.less') diff --git a/lib/dijit/themes/claro/Calendar.less b/lib/dijit/themes/claro/Calendar.less index ec6aa4696..55decd3b4 100644 --- a/lib/dijit/themes/claro/Calendar.less +++ b/lib/dijit/themes/claro/Calendar.less @@ -37,12 +37,13 @@ .claro .dijitCalendar { border:solid 1px @border-color; background-color: @calendar-background-color; - background-image:url("images/calendarContainerImages.png"); + background-image:url(@image-calendar-container); background-position:0 -448px; background-repeat:repeat-x; text-align:center; padding:6px 5px 3px 5px; .border-radius(4px); + border-collapse: separate; // in case user CSS has set border-collapse: collapse for tables } .dj_ie6 .claro .dijitCalendar { background-image:none; @@ -50,7 +51,7 @@ .claro .dijitCalendar img { border:none; } -.claro .dijitCalendarHover, +.claro .dijitCalendarHover, .claro .dijitCalendar:hover, .claro .dijitCalendarActive { /* treat dijitCalenderActive like hover since there's * no concept of clicking a Calendar as a whole (although you can click things inside the calendar) @@ -73,25 +74,29 @@ .claro .dijitCalendarIncrementControl { width:18px; height:16px; - background-image: url("images/calendarArrows.png"); + background-image: url(@image-calendar-arrows); background-repeat: no-repeat; } .dj_ie6 .claro .dijitCalendarIncrementControl { - background-image: url("images/calendarArrows8bit.png"); + background-image: url(@image-calendar-arrows-ie6); } .claro .dijitCalendarIncrease { background-position:-18px 0; } -.claro .dijitCalendarArrowHover .dijitCalendarDecrease { +.claro .dijitCalendarArrowHover .dijitCalendarDecrease, +.claro .dijitCalendarArrow:hover .dijitCalendarDecrease { background-position:-36px 0; } -.claro .dijitCalendarArrowHover .dijitCalendarIncrease { +.claro .dijitCalendarArrowHover .dijitCalendarIncrease, +.claro .dijitCalendarArrow:hover .dijitCalendarIncrease { background-position:-55px 0; } -.claro .dijitCalendarArrowActive .dijitCalendarDecrease { +.claro .dijitCalendarArrowActive .dijitCalendarDecrease, +.claro .dijitCalendarArrow:active .dijitCalendarDecrease { background-position:-72px 0; } -.claro .dijitCalendarArrowActive .dijitCalendarIncrease { +.claro .dijitCalendarArrowActive .dijitCalendarIncrease, +.claro .dijitCalendarArrow:active .dijitCalendarIncrease { background-position:-91px 0; } .claro .dijitA11ySideArrow { @@ -99,23 +104,23 @@ display: none; } - -.claro .dijitDayLabels th { - padding:0 4px 0 4px; - font-weight:bold; - text-align:center; -} .claro .dijitCalendarDayLabelTemplate { padding-bottom:0; text-align:center; border-bottom:1px solid @border-color; - font-size:0.909em; padding:0 3px 2px; } +.claro .dijitCalendarDayLabel { + padding:0 4px 0 4px; + font-weight:bold; + font-size:0.909em; + text-align:center; + color: @text-color; +} .claro .dijitCalendarDateTemplate { text-align:center; background-color:@calendar-currentmonth-background-color; - background-image:url("images/calendarContainerImages.png"); + background-image:url(@image-calendar-container); background-position:0 0; background-repeat:repeat-x; border-bottom: 1px solid @minor-border-color; @@ -125,6 +130,7 @@ font-weight:bold; letter-spacing:.05em; text-align:center; + color: @text-color; } .dj_ie6 .claro .dijitCalendarDateTemplate { background-image: none; @@ -157,8 +163,9 @@ padding: 1px 2px 2px 2px; } .claro .dijitCalendarYearLabel { - padding:2px 0 0 0; - margin:0; + padding: 2px 0 0 0; + margin: 0; + font-size: 1.17em; } .claro .dijitCalendarYearLabel span { /* trying to center next/current/previous year vertically, doesn't work on IE6/7 though */ @@ -178,14 +185,15 @@ } /* End Normal Calendar Style */ /* Hovered Calendar Style */ -.claro .dijitCalendarHoveredDate .dijitCalendarDateLabel{ +.claro .dijitCalendarHoveredDate .dijitCalendarDateLabel, +.claro .dijitCalendarEnabledDate:hover .dijitCalendarDateLabel { background-color:@hovered-background-color; border:solid 1px @hovered-border-color; color:@hovered-text-color; .transition-duration(.2s); } -.claro .dijitCalendarNextYearHover, -.claro .dijitCalendarPreviousYearHover { +.claro .dijitCalendarNextYearHover, .claro .dijitCalendarNextYear:hover, +.claro .dijitCalendarPreviousYearHover, .claro .dijitCalendarPreviousYear:hover { color:@hovered-text-color; border:solid 1px @calendar-button-hovered-border-color; padding: 0 5px 0 5px; /* reduced by 1 to make room for border */ @@ -193,14 +201,15 @@ } /* End Hovered Calendar Style */ /* Active Calendar Style */ -.claro .dijitCalendarNextYearActive, -.claro .dijitCalendarPreviousYearActive { +.claro .dijitCalendarNextYearActive, .claro .dijitCalendarNextYear:active +.claro .dijitCalendarPreviousYearActive, .claro .dijitCalendarPreviousYear:active { border: solid 1px @calendar-button-pressed-border-color; padding: 0 5px 0 5px; /* reduced by 1 to make room for border */ background-color:@calendar-button-pressed-background-color; } -.claro .dijitCalendarActiveDate .dijitCalendarDateLabel { - background-image:url("images/calendarContainerImages.png"); +.claro .dijitCalendarActiveDate .dijitCalendarDateLabel, +.claro .dijitCalendarEnabledDate:active .dijitCalendarDateLabel { + background-image:url(@image-calendar-container); background-position:0 -300px; background-color: @calendar-date-pressed-background-color; border:solid 1px @calendar-date-pressed-border-color; @@ -219,13 +228,8 @@ /* End Selected Calendar Style */ /* Disabled Calendar Style*/ .claro .dijitCalendarDisabledDate .dijitCalendarDateLabel { - text-decoration:line-through; - - /* override hover effects above, hover and click on disabled date should have no effect */ - background-color: transparent; - border-width: 0; - padding: 4px 6px 4px 5px; color: @disabled-text-color; + text-decoration:line-through; } /* End Disabled Calendar Style */ @@ -246,7 +250,8 @@ border:solid 1px @border-color; .box-shadow(0 0 0 rgba(0,0,0,0)); } -.claro .dijitCalendar .dijitDropDownButtonHover .dijitButtonNode { +.claro .dijitCalendar .dijitDropDownButtonHover .dijitButtonNode, +.claro .dijitCalendar .dijitDropDownButton:hover .dijitButtonNode { background-color: @calendar-button-hovered-background-color; border:solid 1px @calendar-button-hovered-border-color; } @@ -264,10 +269,11 @@ border-bottom: solid 1px @menu-background-color; padding: 2px 0; } -.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabelHover { +.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabelHover, +.claro .dijitCalendarMonthMenu .dijitCalendarMonthLabel:hover { background-color: @hovered-background-color; border-color: @hovered-border-color; border-width:1px 0; - background-image: url("images/commonHighlight.png"); + background-image: url(@image-common-highlight); background-repeat:repeat-x; } -- cgit v1.2.3