fix(calendar): bring Calendar styles up to date with design

This commit is contained in:
theOrlin 2017-12-15 16:36:07 +02:00 коммит произвёл Иван Жеков
Родитель f6b51c98d8
Коммит 0db6c7951c
2 изменённых файлов: 29 добавлений и 5 удалений

Просмотреть файл

@ -9,6 +9,9 @@ $calendar-navigation-item-height: 2em;
$calendar-navigation-width: 5em; $calendar-navigation-width: 5em;
$calendar-view-width: 7 * $calendar-cell-size; $calendar-view-width: 7 * $calendar-cell-size;
$calendar-view-height: 7 * $calendar-cell-size + $calendar-header-height + $calendar-weekdays-height; $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') { @include exports('calendar/layout') {
@ -49,10 +52,11 @@ $calendar-view-height: 7 * $calendar-cell-size + $calendar-header-height + $cale
font-weight: normal; font-weight: normal;
} }
th { th {
padding: $calendar-cell-padding-y $calendar-cell-padding-x; padding: $calendar-header-cell-padding-y 0;
font-size: $font-size-xs; font-size: $font-size-xs;
font-weight: bold; font-weight: bold;
cursor: default; cursor: default;
opacity: $disabled-opacity;
} }
td { td {
cursor: pointer; cursor: pointer;
@ -155,8 +159,8 @@ $calendar-view-height: 7 * $calendar-cell-size + $calendar-header-height + $cale
} }
.k-alt, .k-alt,
.k-weekend, // .k-weekend,
.k-other-month { .k-other-month .k-link {
opacity: $disabled-opacity; opacity: $disabled-opacity;
} }

Просмотреть файл

@ -59,8 +59,7 @@
} }
} }
.k-alt, .k-alt {
.k-weekend:not(.k-calendar-infinite .k-weekend) {
background: darken( $widget-bg, 5 ); background: darken( $widget-bg, 5 );
} }
@ -118,6 +117,27 @@
box-shadow: inset 1px 0 $base-border; 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 );
}
}
}
}
} }
} }