From 63b18b3360f0dde7153b2477bd58cd50876cab8a Mon Sep 17 00:00:00 2001 From: 0x009922 Date: Fri, 18 Jun 2021 14:53:21 +0300 Subject: [PATCH 1/5] Fix broken `SInput` error state (#225) * fix: input & textarea error style * fix: "placeholder" error color * fix: handle autofill case * build: up version to 0.9.7 --- package.json | 2 +- src/styles/form.scss | 28 ++++++---------------------- src/styles/input.scss | 7 +++++++ 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index a56f1866..e9824326 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.9.6", + "version": "0.9.7", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/form.scss b/src/styles/form.scss index 12d4a6af..fa70b9a9 100644 --- a/src/styles/form.scss +++ b/src/styles/form.scss @@ -23,37 +23,21 @@ } } > [class^="s-input"]:not(.s-disabled) { + background-color: var(--s-color-status-error-background); + border-color: var(--s-color-status-error); + .s-placeholder { color: var(--s-color-status-error); - background-color: var(--s-color-status-error-background); } + input, textarea { - background-color: var(--s-color-status-error-background); &::placeholder { color: var(--s-color-status-error); } } - &:hover { - .s-placeholder, - .el-input > input, - .el-textarea > textarea { - background-color: var(--s-color-status-error-background); - } - .el-input > input, - .el-textarea > textarea { - border-color: var(--s-color-status-error); - } - } + &.s-focused { - .s-placeholder, - .el-input > input, - .el-textarea > textarea { - background-color: var(--s-color-base-on-accent); - } - .el-input > input, - .el-textarea > textarea { - border-color: var(--s-color-status-error); - } + background-color: var(--s-color-base-on-accent); } } } diff --git a/src/styles/input.scss b/src/styles/input.scss index 09dc378d..4491eff6 100644 --- a/src/styles/input.scss +++ b/src/styles/input.scss @@ -93,6 +93,10 @@ $input-padding-left: $s-basic-spacing * 2 - $input-border-width; } } + &.s-autofill { + background: rgb(232, 240, 254); // chrome auto-fill background + } + &--prefix:not(.s-textarea) { .s-placeholder { padding-left: $input-icon-width + $s-basic-spacing; @@ -171,6 +175,9 @@ $input-padding-left: $s-basic-spacing * 2 - $input-border-width; &:-webkit-autofill { color: var(--s-color-base-content-primary) !important; animation-name: onAutoFillStart; // Expose a hook for JavaScript when auto fill is shown + + // removing user-agent background with hack + transition: background-color 5000s ease-in-out 0s; } &:not(:-webkit-autofill) { animation-name: onAutoFillCancel; // Expose a hook for JS onAutoFillCancel From a10ba83c9de12847e5dfe6b98f8666ede7ae7a94 Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Tue, 22 Jun 2021 13:48:45 +0300 Subject: [PATCH 2/5] PW-179: Font Feature Settings Removing (#229) * Removed font feature settings. * Refactored due to PR comments. --- package.json | 2 +- src/styles/root.scss | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index e9824326..2104a951 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.9.7", + "version": "0.9.8", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/root.scss b/src/styles/root.scss index c6cd697e..741d0318 100644 --- a/src/styles/root.scss +++ b/src/styles/root.scss @@ -68,14 +68,14 @@ --s-letter-spacing-large: #{$s-letter-spacing-large}; --s-letter-spacing-extra-large: #{$s-letter-spacing-extra-large}; // Font Feature Settings - --s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on; // $s-font-feature-settings-common - --s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on; // $s-font-feature-settings-heading - --s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on; // $s-font-feature-settings-caps-heading - --s-font-feature-settings-caps: "case" on; // $s-font-feature-settings-caps - --s-font-feature-settings-singleline: "salt" on, "case" on; // $s-font-feature-settings-singleline - --s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on; // $s-font-feature-settings-card-title - --s-font-feature-settings-input: "tnum" on, "lnum" on; // $s-font-feature-settings-input - --s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on; // $s-font-feature-settings-button + --s-font-feature-settings-common: #{$s-font-feature-settings-common}; + --s-font-feature-settings-heading: #{$s-font-feature-settings-heading}; + --s-font-feature-settings-caps-heading: #{$s-font-feature-settings-caps-heading}; + --s-font-feature-settings-caps: #{$s-font-feature-settings-caps}; + --s-font-feature-settings-singleline: #{$s-font-feature-settings-singleline}; + --s-font-feature-settings-card-title: #{$s-font-feature-settings-card-title}; + --s-font-feature-settings-input: #{$s-font-feature-settings-input}; + --s-font-feature-settings-button: #{$s-font-feature-settings-button}; // Size --s-size-mini: #{$s-size-mini}; --s-size-small: #{$s-size-small}; From d7f81026c2b7648455bc6d1eea9519e7224cda93 Mon Sep 17 00:00:00 2001 From: 0x009922 Date: Tue, 22 Jun 2021 14:17:48 +0300 Subject: [PATCH 3/5] fix: set fixed `SInput` height instead of `min-height` (#230) * fix: set fixed height instead of `min-height` * build: up version to 0.9.8 --- src/styles/input.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/styles/input.scss b/src/styles/input.scss index 4491eff6..47b03225 100644 --- a/src/styles/input.scss +++ b/src/styles/input.scss @@ -24,7 +24,7 @@ $input-padding-left: $s-basic-spacing * 2 - $input-border-width; border-style: solid; border-width: $input-border-width; font-family: $s-font-family-default; - min-height: $s-size-big; + height: $s-size-big; padding: $input-padding-top $input-padding-left; position: relative; width: 100%; @@ -46,11 +46,11 @@ $input-padding-left: $s-basic-spacing * 2 - $input-border-width; } &.s-size-medium { - min-height: $s-size-medium; + height: $s-size-medium; } &.s-size-small { - min-height: $s-size-small; + height: $s-size-small; } .s-placeholder { From d3d46acbb2e0d5e71ed0157de3216f075a83b13a Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Wed, 23 Jun 2021 00:15:14 +0300 Subject: [PATCH 4/5] Revert font feature settings changes (#232) * Revert "PW-179: Font Feature Settings Removing (#229)" This reverts commit a10ba83c9de12847e5dfe6b98f8666ede7ae7a94. * Updated ui lib version. --- package.json | 2 +- src/styles/root.scss | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 2104a951..4530f219 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.9.8", + "version": "0.9.9", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/root.scss b/src/styles/root.scss index 741d0318..c6cd697e 100644 --- a/src/styles/root.scss +++ b/src/styles/root.scss @@ -68,14 +68,14 @@ --s-letter-spacing-large: #{$s-letter-spacing-large}; --s-letter-spacing-extra-large: #{$s-letter-spacing-extra-large}; // Font Feature Settings - --s-font-feature-settings-common: #{$s-font-feature-settings-common}; - --s-font-feature-settings-heading: #{$s-font-feature-settings-heading}; - --s-font-feature-settings-caps-heading: #{$s-font-feature-settings-caps-heading}; - --s-font-feature-settings-caps: #{$s-font-feature-settings-caps}; - --s-font-feature-settings-singleline: #{$s-font-feature-settings-singleline}; - --s-font-feature-settings-card-title: #{$s-font-feature-settings-card-title}; - --s-font-feature-settings-input: #{$s-font-feature-settings-input}; - --s-font-feature-settings-button: #{$s-font-feature-settings-button}; + --s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on; // $s-font-feature-settings-common + --s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on; // $s-font-feature-settings-heading + --s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on; // $s-font-feature-settings-caps-heading + --s-font-feature-settings-caps: "case" on; // $s-font-feature-settings-caps + --s-font-feature-settings-singleline: "salt" on, "case" on; // $s-font-feature-settings-singleline + --s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on; // $s-font-feature-settings-card-title + --s-font-feature-settings-input: "tnum" on, "lnum" on; // $s-font-feature-settings-input + --s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on; // $s-font-feature-settings-button // Size --s-size-mini: #{$s-size-mini}; --s-size-small: #{$s-size-small}; From 81b9db06779609c82d9bb0ea6d003106b9f34061 Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Wed, 23 Jun 2021 00:15:14 +0300 Subject: [PATCH 5/5] Revert font feature settings changes (#232) * Revert "PW-179: Font Feature Settings Removing (#229)" This reverts commit a10ba83c9de12847e5dfe6b98f8666ede7ae7a94. * Updated ui lib version. --- src/styles/root.scss | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/styles/root.scss b/src/styles/root.scss index 741d0318..c6cd697e 100644 --- a/src/styles/root.scss +++ b/src/styles/root.scss @@ -68,14 +68,14 @@ --s-letter-spacing-large: #{$s-letter-spacing-large}; --s-letter-spacing-extra-large: #{$s-letter-spacing-extra-large}; // Font Feature Settings - --s-font-feature-settings-common: #{$s-font-feature-settings-common}; - --s-font-feature-settings-heading: #{$s-font-feature-settings-heading}; - --s-font-feature-settings-caps-heading: #{$s-font-feature-settings-caps-heading}; - --s-font-feature-settings-caps: #{$s-font-feature-settings-caps}; - --s-font-feature-settings-singleline: #{$s-font-feature-settings-singleline}; - --s-font-feature-settings-card-title: #{$s-font-feature-settings-card-title}; - --s-font-feature-settings-input: #{$s-font-feature-settings-input}; - --s-font-feature-settings-button: #{$s-font-feature-settings-button}; + --s-font-feature-settings-common: "tnum" on, "lnum" on, "case" on, "salt" on, "ss01" on; // $s-font-feature-settings-common + --s-font-feature-settings-heading: "tnum" on, "lnum" on, "salt" on, "case" on; // $s-font-feature-settings-heading + --s-font-feature-settings-caps-heading: "tnum" on, "lnum" on, "case" on; // $s-font-feature-settings-caps-heading + --s-font-feature-settings-caps: "case" on; // $s-font-feature-settings-caps + --s-font-feature-settings-singleline: "salt" on, "case" on; // $s-font-feature-settings-singleline + --s-font-feature-settings-card-title: "tnum" on, "lnum" on, "ss01" on; // $s-font-feature-settings-card-title + --s-font-feature-settings-input: "tnum" on, "lnum" on; // $s-font-feature-settings-input + --s-font-feature-settings-button: "tnum" on, "lnum" on, "salt" on; // $s-font-feature-settings-button // Size --s-size-mini: #{$s-size-mini}; --s-size-small: #{$s-size-small};