Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

chore(dropdowns): update dropdowns styling because of changed rendering #388

Merged
merged 3 commits into from Apr 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions scss/common/_forms.scss
Expand Up @@ -39,6 +39,7 @@
.k-datepicker,
.k-datetimepicker,
.k-dropdown,
.k-multiselect,
.k-numerictextbox,
.k-maskedtextbox,
.k-timepicker {
Expand Down
4 changes: 4 additions & 0 deletions scss/dropdownlist/_layout.scss
Expand Up @@ -16,4 +16,8 @@
}
}
}

.k-dropdown-wrap {
outline: 0;
}
}
7 changes: 7 additions & 0 deletions scss/input/_theme.scss
Expand Up @@ -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 {
Expand Down
4 changes: 0 additions & 4 deletions scss/multiselect/_layout.scss
Expand Up @@ -3,8 +3,6 @@
// Base
.k-multiselect {
@include border-radius( $border-radius );
border-width: 1px;
border-style: solid;
width: 100%;

// Compact
Expand Down Expand Up @@ -42,10 +40,8 @@
}
}


.k-multiselect-wrap {
min-height: calc( #{$input-inner-calc-size} );
border-width: 0;
padding-right: ($padding-x * 3);
cursor: text;

Expand Down
23 changes: 15 additions & 8 deletions scss/multiselect/_theme.scss
Expand Up @@ -22,31 +22,38 @@
// 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;
}
}

.k-multiselect-wrap {
@include appearance( input );

> .k-readonly {
opacity: .6;
}

&:hover {
@include appearance( hovered-input );
}
}

}