diff --git a/package.json b/package.json index 1ccdc326..076606e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.6", + "version": "1.0.7", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/input.scss b/src/styles/input.scss index c60f490e..65475223 100644 --- a/src/styles/input.scss +++ b/src/styles/input.scss @@ -140,6 +140,7 @@ $input-padding-left: $s-basic-spacing * 2 - $input-border-width; } &__icon { + color: var(--s-color-base-content-secondary); line-height: 1; width: $input-icon-width; } diff --git a/src/styles/neumorphism/button.scss b/src/styles/neumorphism/button.scss index c6bddb4c..7c516e1c 100644 --- a/src/styles/neumorphism/button.scss +++ b/src/styles/neumorphism/button.scss @@ -145,7 +145,7 @@ $neu-button-padding-mini: 3px 6px !default; ) { &:disabled, &:disabled:hover { color: $neu-button-text-color-disabled; - background-color: $background-color; + background: $background-color; border-color: $neu-button-border-color-disabled; box-shadow: $box-shadow; border-width: $border-width; @@ -181,6 +181,12 @@ $neu-button-padding-mini: 3px 6px !default; @include size('small', $neu-button-padding-small); @include size('mini', $neu-button-padding-mini); + &.is-loading { + &:before { + background-color: transparent; + } + } + &.s-primary { background: $neu-button-primary-background-color; border-color: $neu-button-primary-border-color; diff --git a/src/styles/neumorphism/card.scss b/src/styles/neumorphism/card.scss index f6bc1685..e453741b 100644 --- a/src/styles/neumorphism/card.scss +++ b/src/styles/neumorphism/card.scss @@ -1,7 +1,7 @@ @mixin status ($status: 'success') { &.s-status-#{$status} { - background: var(--s-color-status-#{$status}-background); color: var(--s-color-status-#{$status}); + background: var(--s-color-status-#{$status}-background); } } @@ -36,6 +36,10 @@ &.is-always-shadow, &.is-hover-shadow:hover, &.is-hover-shadow:focus { box-shadow: var(--s-shadow-element); + + &.s-pressed { + box-shadow: var(--s-shadow-element-pressed); + } } &.s-primary { diff --git a/src/styles/neumorphism/tooltip.scss b/src/styles/neumorphism/tooltip.scss index 28d6a68b..800cb1e1 100644 --- a/src/styles/neumorphism/tooltip.scss +++ b/src/styles/neumorphism/tooltip.scss @@ -1,17 +1,19 @@ $neu-tooltip-max-width: 236px !default; $neu-tooltip-padding: 6px 8px !default; -$neu-tooltip-line-height: $s-line-height-base !default; +$neu-tooltip-line-height: 12px !default; $neu-tooltip-background-color: var(--s-color-base-content-secondary) !default; .el-tooltip__popper.neumorphic { max-width: $neu-tooltip-max-width; padding: $neu-tooltip-padding; line-height: $neu-tooltip-line-height; + font-size: var(--s-font-size-extra-mini); - &.is-light { + &.is-light, + &.is-dark { background-color: $neu-tooltip-background-color; border-color: $neu-tooltip-background-color; - color: var(--s-color-utility-body); + color: var(--s-color-base-on-accent); .popper__arrow { border-bottom-color: $neu-tooltip-background-color;