From 421a5bde386d6417952e98d29c0e56fb52c9ad26 Mon Sep 17 00:00:00 2001 From: codecalm Date: Tue, 28 Jan 2020 00:33:30 +0100 Subject: [PATCH] flatpickt fixes --- scss/vendor/_flatpickr.scss | 61 +++++++++++++++++++++++++++++++------ scss/vendor/_selectize.scss | 4 +++ 2 files changed, 55 insertions(+), 10 deletions(-) diff --git a/scss/vendor/_flatpickr.scss b/scss/vendor/_flatpickr.scss index ad493fd2..836a9b68 100644 --- a/scss/vendor/_flatpickr.scss +++ b/scss/vendor/_flatpickr.scss @@ -1,11 +1,25 @@ .flatpickr-input { background: $input-bg !important; + + &.active { + border-color: $input-focus-border-color; + box-shadow: $input-focus-box-shadow; + } } .flatpickr-calendar { border: $input-border-width solid $input-border-color; border-radius: $input-border-radius; padding: .5rem; + font-size: inherit; + box-shadow: $dropdown-box-shadow; + user-select: none; + margin-top: -1px; + + &:before, + &:after { + content: none; + } .flatpickr-innerContainer, .flatpickr-rContainer, @@ -14,22 +28,22 @@ width: 100%; } + .dayContainer, + .flatpickr-day { + max-width: 100%; + min-width: 0; + } + &.inline { width: 100%; box-shadow: none; - - .dayContainer, - .flatpickr-day { - max-width: 100%; - min-width: 0; - } + margin: 0; } } .flatpickr-day { color: inherit; border-radius: $border-radius; - user-select: none; &.today { border-color: $border-color; @@ -45,13 +59,40 @@ span.flatpickr-weekday { } .flatpickr-months { + margin-bottom: .5rem; + + .flatpickr-current-month { + font-weight: 400; + } + .flatpickr-monthDropdown-months { appearance: none; font-weight: inherit; } - .flatpickr-prev-month svg, - .flatpickr-next-month svg { - display: block; + .flatpickr-prev-month, + .flatpickr-next-month { + position: static; + color: $text-muted; + + &:hover { + color: $body-color; + } + + svg { + display: block; + fill: currentColor !important; + } + } + + .numInputWrapper { + .cur-year { + font-weight: inherit; + } + + .arrowUp, + .arrowDown { + display: none; + } } } \ No newline at end of file diff --git a/scss/vendor/_selectize.scss b/scss/vendor/_selectize.scss index 9a22e0b8..a5047ded 100644 --- a/scss/vendor/_selectize.scss +++ b/scss/vendor/_selectize.scss @@ -36,6 +36,10 @@ background-color: inherit !important; color: inherit !important; + &.dropdown-active { + border-radius: $border-radius; + } + .selectize-control.single & { background: $form-select-bg escape-svg($form-select-indicator) $form-select-background; } -- GitLab