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.

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

[stable25] Fix vue-select styles #35742

Merged
merged 1 commit into from
Dec 13, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix vue-select styles
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Pytal committed Dec 13, 2022
commit 8545a0eeccd86de8aff0c8e683d11d8a6c7820ce
166 changes: 134 additions & 32 deletions core/css/inputs.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/css/inputs.css.map
49 changes: 42 additions & 7 deletions core/css/inputs.scss
Original file line number Diff line number Diff line change
@@ -29,7 +29,11 @@ $default-height: 36px;

/* Simple selector to allow easy overriding */
select,
button:not(.button-vue),
button:not(
.button-vue,
/* "vs__" class prefix is used in the vue-select lib */
[class^="vs__"]
),
input,
textarea,
div[contenteditable=true],
@@ -54,7 +58,11 @@ div.select2-drop .select2-search input, // TODO: REMOVE WHEN DROPPING SELECT2
input[type='submit'],
input[type='button'],
input[type='reset'],
button:not(.button-vue), .button,
button:not(
.button-vue,
[class^="vs__"]
),
.button,
.pager li a {
margin: 3px 3px 3px 0;
padding: 7px 14px;
@@ -183,7 +191,11 @@ input {

/* 'Click' inputs */
select,
button:not(.button-vue), .button,
button:not(
.button-vue,
[class^="vs__"]
),
.button,
input[type='button'],
input[type='submit'],
input[type='reset'] {
@@ -200,7 +212,17 @@ input[type='reset'] {
}
}

input:not([type='range']):not(.input-field__input):not([type='submit']):not([type='button']):not([type='reset']):not(.multiselect__input):not(.select2-input):not(.action-input__input),
input:not(
[type='range'],
.input-field__input,
[type='submit'],
[type='button'],
[type='reset'],
.multiselect__input,
.select2-input,
.action-input__input,
[class^="vs__"]
),
select,
div[contenteditable=true],
textarea {
@@ -242,7 +264,11 @@ select {
}

select,
button:not(.button-vue), .button {
button:not(
.button-vue,
[class^="vs__"]
),
.button {
* {
cursor: pointer;
}
@@ -255,7 +281,11 @@ button:not(.button-vue), .button {
}

/* Buttons */
button:not(.button-vue), .button,
button:not(
.button-vue,
[class^="vs__"]
),
.button,
input[type='button'],
input[type='submit'],
input[type='reset'] {
@@ -273,7 +303,12 @@ input[type='reset'] {
color: #fff !important;
}
}
button:not(.button-vue):not(.action-button), .button {
button:not(
.button-vue,
.action-button,
[class^="vs__"]
),
.button {
> span {
/* icon position inside buttons */
&[class^='icon-'],
166 changes: 134 additions & 32 deletions core/css/server.css
2 changes: 1 addition & 1 deletion core/css/server.css.map

Large diffs are not rendered by default.