diff --git a/scss/common/_forms.scss b/scss/common/_forms.scss index f4ca6767..a7358d97 100644 --- a/scss/common/_forms.scss +++ b/scss/common/_forms.scss @@ -39,6 +39,7 @@ .k-datepicker, .k-datetimepicker, .k-dropdown, + .k-multiselect, .k-numerictextbox, .k-maskedtextbox, .k-timepicker { diff --git a/scss/dropdownlist/_layout.scss b/scss/dropdownlist/_layout.scss index 8041d8a2..f8ff28a9 100644 --- a/scss/dropdownlist/_layout.scss +++ b/scss/dropdownlist/_layout.scss @@ -16,4 +16,8 @@ } } } + + .k-dropdown-wrap { + outline: 0; + } } \ No newline at end of file diff --git a/scss/input/_theme.scss b/scss/input/_theme.scss index 7b77c83a..53f0ced5 100644 --- a/scss/input/_theme.scss +++ b/scss/input/_theme.scss @@ -50,6 +50,13 @@ background-color: $accent; color: $accent-contrast; } + + .k-state-disabled & { + &::selection { + color: $input-text; + background-color: transparent; + } + } } .k-radio + .k-radio-label { diff --git a/scss/multiselect/_layout.scss b/scss/multiselect/_layout.scss index e847c0d5..a19379a2 100644 --- a/scss/multiselect/_layout.scss +++ b/scss/multiselect/_layout.scss @@ -3,8 +3,6 @@ // Base .k-multiselect { @include border-radius( $border-radius ); - border-width: 1px; - border-style: solid; width: 100%; // Compact @@ -42,10 +40,8 @@ } } - .k-multiselect-wrap { min-height: calc( #{$input-inner-calc-size} ); - border-width: 0; padding-right: ($padding-x * 3); cursor: text; diff --git a/scss/multiselect/_theme.scss b/scss/multiselect/_theme.scss index 629c37f1..3d4a9c8b 100644 --- a/scss/multiselect/_theme.scss +++ b/scss/multiselect/_theme.scss @@ -22,21 +22,22 @@ // Focused state &:focus, &.k-state-focused { - @include appearance( focused-button ); - .k-icon { opacity: 1; } } } - &:hover, - &.k-state-hover { - @include appearance( hovered-input ); + &.k-state-focused { + .k-multiselect-wrap { + @include appearance( focused-input ); + } + } + &.k-disabled { + .k-multiselect-wrap { + @include appearance( disabled-input ); + } } - - &.k-state-focused { @include appearance( focused-input ); } - &.k-disabled { @include appearance( disabled-input ); } .k-i-loading { background-color: $input-bg; @@ -44,9 +45,15 @@ } .k-multiselect-wrap { + @include appearance( input ); + > .k-readonly { opacity: .6; } + + &:hover { + @include appearance( hovered-input ); + } } } \ No newline at end of file