Merge branch '2.x' into dev

src/divider/demo/index.vue

@@ -26,15 +26,15 @@
   </demo-block>
 
   <demo-block :title="t('customStyle')">
-    <van-divider :style="{ borderColor: BLUE, color: BLUE, padding: '0 16px' }">
+    <van-divider
+      :style="{ borderColor: '#1989fa', color: '#1989fa', padding: '0 16px' }"
+    >
       {{ t('text') }}
     </van-divider>
   </demo-block>
 </template>
 
 <script>
-import { BLUE } from '../../utils/constant';
-
 export default {
   i18n: {
     'zh-CN': {
@@ -52,12 +52,6 @@ export default {
       customStyle: 'Custom Style',
     },
   },
-
-  data() {
-    return {
-      BLUE,
-    };
-  },
 };
 </script>