diff --git a/config/storybook/preview.js b/config/storybook/preview.js index fdabd181..bea3f949 100644 --- a/config/storybook/preview.js +++ b/config/storybook/preview.js @@ -20,7 +20,7 @@ addParameters({ addDecorator(withA11y) addDecorator(() => ({ - template: `
+ template: `
` })) diff --git a/package.json b/package.json index 05726c3a..aa110c06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.3.4", + "version": "0.4.0", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/" diff --git a/src/components/Breadcrumb/SBreadcrumb.vue b/src/components/Breadcrumb/SBreadcrumb.vue index 2d53a072..ae2344e1 100644 --- a/src/components/Breadcrumb/SBreadcrumb.vue +++ b/src/components/Breadcrumb/SBreadcrumb.vue @@ -15,11 +15,3 @@ export default class SBreadcrumb extends Vue { @Prop({ default: '/', type: String }) readonly separator!: string } - - diff --git a/src/components/Breadcrumb/SBreadcrumbItem.vue b/src/components/Breadcrumb/SBreadcrumbItem.vue index 7d577779..706572d3 100644 --- a/src/components/Breadcrumb/SBreadcrumbItem.vue +++ b/src/components/Breadcrumb/SBreadcrumbItem.vue @@ -24,17 +24,3 @@ export default class SBreadcrumbItem extends Vue { @Prop({ default: false, type: Boolean }) readonly replace!: boolean } - - diff --git a/src/components/Button/SButton.vue b/src/components/Button/SButton.vue index ce9ee5ff..10b0a5e9 100644 --- a/src/components/Button/SButton.vue +++ b/src/components/Button/SButton.vue @@ -9,7 +9,7 @@ :disabled="disabled" :loading="isLoading" :autofocus="autofocus" - :circle="type === ButtonTypes.ACTION" + :circle="type === ButtonTypes.ACTION && rounded" :icon="elementIcon" @click="handleClick" > @@ -40,6 +40,12 @@ export default class SButton extends Vue { * By default it's set to `"primary"` */ @Prop({ default: ButtonTypes.PRIMARY, type: String }) readonly type!: string + /** + * Rounded property for `type="action"` buttons. + * + * By default it's set to `false` + */ + @Prop({ default: false, type: Boolean }) readonly rounded!: boolean /** * Size of button. Possible values: `"big"`, `"medium"`, `"small"`. * @@ -117,18 +123,18 @@ export default class SButton extends Vue { get computedClasses (): Array { const cssClasses: Array = [] if ((this.elForm || this.elFormItem || {}).size) { - cssClasses.push((this.elForm || this.elFormItem).size) + cssClasses.push(`s-${(this.elForm || this.elFormItem).size}`) } else if ((Object.values(ButtonSize) as Array).includes(this.size)) { - cssClasses.push(this.size) + cssClasses.push(`s-${this.size}`) } if ((Object.values(ButtonTypes) as Array).includes(this.type)) { - cssClasses.push(this.type) + cssClasses.push(`s-${this.type}`) } if (this.isLoading) { - cssClasses.push('loading') + cssClasses.push('s-loading') } if (this.alternative) { - cssClasses.push('alternative') + cssClasses.push('s-alternative') } return cssClasses } @@ -176,148 +182,3 @@ export default class SButton extends Vue { } } - - diff --git a/src/components/Card/SCard.vue b/src/components/Card/SCard.vue index 248e1f29..bf2ea598 100644 --- a/src/components/Card/SCard.vue +++ b/src/components/Card/SCard.vue @@ -1,7 +1,7 @@