From b2add0c9845437f0f142eae5dbd2fdd4a2eeabaa Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Wed, 24 Feb 2021 14:26:56 +0300 Subject: [PATCH 1/6] add input inner offset for s-input-type --- src/styles/select.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/styles/select.scss b/src/styles/select.scss index f66d5f4d..ba74e5d9 100644 --- a/src/styles/select.scss +++ b/src/styles/select.scss @@ -59,6 +59,13 @@ } &.s-input-type { .el-select { + .el-input { + &--prefix { + .el-input__inner{ + padding-left: 44px; + } + } + } .el-input__inner { height: $s-size-big; padding: 0 15px; From beed8ad76bcc763c0cdcee366256bb308317bfc5 Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Wed, 24 Feb 2021 16:49:30 +0300 Subject: [PATCH 2/6] add option padding --- src/components/Select/SOption.vue | 2 +- src/styles/index.scss | 1 + src/styles/option.scss | 4 ++++ src/styles/variables.scss | 5 +++++ 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 src/styles/option.scss diff --git a/src/components/Select/SOption.vue b/src/components/Select/SOption.vue index 602733fe..372a6719 100644 --- a/src/components/Select/SOption.vue +++ b/src/components/Select/SOption.vue @@ -1,5 +1,5 @@ diff --git a/src/styles/index.scss b/src/styles/index.scss index 4eef760e..93009ec5 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -16,6 +16,7 @@ @import "./json-input"; @import "./layout"; @import "./menu"; +@import "./option"; @import "./pagination"; @import "./radio"; @import "./scroll-sections"; diff --git a/src/styles/option.scss b/src/styles/option.scss new file mode 100644 index 00000000..9b1ba403 --- /dev/null +++ b/src/styles/option.scss @@ -0,0 +1,4 @@ +.s-option { + padding-left: $s-padding-input; + padding-right: $s-padding-input; +} \ No newline at end of file diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 6e867af2..a19f20e7 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -48,6 +48,9 @@ $s-size-medium: 40px !default; $s-size-small: 32px !default; $s-size-mini: 24px !default; +// Padding +$s-padding-input: 16px; + $s-border-radius-base: 4px; $s-border-radius-mini: $s-border-radius-base !default; $s-border-radius-small: $s-border-radius-base * 2 !default; @@ -153,6 +156,8 @@ $--breakpoints-spec: ( --s-size-small: #{$s-size-small}; --s-size-medium: #{$s-size-medium}; --s-size-big: #{$s-size-big}; + // Padding + --s-padding-input:#{$s-padding-input}; // Border Radius --s-border-radius-mini: #{$s-border-radius-mini}; --s-border-radius-small: #{$s-border-radius-small}; From c76b8de5f41cd022e29ecffd37631d8bcfdbeeb7 Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Thu, 25 Feb 2021 10:02:06 +0300 Subject: [PATCH 3/6] up library version to 0.7.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ff0bbeee..e89f36d3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.7.4", + "version": "0.7.5", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/" From 15f6d8a4994ae9e71842d5a3b81d6b8525acbf8e Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Thu, 25 Feb 2021 10:31:20 +0300 Subject: [PATCH 4/6] fixes after review --- src/styles/select.scss | 2 +- src/styles/variables.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/select.scss b/src/styles/select.scss index ba74e5d9..152c9288 100644 --- a/src/styles/select.scss +++ b/src/styles/select.scss @@ -61,7 +61,7 @@ .el-select { .el-input { &--prefix { - .el-input__inner{ + .el-input__inner { padding-left: 44px; } } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index a19f20e7..30254a87 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -157,7 +157,7 @@ $--breakpoints-spec: ( --s-size-medium: #{$s-size-medium}; --s-size-big: #{$s-size-big}; // Padding - --s-padding-input:#{$s-padding-input}; + --s-padding-input: #{$s-padding-input}; // Border Radius --s-border-radius-mini: #{$s-border-radius-mini}; --s-border-radius-small: #{$s-border-radius-small}; From 845a2bd12489d36e7474f4a1ea74db5c871e8890 Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Thu, 25 Feb 2021 10:48:20 +0300 Subject: [PATCH 5/6] use variables in offsets --- src/stories/Select/SSelect.stories.ts | 1 + src/styles/select.scss | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/stories/Select/SSelect.stories.ts b/src/stories/Select/SSelect.stories.ts index b901094f..1ee71130 100644 --- a/src/stories/Select/SSelect.stories.ts +++ b/src/stories/Select/SSelect.stories.ts @@ -39,6 +39,7 @@ export const configurable = () => ({ :popper-class="borderRadius" @change="handleChange" > +
123
Date: Thu, 25 Feb 2021 10:56:11 +0300 Subject: [PATCH 6/6] remove test code from story --- src/stories/Select/SSelect.stories.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/stories/Select/SSelect.stories.ts b/src/stories/Select/SSelect.stories.ts index 1ee71130..b901094f 100644 --- a/src/stories/Select/SSelect.stories.ts +++ b/src/stories/Select/SSelect.stories.ts @@ -39,7 +39,6 @@ export const configurable = () => ({ :popper-class="borderRadius" @change="handleChange" > -
123