Skip to content

Commit 3265645

Browse files
committed
Stream line disabled input and select appearance
1 parent 511cdbf commit 3265645

6 files changed

Lines changed: 14 additions & 13 deletions

File tree

app/assets/builds/alchemy/admin.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/dark-theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/light-theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/assets/builds/alchemy/theme.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/stylesheets/alchemy/_themes.scss

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
--form-field-box-shadow: inset 0 0 1px var(--a-dark-grey);
8484
--form-field-label-color: var(--text-color-muted);
8585
--form-field-text-color: var(--text-color);
86-
--form-field-disabled-text-color: hsl(0deg, 0%, 53%);
87-
--form-field-disabled-bg-color: hsla(0deg, 0%, 20%, 0.5);
86+
--form-field-disabled-text-color: var(--form-field-text-color);
87+
--form-field-disabled-bg-color: transparent;
8888
--form-field-error-bg-color: hsl(0deg, 47%, 10%);
8989
--form-field-error-box-shadow: inset 0 0 1px hsla(0deg, 25%, 30%, 0.5);
9090

@@ -167,9 +167,9 @@
167167
--select-hover-text-color: var(--text-color);
168168
--select-background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" fill="hsl(200deg, 5%, 70%)" viewBox="0 0 24 24"><path d="M11.9997 13.1714L16.9495 8.22168L18.3637 9.63589L11.9997 15.9999L5.63574 9.63589L7.04996 8.22168L11.9997 13.1714Z"></path></svg>');
169169
--select-close-icon: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="hsl(200deg, 5%, 70%)"><path d="M11.9997 10.5865L16.9495 5.63672L18.3637 7.05093L13.4139 12.0007L18.3637 16.9504L16.9495 18.3646L11.9997 13.4149L7.04996 18.3646L5.63574 16.9504L10.5855 12.0007L5.63574 7.05093L7.04996 5.63672L11.9997 10.5865Z"></path></svg>');
170-
--select-disabled-background-color: var(--a-darker-grey);
170+
--select-disabled-background-color: transparent;
171171
--select-disabled-border-color: var(--a-grey);
172-
--select-disabled-text-color: var(--a-lighter-grey);
172+
--select-disabled-text-color: var(--select-text-color);
173173
--select-dropdown-background-color: var(--a-darker-grey);
174174
--select-dropdown-box-shadow: 0 var(--spacing-2) var(--spacing-2)
175175
hsla(0deg, 0%, 0%, 0.75);
@@ -357,8 +357,8 @@
357357
--form-field-box-shadow: inset 0 0 1px var(--color-grey_light);
358358
--form-field-label-color: var(--text-color);
359359
--form-field-text-color: var(--text-color);
360-
--form-field-disabled-text-color: hsl(0deg, 0%, 53%);
361-
--form-field-disabled-bg-color: hsla(0deg, 0%, 100%, 0.5);
360+
--form-field-disabled-text-color: var(--form-field-text-color);
361+
--form-field-disabled-bg-color: transparent;
362362
--form-field-error-bg-color: hsl(0deg, 47%, 96%);
363363
--form-field-error-box-shadow: inset 0 0 1px hsla(0deg, 25%, 69%, 0.5);
364364

@@ -439,8 +439,9 @@
439439
--select-hover-text-color: var(--color-white);
440440
--select-background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="hsla(224deg, 23%, 26%, 0.75)"><path d="M11.9999 13.1714L16.9497 8.22168L18.3639 9.63589L11.9999 15.9999L5.63599 9.63589L7.0502 8.22168L11.9999 13.1714Z"></path></svg>');
441441
--select-close-icon: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="hsla(224deg, 23%, 26%, 0.75)"><path d="M11.9997 10.5865L16.9495 5.63672L18.3637 7.05093L13.4139 12.0007L18.3637 16.9504L16.9495 18.3646L11.9997 13.4149L7.04996 18.3646L5.63574 16.9504L10.5855 12.0007L5.63574 7.05093L7.04996 5.63672L11.9997 10.5865Z"></path></svg>');
442-
--select-disabled-background-color: var(--color-grey_very_light);
442+
--select-disabled-background-color: transparent;
443443
--select-disabled-border-color: var(--border-inset-color);
444+
--select-disabled-text-color: var(--select-text-color);
444445
--select-dropdown-background-color: var(--color-white);
445446
--select-dropdown-box-shadow: 0 var(--spacing-2) var(--spacing-2)
446447
hsla(0deg, 0%, 0%, 0.15);

app/stylesheets/alchemy/admin/base.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ a {
8181
}
8282
}
8383

84-
a:focus,
85-
[tabindex]:focus {
84+
a:focus:not(.disabled),
85+
[tabindex]:focus:not(.disabled) {
8686
@include mixins.default-focus-style;
8787
}
8888

0 commit comments

Comments
 (0)