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

[stable28] fix(styles): Add default styles for disabled elements #43710

Merged
merged 3 commits into from
Feb 21, 2024
Merged

[stable28] fix(styles): Add default styles for disabled elements #43710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdf4234
fix(styles): Replace deprecated CSS variables
susnux Feb 20, 2024
ce9f39e
fix(styles): Add default styles for disabled input elements
susnux Feb 20, 2024
211e808
chore: Build CSS from SCSS
susnux Feb 20, 2024
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
2 changes: 1 addition & 1 deletion core/css/inputs.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/css/inputs.css.map
View file
Open in desktop

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

45 changes: 29 additions & 16 deletions core/css/inputs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ input, textarea, select, button, div[contenteditable=true], div[contenteditable=
font-family: var(--font-face) !important;
}
.select2-container.select2-drop-above .select2-choice {
background-image: unset !important;
background-image: unset !important;
}

$default-height: 36px;
$opacity-disabled: .7;

/* Simple selector to allow easy overriding */
select,
Expand All @@ -44,13 +45,24 @@ div[contenteditable=false] {
}

/**
* color-text-lighter normal state
* color-text-lighter active state
* color-text-maxcontrast disabled state
* color-main-text normal state
* color-main-text active state
* color-text-maxcontrast disabled state
*/

button:not(.button-vue),
input:not([type='range']),
textarea {
&:disabled {
cursor: default;
color: var(--color-text-maxcontrast);
border-color: var(--color-border-dark);
opacity: $opacity-disabled;
}
}

input:not([type="range"]) {
outline: none;
outline: none;
}

/* Default global values */
Expand Down Expand Up @@ -91,7 +103,7 @@ button:not(
&:active {
outline: none;
background-color: var(--color-main-background);
color: var(--color-text-light);
color: var(--color-main-text);
}
}
&:focus-visible {
Expand Down Expand Up @@ -153,13 +165,13 @@ div[contenteditable=false] {
padding: 7px 6px;
font-size: 13px;
background-color: var(--color-main-background);
color: var(--color-text-lighter);
color: var(--color-text-maxcontrast);
border: 1px solid var(--color-background-darker);
outline: none;
border-radius: var(--border-radius);

background-color: var(--color-background-dark);
color: var(--color-text-lighter);
color: var(--color-text-maxcontrast);
cursor: default;
opacity: 0.5;
}
Expand All @@ -169,6 +181,7 @@ input {
&:not([type='radio']):not([type='checkbox']):not([type='range']):not([type='submit']):not([type='button']):not([type='reset']):not([type='color']):not([type='file']):not([type='image']) {
-webkit-appearance: textfield;
-moz-appearance: textfield;
appearance: textfield;
// force height for inline elements like inputs (not textarea, contenteditable...)
height: $default-height;
}
Expand Down Expand Up @@ -427,7 +440,7 @@ input {
vertical-align: middle;
border-radius: 50%;
margin: 0 6px 3px 3px;
border: 1px solid var(--color-text-lighter);
border: 1px solid var(--color-text-maxcontrast);
}
&:not(:disabled):not(:checked) + label:hover:before,
&:focus + label:before {
Expand All @@ -448,7 +461,7 @@ input {
border-color: var(--color-primary-element);
}
&:disabled + label:before {
border: 1px solid var(--color-text-lighter);
border: 1px solid var(--color-text-maxcontrast);
background-color: var(--color-text-maxcontrast) !important; /* override other status */
}
&:checked:disabled + label:before {
Expand Down Expand Up @@ -566,7 +579,7 @@ div.select2-drop {
padding: 12px;
background-color: transparent;
cursor: pointer;
color: var(--color-text-lighter);
color: var(--color-text-maxcontrast);
}
.select2-result {
&.select2-selected {
Expand All @@ -593,7 +606,7 @@ div.select2-container-multi {
white-space: nowrap;
text-overflow: ellipsis;
background: var(--color-main-background);
color: var(--color-text-lighter) !important;
color: var(--color-text-maxcontrast) !important;
box-sizing: content-box;
border-radius: var(--border-radius-large);
border: 2px solid var(--color-border-dark);
Expand All @@ -612,7 +625,7 @@ div.select2-container-multi {
& {
background-image: none;
background-color: var(--color-main-background);
color: var(--color-text-lighter);
color: var(--color-text-maxcontrast);
border: 1px solid var(--color-border-dark);
}
.select2-search-choice-close {
Expand Down Expand Up @@ -644,7 +657,7 @@ div.select2-container {
white-space: nowrap;
text-overflow: ellipsis;
background: var(--color-main-background);
color: var(--color-text-lighter) !important;
color: var(--color-text-maxcontrast) !important;
box-sizing: content-box;
border-radius: var(--border-radius-large);
border: 2px solid var(--color-border-dark);
Expand Down Expand Up @@ -701,7 +714,7 @@ div.select2-container {
padding-left: 5px;
background-image: none;
background-color: var(--color-main-background);
color: var(--color-text-lighter);
color: var(--color-text-maxcontrast);
border: 1px solid var(--color-border-dark);
display: inline-flex;
align-items: center;
Expand All @@ -718,7 +731,7 @@ div.select2-container {
display: list-item;
background-color: transparent;
cursor: pointer;
color: var(--color-text-lighter);
color: var(--color-text-maxcontrast);
a {
white-space: nowrap;
overflow: hidden;
Expand Down
2 changes: 1 addition & 1 deletion core/css/server.css
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading