diff --git a/package.json b/package.json index 862b828d..9423d215 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "0.7.14", + "version": "0.8.0", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/" diff --git a/src/assets/fonts/soramitsu-icons-1.0.0.ttf b/src/assets/fonts/soramitsu-icons-1.0.0.ttf new file mode 100644 index 00000000..89af36c3 Binary files /dev/null and b/src/assets/fonts/soramitsu-icons-1.0.0.ttf differ diff --git a/src/assets/fonts/soramitsu-icons-1.0.0.woff b/src/assets/fonts/soramitsu-icons-1.0.0.woff deleted file mode 100644 index 3e6e32c7..00000000 Binary files a/src/assets/fonts/soramitsu-icons-1.0.0.woff and /dev/null differ diff --git a/src/components/DatePicker/SDatePicker.vue b/src/components/DatePicker/SDatePicker.vue index b000da54..724c2968 100644 --- a/src/components/DatePicker/SDatePicker.vue +++ b/src/components/DatePicker/SDatePicker.vue @@ -31,7 +31,7 @@ > - + @@ -42,11 +42,14 @@ import { ElFormItem } from 'element-ui/types/form-item' // TODO: ask do we need size prop for the component? // Prev comment => TODO: ask design team +import { SIcon } from '../Icon' import SizeMixin from '../../mixins/SizeMixin' import BorderRadiusMixin from '../../mixins/BorderRadiusMixin' import { PickerTypes, PickerAlignment, InputTypes } from './consts' -@Component +@Component({ + components: { SIcon } +}) export default class SDatePicker extends Mixins(SizeMixin, BorderRadiusMixin) { /** * Value of date picker component. Can be used with `v-model`. diff --git a/src/components/Dropdown/SDropdown.vue b/src/components/Dropdown/SDropdown.vue index 15ce5173..942e0c65 100644 --- a/src/components/Dropdown/SDropdown.vue +++ b/src/components/Dropdown/SDropdown.vue @@ -49,7 +49,7 @@ import { ElDropdown } from 'element-ui/types/dropdown' import SizeMixin from '../../mixins/SizeMixin' import BorderRadiusMixin from '../../mixins/BorderRadiusMixin' import { ButtonTypes, SButton } from '../Button' -import { Icons, SIcon } from '../Icon' +import { Icons24, SIcon } from '../Icon' import { STooltip } from '../Tooltip' import { DropdownType, DropdownPlacement, DropdownTrigger } from './consts' @@ -73,7 +73,7 @@ export default class SDropdown extends Mixins(SizeMixin, BorderRadiusMixin) { * * By default, it's set to `"more-horizontal"` */ - @Prop({ type: String, default: Icons.MoreHorizontal }) readonly icon!: string + @Prop({ type: String, default: Icons24.BasicMoreHorizontal }) readonly icon!: string /** * Button type of dropdown component. It can be used with `type="button"`. * Possible values: `"primary"`, `"secondary"`, `"tertiary"`. diff --git a/src/components/Form/SFormItem.vue b/src/components/Form/SFormItem.vue index d6e34373..8ce3c26d 100644 --- a/src/components/Form/SFormItem.vue +++ b/src/components/Form/SFormItem.vue @@ -13,7 +13,7 @@ > - + @@ -21,12 +21,13 @@ import { Vue, Component, Prop, Ref, Inject } from 'vue-property-decorator' import { ElFormItem } from 'element-ui/types/form-item' import { ElForm } from 'element-ui/types/form' -import cloneDeep from 'lodash/cloneDeep' import isArray from 'lodash/isArray' -import { LabelPosition } from './consts' +import { SIcon } from '../Icon' -@Component +@Component({ + components: { SIcon } +}) export default class SFormItem extends Vue { /** * A key of `model` - form property. diff --git a/src/components/Icon/SIcon.vue b/src/components/Icon/SIcon.vue index 0ac7c3f5..adbc44ca 100644 --- a/src/components/Icon/SIcon.vue +++ b/src/components/Icon/SIcon.vue @@ -4,8 +4,9 @@