diff --git a/src/components/Button/consts.ts b/src/components/Button/consts.ts index 6105f843..78f1e9da 100644 --- a/src/components/Button/consts.ts +++ b/src/components/Button/consts.ts @@ -1,4 +1,4 @@ -import { Size } from '../../types/size' +import { Size } from '../../types' export enum ButtonTypes { PRIMARY = 'primary', diff --git a/src/components/Checkbox/consts.ts b/src/components/Checkbox/consts.ts index 96554de5..f7d55fd0 100644 --- a/src/components/Checkbox/consts.ts +++ b/src/components/Checkbox/consts.ts @@ -1,3 +1,3 @@ -import { Size } from '../../types/size' +import { Size } from '../../types' export const CheckboxSize = Size diff --git a/src/components/Collapse/SCollapse.vue b/src/components/Collapse/SCollapse.vue index d1feb8db..7d16c283 100644 --- a/src/components/Collapse/SCollapse.vue +++ b/src/components/Collapse/SCollapse.vue @@ -2,6 +2,7 @@ @@ -9,7 +10,7 @@ @@ -35,13 +55,22 @@ export default class SCollapseItem extends Vue { @import "../../styles/variables.scss"; // @import "../../styles/icons.scss"; +.without-border { + > div > .el-collapse-item__header, + > .el-collapse-item__wrap { + border: none; + } +} +.without-padding > .el-collapse-item__wrap > .el-collapse-item__content { + padding-bottom: 0; +} .el-collapse-item__ { &wrap { - border-bottom-color: $color-neutral-hover; + border-bottom-color: #F5F5F5; } &header { color: $color-basic-black; - border-bottom-color: $color-neutral-hover; + border-bottom-color: #F5F5F5; &.is-active { border-bottom-color: transparent; } diff --git a/src/components/Dialog/SDialog.vue b/src/components/Dialog/SDialog.vue index 4c933ba3..a40d0c01 100644 --- a/src/components/Dialog/SDialog.vue +++ b/src/components/Dialog/SDialog.vue @@ -168,5 +168,8 @@ export default class SDialog extends Vue { font-size: 16px; color: $color-basic-black; } + > * { + word-break: break-word; + } } diff --git a/src/components/Divider/SDivider.vue b/src/components/Divider/SDivider.vue new file mode 100644 index 00000000..6517e44c --- /dev/null +++ b/src/components/Divider/SDivider.vue @@ -0,0 +1,38 @@ + + + + + diff --git a/src/components/Divider/consts.ts b/src/components/Divider/consts.ts new file mode 100644 index 00000000..10f7624d --- /dev/null +++ b/src/components/Divider/consts.ts @@ -0,0 +1,9 @@ +import { Direction } from '../../types' + +export enum ContentPosition { + LEFT = 'left', + RIGHT = 'right', + CENTER = 'center' +} + +export const DividerDirection = Direction diff --git a/src/components/Divider/index.ts b/src/components/Divider/index.ts new file mode 100644 index 00000000..7426c29d --- /dev/null +++ b/src/components/Divider/index.ts @@ -0,0 +1,3 @@ +import SDivider from './SDivider.vue' + +export { SDivider } diff --git a/src/components/Dropdown/consts.ts b/src/components/Dropdown/consts.ts index c6d7fb5f..8fd34a23 100644 --- a/src/components/Dropdown/consts.ts +++ b/src/components/Dropdown/consts.ts @@ -1,4 +1,4 @@ -import { Size } from '../../types/size' +import { Size } from '../../types' export enum DropdownType { DEFAULT = 'default', diff --git a/src/components/Form/consts.ts b/src/components/Form/consts.ts index 722d430f..0b7baf42 100644 --- a/src/components/Form/consts.ts +++ b/src/components/Form/consts.ts @@ -1,4 +1,4 @@ -import { Size } from '../../types/size' +import { Size } from '../../types' export enum LabelPosition { LEFT = 'left', diff --git a/src/components/Layout/Container/consts.ts b/src/components/Layout/Container/consts.ts index 1865dc9b..fc6aae38 100644 --- a/src/components/Layout/Container/consts.ts +++ b/src/components/Layout/Container/consts.ts @@ -1,4 +1,3 @@ -export enum ContainerDirection { - VERTICAL = 'vertical', - HORIZONTAL = 'horizontal' -} +import { Direction } from '../../../types' + +export const ContainerDirection = Direction diff --git a/src/components/Layout/Header/SHeader.vue b/src/components/Layout/Header/SHeader.vue index 2715d822..8fb34577 100644 --- a/src/components/Layout/Header/SHeader.vue +++ b/src/components/Layout/Header/SHeader.vue @@ -24,5 +24,6 @@ export default class SHeader extends Vue { padding: 12px; box-shadow: 0px 0px 8px rgba(45, 41, 38, 0.2); font-size: 18px; + z-index: 1; } diff --git a/src/components/ScrollSections/SScrollSectionItem.vue b/src/components/ScrollSections/SScrollSectionItem.vue index 43406972..915db4dc 100644 --- a/src/components/ScrollSections/SScrollSectionItem.vue +++ b/src/components/ScrollSections/SScrollSectionItem.vue @@ -3,13 +3,18 @@ {{ title }} + @@ -39,6 +50,9 @@ export default class SScrollSectionItem extends Vue { } &:last-child { margin-bottom: 10px; + .el-divider.el-divider--horizontal { + height: 0; + } } .title { font-weight: bold; diff --git a/src/components/ScrollSections/SScrollSections.vue b/src/components/ScrollSections/SScrollSections.vue index 18ec3e78..fe3bc35f 100644 --- a/src/components/ScrollSections/SScrollSections.vue +++ b/src/components/ScrollSections/SScrollSections.vue @@ -24,7 +24,7 @@