7525-devToTest #419

Merged
alexm merged 177 commits from 7525-devToTest into test 2024-06-04 08:06:27 +00:00
1 changed files with 3 additions and 6 deletions
Showing only changes of commit eaa0288f25 - Show all commits

View File

@ -153,10 +153,7 @@ const getEventAttrs = (timestamp) => {
const attrs = { const attrs = {
title: name, title: name,
style: style: color ? `background-color: ${color};` : '',
color && type !== 'holiday'
? `background-color: ${color};`
: 'background-color:#3d3d3d;',
label: timestamp.day, label: timestamp.day,
}; };
@ -247,12 +244,12 @@ watch(_year, (newValue) => {
&.--festive { &.--festive {
color: $negative; color: $negative;
border: 2px solid $negative; // border: 2px solid $negative;
} }
&.--holiday { &.--holiday {
& > span:nth-child(2) .block { & > span:nth-child(2) .block {
color: $negative; color: white;
} }
} }