Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(NcSelect): Disabled colors #4217

Merged
merged 1 commit into from Jun 16, 2023
Merged

fix(NcSelect): Disabled colors #4217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/components/NcSelect/NcSelect.vue
View file
Open in desktop
Expand Up @@ -749,7 +749,7 @@
/**
* Array of options
*
* @type {Array<string | number | { [key: string | number]: any }>}

Check warning on line 752 in src/components/NcSelect/NcSelect.vue

View workflow job for this annotation

GitHub Actions / eslint 

Syntax error in type: Array<string | number | { [key: string | number]: any }>
*
* @see https://vue-select.org/api/props.html#options
*/
Expand Down Expand Up @@ -795,7 +795,7 @@
*
* The `v-model` directive may be used for two-way data binding
*
* @type {string | number | { [key: string | number]: any } | Array<any>}

Check warning on line 798 in src/components/NcSelect/NcSelect.vue

View workflow job for this annotation

GitHub Actions / eslint 

Syntax error in type: string | number | { [key: string | number]: any } | Array<any>
*
* @see https://vue-select.org/api/props.html#value
*/
Expand Down Expand Up @@ -955,11 +955,11 @@
--vs-line-height: var(--default-line-height);

/* Disabled State */
--vs-state-disabled-bg: var(--color-background-dark);
--vs-state-disabled-bg: var(--color-background-hover);
--vs-state-disabled-color: var(--color-text-maxcontrast);
--vs-state-disabled-controls-color: var(--color-text-maxcontrast);
--vs-state-disabled-cursor: not-allowed;
--vs-disabled-bg: var(--color-background-dark);
--vs-disabled-bg: var(--color-background-hover);
--vs-disabled-color: var(--color-text-maxcontrast);
--vs-disabled-cursor: not-allowed;

Expand Down Expand Up @@ -1025,6 +1025,11 @@
}

&.vs--disabled {
.vs__search,
.vs__selected {
color: var(--color-text-maxcontrast);
}

.vs__clear,
.vs__deselect {
display: none;
Expand Down