update the master branch to the latest

src/components/divider/divider.vue

@@ -0,0 +1,65 @@
+<template>
+    <div :class="classes">
+        <span v-if="hasSlot" :class="slotClasses">
+            <slot></slot>
+        </span>
+    </div>
+</template>
+
+<script>
+    import {oneOf} from '../../utils/assist';
+
+    const prefixCls = 'ivu-divider';
+
+    export default {
+        name: 'Divider',
+        props: {
+            type: {
+                type: String,
+                default: 'horizontal',
+                validator (value) {
+                    return oneOf(value, ['horizontal', 'vertical']);
+                }
+            },
+            orientation: {
+                type: String,
+                default: 'center',
+                validator (value) {
+                    return oneOf(value, ['left', 'right', 'center']);
+                }
+            },
+            dashed: {
+                type: Boolean,
+                default: false,
+            },
+            size: {
+                validator (value) {
+                    return oneOf(value, ['small', 'default']);
+                },
+                default: 'default'
+            }
+        },
+        computed: {
+            hasSlot() {
+                return !!this.$slots.default;
+            },
+            classes() {
+                return [
+                    `${prefixCls}`,
+                    `${prefixCls}-${this.type}`,
+                    `${prefixCls}-${this.size}`,
+                    {
+                        [`${prefixCls}-with-text`]: this.hasSlot && this.orientation === 'center',
+                        [`${prefixCls}-with-text-${this.orientation}`]: this.hasSlot,
+                        [`${prefixCls}-dashed`]: !!this.dashed
+                    }
+                ];
+            },
+            slotClasses() {
+                return [
+                    `${prefixCls}-inner-text`,
+                ];
+            }
+        }
+    };
+</script>

src/components/divider/index.js

@@ -0,0 +1,3 @@
+import Divider from './divider.vue';
+
+export default Divider;