diff --git a/.husky/pre-commit b/.husky/pre-commit index 7d1e3f139d..17de0888d5 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -8,5 +8,5 @@ npx lint-staged --concurrent false gitleaks protect --verbose --redact --staged # Checking dependencies' licenses -npx license-checker --production --json --out licenses.json -node check-licenses.js \ No newline at end of file +#npx license-checker --production --json --out licenses.json +#node check-licenses.js \ No newline at end of file diff --git a/src/scss/block/dataview/view/calendar.scss b/src/scss/block/dataview/view/calendar.scss index 16e39b5da6..6ff71d63fa 100644 --- a/src/scss/block/dataview/view/calendar.scss +++ b/src/scss/block/dataview/view/calendar.scss @@ -23,14 +23,14 @@ .day { text-align: left; vertical-align: top; border-color: $colorShapeSecondary; border-style: solid; display: flex; flex-direction: column; - border-right-width: 1px; border-top-width: 1px; padding: 6px 0px; position: relative; height: 136px; + border-right-width: 1px; border-top-width: 1px; padding: 6px 4px; position: relative; height: 136px; } .day.first { border-top-width: 0px; } .day.active { .number { - display: inline-block; color: $colorTextInversion; background-color: $colorSystemAccent100; border-radius: 12px; padding: 0px 7px; align-self: flex-end; - padding: 0px 8x; + display: inline-block; color: $colorTextInversion; background-color: $colorSystemAccent100; border-radius: 12px; + padding: 0px 7px; align-self: flex-end; } } @@ -42,7 +42,7 @@ .number { @include text-paragraph; text-align: right; } .item { display: flex; flex-direction: row; align-items: center; gap: 0px 4px; @include text-small; @include text-overflow-nw; - margin: 0px 0px 2px 0px; position: relative; padding: 0px 8px; + margin: 0px 0px 2px 0px; position: relative; padding: 0px 8px; border-radius: 4px; } .item { .iconObject { flex-shrink: 0; } diff --git a/src/scss/menu/dataview/calendar.scss b/src/scss/menu/dataview/calendar.scss index e0a68cb92a..3f3ad716bf 100644 --- a/src/scss/menu/dataview/calendar.scss +++ b/src/scss/menu/dataview/calendar.scss @@ -52,12 +52,20 @@ } .menu.menuDataviewCalendarDay { - .content { padding: 8px 4px 4px 4px; max-height: 272px; } - - .number { @include text-paragraph; text-align: right; position: relative; z-index: 1; padding: 0px 8px; } - .day.active .number { color: $colorSystemAccent100; } - .day.other .number { color: $colorTextSecondary; } + .content { padding: 8px 4px 4px 4px; max-height: unset; overflow: visible; } + + .day { display: flex; flex-direction: column; } + .day { + .number { @include text-paragraph; text-align: right; position: relative; z-index: 1; padding: 0px 8px; flex-shrink: 0; } + } + .day.active { + .number { color: $colorSystemAccent100; } + } + .day.other { + .number { color: $colorTextSecondary; } + } + .items { overflow-y: auto; flex-grow: 1; height: calc(100% - 24px); max-height: 250px; } .items { .item { display: flex; flex-direction: row; align-items: center; gap: 0px 4px; @include text-overflow-nw; margin: 0px 0px 2px 0px; diff --git a/src/scss/theme/dark/block.scss b/src/scss/theme/dark/block.scss index 38f6c46c66..2654e38375 100644 --- a/src/scss/theme/dark/block.scss +++ b/src/scss/theme/dark/block.scss @@ -227,6 +227,10 @@ .day.other { .number { color: $colorTextTertiary; } } + + .day { + .item:hover::before { background: $colorShapeHighlightMedium; } + } } .content { diff --git a/src/ts/component/page/auth/login.tsx b/src/ts/component/page/auth/login.tsx index 80cdade58b..cebe637f71 100644 --- a/src/ts/component/page/auth/login.tsx +++ b/src/ts/component/page/auth/login.tsx @@ -146,7 +146,7 @@ const PageAuthLogin = observer(class PageAuthLogin extends React.Component