From 0db6c7951c8e1c363e84933af7f07f23afbd2fc0 Mon Sep 17 00:00:00 2001 From: theOrlin Date: Fri, 15 Dec 2017 16:36:07 +0200 Subject: [PATCH] fix(calendar): bring Calendar styles up to date with design --- scss/calendar/_layout.scss | 10 +++++++--- scss/calendar/_theme.scss | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/scss/calendar/_layout.scss b/scss/calendar/_layout.scss index 3dd99db..a7908d9 100644 --- a/scss/calendar/_layout.scss +++ b/scss/calendar/_layout.scss @@ -9,6 +9,9 @@ $calendar-navigation-item-height: 2em; $calendar-navigation-width: 5em; $calendar-view-width: 7 * $calendar-cell-size; $calendar-view-height: 7 * $calendar-cell-size + $calendar-header-height + $calendar-weekdays-height; +$calendar-header-cell-padding-x: 8px !default; +$calendar-header-cell-padding-y: 8px !default; + @include exports('calendar/layout') { @@ -49,10 +52,11 @@ $calendar-view-height: 7 * $calendar-cell-size + $calendar-header-height + $cale font-weight: normal; } th { - padding: $calendar-cell-padding-y $calendar-cell-padding-x; + padding: $calendar-header-cell-padding-y 0; font-size: $font-size-xs; font-weight: bold; cursor: default; + opacity: $disabled-opacity; } td { cursor: pointer; @@ -155,8 +159,8 @@ $calendar-view-height: 7 * $calendar-cell-size + $calendar-header-height + $cale } .k-alt, - .k-weekend, - .k-other-month { + // .k-weekend, + .k-other-month .k-link { opacity: $disabled-opacity; } diff --git a/scss/calendar/_theme.scss b/scss/calendar/_theme.scss index 512fcaf..b781e45 100644 --- a/scss/calendar/_theme.scss +++ b/scss/calendar/_theme.scss @@ -59,8 +59,7 @@ } } - .k-alt, - .k-weekend:not(.k-calendar-infinite .k-weekend) { + .k-alt { background: darken( $widget-bg, 5 ); } @@ -118,6 +117,27 @@ box-shadow: inset 1px 0 $base-border; } } + + &:not(.k-infinite) { + .k-weekend { + background-color: darken($widget-bg, 2.35); + } + + .k-state-hover { + background-color: $node-hovered-bg; + } + + .k-content { + .k-state-selected, + .k-weekend .k-state-selected { + @include appearance( selected-node ); + + &.k-state-hover { + background-color: blend-multiply( $list-item-selected-bg, $list-item-hovered-bg ); + } + } + } + } } }