diff --git a/package.json b/package.json index 5ed95df7..c4c078e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.8.6", + "version": "0.8.7", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Input/SInput.vue b/src/components/Input/SInput.vue index 0f6d5bba..e80d1ffd 100644 --- a/src/components/Input/SInput.vue +++ b/src/components/Input/SInput.vue @@ -182,6 +182,9 @@ export default class SInput extends Mixins(BorderRadiusMixin) { if (this.type === InputType.TEXT_FILE) { cssClasses.push('s-text-file') } + if (this.type === InputType.TEXTAREA) { + cssClasses.push('s-textarea') + } if (this.autofill) { cssClasses.push('s-autofill') } diff --git a/src/components/Input/SJsonInput.vue b/src/components/Input/SJsonInput.vue index 8e979cdf..756bcc32 100644 --- a/src/components/Input/SJsonInput.vue +++ b/src/components/Input/SJsonInput.vue @@ -6,7 +6,7 @@ {} }) readonly options!: object /** * Disabled state. * @@ -51,7 +55,7 @@ export default class SJsonInput extends Vue { @Ref('jsoneditor') jsoneditor!: any model = this.value - options = { + defultOptions = { // https://github.com/josdejong/jsoneditor/blob/master/docs/api.md#configuration-options mode: 'code', mainMenuBar: false, @@ -64,6 +68,13 @@ export default class SJsonInput extends Vue { } } + get computedOptions () { + return { + ...this.defultOptions, + ...this.options + } + } + get computedClasses (): Array { const cssClasses: Array = [] if (this.disabled) { diff --git a/src/styles/input.scss b/src/styles/input.scss index 54ef7e7c..35cf091b 100644 --- a/src/styles/input.scss +++ b/src/styles/input.scss @@ -112,7 +112,7 @@ border-color: var(--s-color-base-disabled); } } - &.s-autofill { + &:not(.s-textarea) { .s-placeholder { background-color: transparent !important; } diff --git a/src/styles/select.scss b/src/styles/select.scss index 86f3ace6..8ed79381 100644 --- a/src/styles/select.scss +++ b/src/styles/select.scss @@ -38,11 +38,19 @@ $select-prefix-height: $s-size-mini; } .el-select { width: 100%; + .el-input__suffix { + right: 16px; + } i.el-icon-arrow-up { + display: flex; + align-items: center; + width: var(--s-icon-font-size-big); font-family: $icons-font; - font-size: var(--s-icon-font-size-mini); + font-size: var(--s-icon-font-size-big); &:before { - content: $s-icon-chevron-top-16; + content: $s-icon-arrows-chevron-top-rounded-24; + margin-bottom: 2px; + color: var(--s-color-base-content-primary); } } .el-input { diff --git a/src/styles/table.scss b/src/styles/table.scss index e441199a..24d54032 100644 --- a/src/styles/table.scss +++ b/src/styles/table.scss @@ -27,8 +27,10 @@ padding-left: 16px; padding-right: 16px; } -.el-table:not(.el-table--border) .el-table-column--selection + td > .cell { - padding-left: 0; +.el-table:not(.el-table--border) .el-table-column--selection { + + th > .cell, + td > .cell { + padding-left: 0; + } } .el-table--border th:first-child .cell, .el-table--border td:first-child .cell {