diff --git a/src/styles/form.scss b/src/styles/form.scss index b3b125ad..8dca0e92 100644 --- a/src/styles/form.scss +++ b/src/styles/form.scss @@ -25,8 +25,12 @@ } } > [class^="s-input"]:not(.s-disabled) { - background-color: var(--s-color-status-error-background); border-color: var(--s-color-status-error); + background-color: var(--s-color-status-error-background); + + [design-system-theme="dark"] & { + background-color: var(--s-color-base-background); + } .s-placeholder { color: var(--s-color-status-error); diff --git a/src/styles/neumorphism/card.scss b/src/styles/neumorphism/card.scss index 10b431f0..9ab59e6e 100644 --- a/src/styles/neumorphism/card.scss +++ b/src/styles/neumorphism/card.scss @@ -1,10 +1,13 @@ @mixin status ($status: 'success') { &.s-status-#{$status} { color: var(--s-color-status-#{$status}); - background: var(--s-color-status-#{$status}-background); - [design-system-theme="dark"] & { - --s-color-status-#{$status}: var(--s-color-base-on-accent); + &.s-primary { + background: var(--s-color-status-#{$status}-background); + + [design-system-theme="dark"] & { + --s-color-status-#{$status}: var(--s-color-base-on-accent); + } } } } @@ -46,7 +49,7 @@ } } - &.s-primary { + &.s-primary.s-status-default { background: var(--s-color-utility-surface); &.is-always-shadow, &.is-hover-shadow:hover, &.is-hover-shadow:focus { diff --git a/src/styles/neumorphism/tabs.scss b/src/styles/neumorphism/tabs.scss index b744d1cf..842011bb 100644 --- a/src/styles/neumorphism/tabs.scss +++ b/src/styles/neumorphism/tabs.scss @@ -1,18 +1,11 @@ -$neu-tab-shadow: var(--s-shadow-element); -$neu-tab-shadow--dark: var(--s-shadow-element-pressed); -$neu-tabs-shadow: var(--s-shadow-element-pressed); -$neu-tabs-shadow--dark: var(--s-shadow-element); +$neu-tab-shadow: var(--s-shadow-element-pressed); +$neu-tabs-shadow: var(--s-shadow-element); :root { --neu-tab-shadow: #{$neu-tab-shadow}; --neu-tabs-shadow: #{$neu-tabs-shadow}; } -[design-system-theme="dark"] { - --neu-tab-shadow: #{$neu-tab-shadow--dark}; - --neu-tabs-shadow: #{$neu-tabs-shadow--dark}; -} - .s-tabs.neumorphic { .el-tabs { &__active-bar { diff --git a/src/styles/theme/dark.scss b/src/styles/theme/dark.scss index f45275d2..7bffc002 100644 --- a/src/styles/theme/dark.scss +++ b/src/styles/theme/dark.scss @@ -27,9 +27,9 @@ $s-color-utility-body--dark: #5D2F73 !default; $s-color-utility-surface--dark: #592D71 !default; $s-color-utility-overlay--dark: rgba(41, 0, 71, 0.9) !default; // Status colors -$s-color-status-success--dark: #B9EBDB !default; -$s-color-status-warning--dark: #C6E2FF !default; -$s-color-status-error--dark: #FFD8EB !default; +$s-color-status-success--dark: #34AD87 !default; +$s-color-status-warning--dark: #479AEF !default; +$s-color-status-error--dark: #F754A3 !default; $s-color-status-success-background--dark: #34AD87 !default; $s-color-status-warning-background--dark: #479AEF !default; $s-color-status-error-background--dark: #F754A3 !default;