From 3e74c2cbe0f574c0f26076c54b9e91d18c9eee77 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Wed, 17 Feb 2021 16:02:43 +0000 Subject: [PATCH 01/20] Change type of divider in scroll sections --- src/components/ScrollSections/SScrollSectionItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ScrollSections/SScrollSectionItem.vue b/src/components/ScrollSections/SScrollSectionItem.vue index 9f9f6b47..d3e5b4b6 100644 --- a/src/components/ScrollSections/SScrollSectionItem.vue +++ b/src/components/ScrollSections/SScrollSectionItem.vue @@ -3,7 +3,7 @@ {{ title }} - + From 75b800f529e29dc2a5522474e1ff464cc67a7544 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Thu, 18 Feb 2021 19:59:18 +0000 Subject: [PATCH 02/20] Change card default border radius --- src/components/Card/SCard.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Card/SCard.vue b/src/components/Card/SCard.vue index 81810fbc..ccc9ed4b 100644 --- a/src/components/Card/SCard.vue +++ b/src/components/Card/SCard.vue @@ -16,6 +16,7 @@ import { Component, Mixins, Prop } from 'vue-property-decorator' import BorderRadiusMixin from '../../mixins/BorderRadiusMixin' import { CardShadow } from './consts' +import { BorderRadius } from '@/types' @Component export default class SCard extends Mixins(BorderRadiusMixin) { @@ -42,6 +43,8 @@ export default class SCard extends Mixins(BorderRadiusMixin) { */ @Prop({ default: false, type: Boolean }) readonly clickable!: boolean + @Prop({ default: BorderRadius.MEDIUM }) borderRadius!: string + get computedClasses (): Array { const cssClasses: Array = [] if (this.isStandardBorderRadius) { From 3051fc8be736c50da96e166e2befe32e809a30a6 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Fri, 19 Feb 2021 06:54:25 +0000 Subject: [PATCH 03/20] Dialog mixin --- src/mixins/DialogMixin.ts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/mixins/DialogMixin.ts diff --git a/src/mixins/DialogMixin.ts b/src/mixins/DialogMixin.ts new file mode 100644 index 00000000..3e7318e5 --- /dev/null +++ b/src/mixins/DialogMixin.ts @@ -0,0 +1,23 @@ +import { Vue, Component, Prop, Watch } from 'vue-property-decorator' + +@Component +export default class DialogMixin extends Vue { + /** + * Dialog visibility + * + * `false` by default + */ + @Prop({ type: Boolean, default: false, required: true }) readonly visible!: boolean + + isVisible = this.visible + + @Watch('visible') + public handleVisibleChange (value: boolean): void { + this.isVisible = value + } + + @Watch('isVisible') + public handleIsVisibleChange (value: boolean): void { + this.$emit('update:visible', value) + } +} From a675c90268e71d668f2580c715664b4baac8959d Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Fri, 19 Feb 2021 07:01:05 +0000 Subject: [PATCH 04/20] export --- src/index.ts | 4 +++- src/mixins/index.ts | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/mixins/index.ts diff --git a/src/index.ts b/src/index.ts index 86d79d9d..2e531e71 100644 --- a/src/index.ts +++ b/src/index.ts @@ -53,6 +53,7 @@ import { Directives } from './types/directives' import { modules, Modules } from './store' import { setTheme } from './utils' import { Loading, Message, MessageBox, Notification } from './plugins/elementUI' +import { DialogMixin } from './mixins' const components = [ { component: SApp, name: Components.SApp }, @@ -174,6 +175,7 @@ export { STabs, STable, STableColumn, - STooltip + STooltip, + DialogMixin } export default SoramitsuElements diff --git a/src/mixins/index.ts b/src/mixins/index.ts new file mode 100644 index 00000000..c2839565 --- /dev/null +++ b/src/mixins/index.ts @@ -0,0 +1,9 @@ +import DialogMixin from './DialogMixin' +import BorderRadiusMixin from './BorderRadiusMixin' +import SizeMixin from './SizeMixin' + +export { + DialogMixin, + BorderRadiusMixin, + SizeMixin +} From a01282a014abab02871c661af95d5078b58373e2 Mon Sep 17 00:00:00 2001 From: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Wed, 24 Feb 2021 11:40:01 +0300 Subject: [PATCH 05/20] PSS-363: Add styles for select prefix slot (#126) * add styles for select prefix slot * increase version in package.json --- package.json | 2 +- src/components/Select/SSelect.vue | 1 + src/styles/select.scss | 52 ++++++++++++++++++++++++------- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 85235b9e..f21a6683 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.7.2", + "version": "0.7.3", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/" diff --git a/src/components/Select/SSelect.vue b/src/components/Select/SSelect.vue index 04fdcccc..885e4c63 100644 --- a/src/components/Select/SSelect.vue +++ b/src/components/Select/SSelect.vue @@ -18,6 +18,7 @@ @visible-change="handleVisibleChange" @clear="handleClear" > + diff --git a/src/styles/select.scss b/src/styles/select.scss index cbf72ac3..f66d5f4d 100644 --- a/src/styles/select.scss +++ b/src/styles/select.scss @@ -45,6 +45,16 @@ .el-select__caret { color: var(--s-color-base-content-tertiary); } + &--prefix { + .el-input__prefix { + bottom: 0; + left: 12px; + width: $s-size-mini; + height: $s-size-mini; + margin: auto; + overflow: hidden; + } + } } } &.s-input-type { @@ -71,8 +81,19 @@ } } .s-placeholder + .el-select { - .el-input__inner { - padding-top: 12px; + .el-input { + &--prefix { + .el-input__inner{ + padding-left: 44px; + } + + .el-input__prefix { + top: 12px; + } + } + .el-input__inner{ + padding-top: 12px; + } } .el-input__validateIcon { padding-top: 11px; @@ -127,18 +148,25 @@ } &.s-select-type { .el-select { - .el-input__inner { - padding-left: 12px; - font-weight: bold; - &:hover { - border-color: var(--s-color-base-border-primary); + .el-input { + &.el-input--prefix { + .el-input__inner { + padding-left: 44px; + } } - &::placeholder { - color: var(--s-color-base-content-tertiary); + .el-input__inner { + padding-left: 12px; font-weight: bold; - } - &:focus { - border-color: var(--s-color-base-border-primary); + &:hover { + border-color: var(--s-color-base-border-primary); + } + &::placeholder { + color: var(--s-color-base-content-tertiary); + font-weight: bold; + } + &:focus { + border-color: var(--s-color-base-border-primary); + } } } .el-select__caret { From 584e838611a5e490c75ac181602f756c65a20ef9 Mon Sep 17 00:00:00 2001 From: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Thu, 25 Feb 2021 09:10:06 +0300 Subject: [PATCH 06/20] Fix/remove input inner model (#129) * removed model from SInput * up package version * fix paste input handler * add change emitter on file change --- package.json | 2 +- src/components/Input/SInput.vue | 27 ++++++++++----------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index f21a6683..ff0bbeee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.7.3", + "version": "0.7.4", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/" diff --git a/src/components/Input/SInput.vue b/src/components/Input/SInput.vue index 2ecac0be..d6f53b46 100644 --- a/src/components/Input/SInput.vue +++ b/src/components/Input/SInput.vue @@ -3,12 +3,12 @@ class="s-input" :class="computedClasses" > - {{ placeholder }} + {{ placeholder }} diff --git a/src/components/Table/STableColumn.vue b/src/components/Table/STableColumn.vue index 1ca47e3a..4ef8e2e3 100644 --- a/src/components/Table/STableColumn.vue +++ b/src/components/Table/STableColumn.vue @@ -5,7 +5,7 @@ :label="label" :column-key="columnKey" :prop="prop" - :width="width" + :width="computedWidth" :min-width="minWidth" :fixed="fixedPosition || false" :render-header="renderHeader" @@ -18,7 +18,7 @@ :show-overflow-tooltip="showOverflowTooltip" :align="align" :header-align="headerAlign" - :class-name="headerAlign" + :class-name="className" :label-class-name="labelClassName" :selectable="selectable" :reserve-selection="reserveSelection" @@ -34,9 +34,11 @@ diff --git a/src/styles/table.scss b/src/styles/table.scss index 576a2079..693bd66c 100644 --- a/src/styles/table.scss +++ b/src/styles/table.scss @@ -22,6 +22,14 @@ } } } +.el-table:not(.el-table--border) th > .cell, +.el-table:not(.el-table--border) td > .cell { + padding-left: 16px; + padding-right: 16px; +} +.el-table:not(.el-table--border) .el-table-column--selection > .cell { + padding-right: 0; +} .el-table--border th:first-child .cell, .el-table--border td:first-child .cell { padding-left: 13px; From 2b8c92d5961cac256d64c37c72597b3197c2829e Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Thu, 25 Feb 2021 19:36:57 +0000 Subject: [PATCH 09/20] Fix expaneded table row style --- src/styles/table.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/table.scss b/src/styles/table.scss index 576a2079..dc68567b 100644 --- a/src/styles/table.scss +++ b/src/styles/table.scss @@ -116,3 +116,7 @@ transform: rotate(180deg); } } +.el-table__expanded-cell[class*=cell] { + padding: 8px 16px; + background: var(--s-color-base-background); +} From 6ff9b867ce15582ba050cf0326a6a05b4b2e0145 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Thu, 25 Feb 2021 19:39:05 +0000 Subject: [PATCH 10/20] Fix line-height --- src/styles/table.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/table.scss b/src/styles/table.scss index dc68567b..9c85d481 100644 --- a/src/styles/table.scss +++ b/src/styles/table.scss @@ -118,5 +118,6 @@ } .el-table__expanded-cell[class*=cell] { padding: 8px 16px; + line-height: 22.4px; background: var(--s-color-base-background); } From f3df6bc33cfaa6dab1004f161d5083b7ff1f843c Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Fri, 26 Feb 2021 06:02:18 +0000 Subject: [PATCH 11/20] Add size parameter to select --- src/components/Select/SSelect.vue | 16 ++++++++++++++-- src/stories/Select/SSelect.stories.ts | 6 +++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/components/Select/SSelect.vue b/src/components/Select/SSelect.vue index 885e4c63..73eefae6 100644 --- a/src/components/Select/SSelect.vue +++ b/src/components/Select/SSelect.vue @@ -7,6 +7,7 @@ :placeholder="placeholder" :disabled="disabled" :loading="loading" + :size="size" :multiple="multiple" :loading-text="loadingText" :clearable="clearable" @@ -26,14 +27,17 @@ diff --git a/src/components/Input/SInput.vue b/src/components/Input/SInput.vue index d6f53b46..91d89784 100644 --- a/src/components/Input/SInput.vue +++ b/src/components/Input/SInput.vue @@ -39,7 +39,7 @@ From a17bae2c70c2e9f382123cd70a33bff78c4d94b8 Mon Sep 17 00:00:00 2001 From: RDMStreet Date: Fri, 26 Feb 2021 10:14:20 +0000 Subject: [PATCH 20/20] Change package version to 0.7.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e35b80cd..08febb60 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.7.6", + "version": "0.7.7", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/"