diff --git a/src/common/scss/shidoka-flatpickr-theme.scss b/src/common/scss/shidoka-flatpickr-theme.scss index eb3bb930..9677c825 100644 --- a/src/common/scss/shidoka-flatpickr-theme.scss +++ b/src/common/scss/shidoka-flatpickr-theme.scss @@ -3,7 +3,7 @@ $date-picker-background: var(--kd-color-date-and-time-picker-background-container); $icon-fill: var(--kd-color-date-and-time-picker-icon-default); $current-month-year: var(--kd-color-date-and-time-picker-text-title); -$input-background: var(--kd-color-background-ui-hollow-default); +$input-background: var(--kd-color-background-forms-default); $range-dates: var(--kd-color-date-and-time-picker-background-pressed); $selected-date: var(--kd-color-date-and-time-picker-background-default); $today: var(--kd-color-date-and-time-picker-border-focus); diff --git a/src/components/reusable/checkbox/checkbox.scss b/src/components/reusable/checkbox/checkbox.scss index 7eb5e9f3..0beb1638 100644 --- a/src/components/reusable/checkbox/checkbox.scss +++ b/src/components/reusable/checkbox/checkbox.scss @@ -12,7 +12,6 @@ $invalid-checkbox-background: var(--kd-color-status-error-dark); label { display: inline-flex; - align-items: center; gap: 10px; width: 100%; position: relative; @@ -41,6 +40,7 @@ input { justify-content: center; flex-shrink: 0; margin: 0; + margin-top: 4px; width: 16px; height: 16px; border: 2px solid var(--kd-color-border-forms-default); diff --git a/src/components/reusable/datePicker/datepicker.scss b/src/components/reusable/datePicker/datepicker.scss index a4b7877b..2d33c59b 100644 --- a/src/components/reusable/datePicker/datepicker.scss +++ b/src/components/reusable/datePicker/datepicker.scss @@ -8,7 +8,7 @@ input { display: block; width: 100%; - border: 1px solid var(--kd-color-border-ui-default); + border: 1px solid var(--kd-color-border-forms-default); border-radius: 4px; height: 48px; padding: 0 40px 0 16px; diff --git a/src/components/reusable/dropdown/dropdown.scss b/src/components/reusable/dropdown/dropdown.scss index ee9c7968..a4eacd35 100644 --- a/src/components/reusable/dropdown/dropdown.scss +++ b/src/components/reusable/dropdown/dropdown.scss @@ -31,7 +31,7 @@ align-items: center; -webkit-appearance: none; appearance: none; - border: 1px solid var(--kd-color-border-ui-default); + border: 1px solid var(--kd-color-border-forms-default); border-radius: 4px; height: 48px; padding: 0 48px 0 16px; @@ -39,18 +39,15 @@ font-weight: 400; white-space: nowrap; - background: var(--kd-color-background-container-default); + background: var(--kd-color-background-forms-default); - [searchable] & { - padding-right: 80px; - } - - &:not([disabled]):hover { - background-color: var(--kd-color-text-variant-inversed); + .input-custom { + border: none; + background: transparent; } - &:hover { - border: 1px solid var(--kd-color-border-ui-default); + [searchable] & { + padding-right: 80px; } span { @@ -113,7 +110,7 @@ max-height: 280px; overflow-y: auto; outline: none; - background: var(--kd-color-background-forms-search-bg); + background: var(--kd-color-background-forms-default); box-shadow: 0px 1px 2px 0px rgba(0, 0, 0, 0.12), 0px 4px 12px 0px rgba(0, 0, 0, 0.08); outline: 2px solid transparent; diff --git a/src/components/reusable/dropdown/dropdown.ts b/src/components/reusable/dropdown/dropdown.ts index 4993f8ec..24dc0142 100644 --- a/src/components/reusable/dropdown/dropdown.ts +++ b/src/components/reusable/dropdown/dropdown.ts @@ -297,13 +297,20 @@ export class Dropdown extends FormMixin(LitElement) { /> ` : html` - - ${this.multiple - ? this.placeholder + + placeholder=${this.multiple + ? this.placeholder + : this.placeholder} + readonly + tabindex="-1" + /> `} ${unsafeSVG(downIcon)} diff --git a/src/components/reusable/dropdown/dropdownOption.scss b/src/components/reusable/dropdown/dropdownOption.scss index b12eb751..a7c2fc4e 100644 --- a/src/components/reusable/dropdown/dropdownOption.scss +++ b/src/components/reusable/dropdown/dropdownOption.scss @@ -5,7 +5,7 @@ } li { - background-color: var(--kd-color-background-container-default); + background-color: var(--kd-color-background-ui-hollow-default); cursor: default; padding: 16px; transition: background-color 150ms ease-out; @@ -36,7 +36,7 @@ li { } &:hover { - background-color: transparent; + background-color: var(--kd-color-background-container-default); } } diff --git a/src/components/reusable/radioButton/radioButton.scss b/src/components/reusable/radioButton/radioButton.scss index 779ac836..4f6eef14 100644 --- a/src/components/reusable/radioButton/radioButton.scss +++ b/src/components/reusable/radioButton/radioButton.scss @@ -7,7 +7,6 @@ label { display: inline-flex; - align-items: center; gap: 10px; &[disabled] { @@ -28,11 +27,12 @@ input { align-items: center; justify-content: center; margin: 0; + margin-top: 2px; width: 18px; height: 18px; - border: 2px solid var(--kd-color-border-ui-default); + border: 2px solid var(--kd-color-border-forms-default); border-radius: 50%; - background-color: transparent; + background: var(--kd-color-background-ui-hollow-default); outline: 2px solid transparent; transition: background-color 150ms ease-out, border-color 150ms ease-out, outline-color 150ms ease-out;