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 @@
-
-
diff --git a/src/components/Checkbox/SCheckbox.vue b/src/components/Checkbox/SCheckbox.vue
index 8c85714a..c2759c5c 100644
--- a/src/components/Checkbox/SCheckbox.vue
+++ b/src/components/Checkbox/SCheckbox.vue
@@ -88,7 +88,7 @@ export default class SCheckbox extends Vue {
get computedClasses (): Array {
const cssClasses: Array = []
if ((Object.values(CheckboxSize) as Array).includes(this.size)) {
- cssClasses.push(this.size)
+ cssClasses.push(`s-${this.size}`)
}
return cssClasses
}
@@ -98,93 +98,3 @@ export default class SCheckbox extends Vue {
}
}
-
-
diff --git a/src/components/Collapse/SCollapse.vue b/src/components/Collapse/SCollapse.vue
index 7d16c283..6f1f5b16 100644
--- a/src/components/Collapse/SCollapse.vue
+++ b/src/components/Collapse/SCollapse.vue
@@ -46,12 +46,3 @@ export default class SCollapse extends Vue {
}
}
-
-
diff --git a/src/components/Collapse/SCollapseItem.vue b/src/components/Collapse/SCollapseItem.vue
index d6d2d96a..26be0bd2 100644
--- a/src/components/Collapse/SCollapseItem.vue
+++ b/src/components/Collapse/SCollapseItem.vue
@@ -41,58 +41,12 @@ export default class SCollapseItem extends Vue {
get computedClasses (): Array {
const cssClasses: Array = []
if (!(this.sCollapse || {}).borders) {
- cssClasses.push('without-border')
+ cssClasses.push('s-without-border')
}
if (this.withoutPadding) {
- cssClasses.push('without-padding')
+ cssClasses.push('s-without-padding')
}
return cssClasses
}
}
-
-
diff --git a/src/components/DatePicker/SDatePicker.vue b/src/components/DatePicker/SDatePicker.vue
index 316fa2a3..29862d5a 100644
--- a/src/components/DatePicker/SDatePicker.vue
+++ b/src/components/DatePicker/SDatePicker.vue
@@ -1,6 +1,6 @@
-
{{ placeholder }}
+
{{ placeholder }}
{
const cssClasses: Array = []
if ((Object.values(InputTypes) as Array).includes(this.inputType)) {
- if (!this.isInputType) {
- cssClasses.push(InputTypes.SELECT)
- } else {
- cssClasses.push(this.inputType)
- }
+ cssClasses.push(`s-${!this.isInputType ? InputTypes.SELECT : this.inputType}-type`)
}
if (this.focused) {
- cssClasses.push('focused')
+ cssClasses.push('s-focused')
}
if (this.disabled) {
- cssClasses.push('disabled')
+ cssClasses.push('s-disabled')
}
if ((!this.isRange && this.model) || (this.isRange && this.model.length !== 0)) {
- cssClasses.push('has-value')
+ cssClasses.push('s-has-value')
}
return cssClasses
}
@@ -252,237 +248,3 @@ export default class SDatePicker extends Vue {
}
}
-
-
diff --git a/src/components/Dialog/SDialog.vue b/src/components/Dialog/SDialog.vue
index 258c6506..d2f1238e 100644
--- a/src/components/Dialog/SDialog.vue
+++ b/src/components/Dialog/SDialog.vue
@@ -204,19 +204,3 @@ export default class SDialog extends Vue {
}
}
-
-
diff --git a/src/components/Divider/SDivider.vue b/src/components/Divider/SDivider.vue
index 6517e44c..c74cb2a8 100644
--- a/src/components/Divider/SDivider.vue
+++ b/src/components/Divider/SDivider.vue
@@ -25,14 +25,3 @@ export default class SDivider extends Vue {
@Prop({ default: ContentPosition.CENTER, type: String }) readonly contentPosition!: string
}
-
-
diff --git a/src/components/Dropdown/SDropdown.vue b/src/components/Dropdown/SDropdown.vue
index bd0e5064..bc1e294b 100644
--- a/src/components/Dropdown/SDropdown.vue
+++ b/src/components/Dropdown/SDropdown.vue
@@ -163,7 +163,7 @@ export default class SDropdown extends Vue {
if (this.splitButton) {
this.$nextTick(() => {
this.dropdown.$children[0].$children.forEach(button => {
- button.$el.classList.add(this.size, this.computedButtonType)
+ button.$el.classList.add(`s-${this.size}`, `s-${this.computedButtonType}`)
})
})
}
@@ -189,43 +189,3 @@ export default class SDropdown extends Vue {
}
}
-
-
diff --git a/src/components/Dropdown/SDropdownItem.vue b/src/components/Dropdown/SDropdownItem.vue
index 9e729274..c775b633 100644
--- a/src/components/Dropdown/SDropdownItem.vue
+++ b/src/components/Dropdown/SDropdownItem.vue
@@ -43,14 +43,3 @@ export default class SDropdownItem extends Vue {
}
}
-
-
diff --git a/src/components/Form/SFormItem.vue b/src/components/Form/SFormItem.vue
index 1c7f347c..90a18bc1 100644
--- a/src/components/Form/SFormItem.vue
+++ b/src/components/Form/SFormItem.vue
@@ -122,72 +122,3 @@ export default class SFormItem extends Vue {
}
}
-
-
diff --git a/src/components/Icon/SIcon.vue b/src/components/Icon/SIcon.vue
index 67103ad3..da82e129 100644
--- a/src/components/Icon/SIcon.vue
+++ b/src/components/Icon/SIcon.vue
@@ -1,5 +1,5 @@
-
+
-
-
diff --git a/src/components/Input/SJsonInput.vue b/src/components/Input/SJsonInput.vue
index 840dbc43..8e979cdf 100644
--- a/src/components/Input/SJsonInput.vue
+++ b/src/components/Input/SJsonInput.vue
@@ -67,10 +67,10 @@ export default class SJsonInput extends Vue {
get computedClasses (): Array {
const cssClasses: Array = []
if (this.disabled) {
- cssClasses.push('disabled')
+ cssClasses.push('s-disabled')
}
if (this.readonly) {
- cssClasses.push('readonly')
+ cssClasses.push('s-readonly')
}
return cssClasses
}
@@ -96,6 +96,7 @@ export default class SJsonInput extends Vue {
if (!this.readonly) {
this.$emit('input', value)
this.$emit('change', value)
+ return
}
if (!this.jsoneditor) {
return
@@ -104,119 +105,3 @@ export default class SJsonInput extends Vue {
}
}
-
-
diff --git a/src/components/Menu/SMenuItem.vue b/src/components/Menu/SMenuItem.vue
index 9a51857e..d7c01e71 100644
--- a/src/components/Menu/SMenuItem.vue
+++ b/src/components/Menu/SMenuItem.vue
@@ -1,6 +1,6 @@
-
-
diff --git a/src/components/Radio/SRadio.vue b/src/components/Radio/SRadio.vue
index 19ded97c..a1bbe20d 100644
--- a/src/components/Radio/SRadio.vue
+++ b/src/components/Radio/SRadio.vue
@@ -65,98 +65,9 @@ export default class SRadio extends Vue {
get computedClasses (): Array {
const cssClasses: Array = []
if ((Object.values(RadioSize) as Array).includes(this.size)) {
- cssClasses.push(this.size)
+ cssClasses.push(`s-${this.size}`)
}
return cssClasses
}
}
-
-
diff --git a/src/components/ScrollSections/SScrollSectionItem.vue b/src/components/ScrollSections/SScrollSectionItem.vue
index 915db4dc..9f9f6b47 100644
--- a/src/components/ScrollSections/SScrollSectionItem.vue
+++ b/src/components/ScrollSections/SScrollSectionItem.vue
@@ -41,23 +41,3 @@ export default class SScrollSectionItem extends Vue {
}
}
-
-
diff --git a/src/components/ScrollSections/SScrollSections.vue b/src/components/ScrollSections/SScrollSections.vue
index fe3bc35f..c907a554 100644
--- a/src/components/ScrollSections/SScrollSections.vue
+++ b/src/components/ScrollSections/SScrollSections.vue
@@ -1,5 +1,5 @@
-