From 5485d2ce21339002094f22b9e423aa2aa1aa3ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 20 Dec 2019 11:30:56 +0800
Subject: [PATCH] fix(cli): duplicated site base style

---
 packages/vant-cli/site/common/style/base.less             | 6 +++---
 packages/vant-cli/site/common/style/highlight.less        | 2 +-
 packages/vant-cli/site/common/style/index.less            | 3 ---
 .../site/common/style/{variable.less => var.less}         | 1 +
 packages/vant-cli/site/desktop/App.vue                    | 3 +++
 packages/vant-cli/site/desktop/components/Container.vue   | 2 +-
 packages/vant-cli/site/desktop/components/Content.vue     | 2 +-
 packages/vant-cli/site/desktop/components/Header.vue      | 2 +-
 packages/vant-cli/site/desktop/components/Nav.vue         | 2 +-
 packages/vant-cli/site/desktop/components/SearchInput.vue | 2 +-
 packages/vant-cli/site/desktop/components/Simulator.vue   | 2 +-
 packages/vant-cli/site/desktop/components/index.vue       | 2 +-
 packages/vant-cli/site/mobile/App.vue                     | 8 +++-----
 packages/vant-cli/site/mobile/components/DemoBlock.vue    | 3 ++-
 packages/vant-cli/site/mobile/components/DemoHome.vue     | 3 ++-
 packages/vant-cli/site/mobile/components/DemoHomeNav.vue  | 4 ++--
 src/address-edit/demo/index.vue                           | 8 ++++++++
 src/address-list/demo/index.vue                           | 8 ++++++++
 18 files changed, 40 insertions(+), 23 deletions(-)
 delete mode 100644 packages/vant-cli/site/common/style/index.less
 rename packages/vant-cli/site/common/style/{variable.less => var.less} (95%)

diff --git a/packages/vant-cli/site/common/style/base.less b/packages/vant-cli/site/common/style/base.less
index 6563dcc10..efd18e307 100644
--- a/packages/vant-cli/site/common/style/base.less
+++ b/packages/vant-cli/site/common/style/base.less
@@ -1,13 +1,13 @@
-@import './variable';
+@import './var';
 
 body {
   min-width: 1100px;
   margin: 0;
   overflow-x: auto;
-  color: #333;
+  color: @van-doc-black;
   font-size: 16px;
   font-family: PingFang SC, 'Helvetica Neue', Arial, sans-serif;
-  background-color: #f0f3f6;
+  background-color: @van-doc-background-color;
   -webkit-font-smoothing: antialiased;
 }
 
diff --git a/packages/vant-cli/site/common/style/highlight.less b/packages/vant-cli/site/common/style/highlight.less
index 0db7858dd..8f870948d 100644
--- a/packages/vant-cli/site/common/style/highlight.less
+++ b/packages/vant-cli/site/common/style/highlight.less
@@ -1,4 +1,4 @@
-@import './variable';
+@import './var';
 
 code {
   position: relative;
diff --git a/packages/vant-cli/site/common/style/index.less b/packages/vant-cli/site/common/style/index.less
deleted file mode 100644
index e562b9a4c..000000000
--- a/packages/vant-cli/site/common/style/index.less
+++ /dev/null
@@ -1,3 +0,0 @@
-@import './variable';
-@import './base';
-@import './highlight';
diff --git a/packages/vant-cli/site/common/style/variable.less b/packages/vant-cli/site/common/style/var.less
similarity index 95%
rename from packages/vant-cli/site/common/style/variable.less
rename to packages/vant-cli/site/common/style/var.less
index 723b16e6f..9d35cc0cd 100644
--- a/packages/vant-cli/site/common/style/variable.less
+++ b/packages/vant-cli/site/common/style/var.less
@@ -4,6 +4,7 @@
 @van-doc-fuchsia: #a7419e;
 @van-doc-text-color: #34495e;
 @van-doc-text-light-blue: rgba(69, 90, 100, .6);
+@van-doc-background-color: #f7f8fa;
 @van-doc-grey: #999;
 @van-doc-dark-grey: #666;
 @van-doc-light-grey: #ccc;
diff --git a/packages/vant-cli/site/desktop/App.vue b/packages/vant-cli/site/desktop/App.vue
index 78270daf0..b50c19985 100644
--- a/packages/vant-cli/site/desktop/App.vue
+++ b/packages/vant-cli/site/desktop/App.vue
@@ -90,6 +90,9 @@ export default {
 </script>
 
 <style lang="less">
+@import '../common/style/base';
+@import '../common/style/highlight';
+
 .van-doc-intro {
   padding-top: 20px;
   font-family: 'Dosis', 'Source Sans Pro', 'Helvetica Neue', Arial, sans-serif;
diff --git a/packages/vant-cli/site/desktop/components/Container.vue b/packages/vant-cli/site/desktop/components/Container.vue
index 3afa5a54c..115adc150 100644
--- a/packages/vant-cli/site/desktop/components/Container.vue
+++ b/packages/vant-cli/site/desktop/components/Container.vue
@@ -18,7 +18,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .van-doc-container {
   box-sizing: border-box;
diff --git a/packages/vant-cli/site/desktop/components/Content.vue b/packages/vant-cli/site/desktop/components/Content.vue
index 9013b4357..6fb825d6c 100644
--- a/packages/vant-cli/site/desktop/components/Content.vue
+++ b/packages/vant-cli/site/desktop/components/Content.vue
@@ -21,7 +21,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .van-doc-content {
   position: relative;
diff --git a/packages/vant-cli/site/desktop/components/Header.vue b/packages/vant-cli/site/desktop/components/Header.vue
index e16ff91ad..2eb010789 100644
--- a/packages/vant-cli/site/desktop/components/Header.vue
+++ b/packages/vant-cli/site/desktop/components/Header.vue
@@ -116,7 +116,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .van-doc-header {
   width: 100%;
diff --git a/packages/vant-cli/site/desktop/components/Nav.vue b/packages/vant-cli/site/desktop/components/Nav.vue
index 83fcdf13e..ce53c0573 100644
--- a/packages/vant-cli/site/desktop/components/Nav.vue
+++ b/packages/vant-cli/site/desktop/components/Nav.vue
@@ -71,7 +71,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .van-doc-nav {
   position: fixed;
diff --git a/packages/vant-cli/site/desktop/components/SearchInput.vue b/packages/vant-cli/site/desktop/components/SearchInput.vue
index 4a22ef0d5..91fda83b1 100644
--- a/packages/vant-cli/site/desktop/components/SearchInput.vue
+++ b/packages/vant-cli/site/desktop/components/SearchInput.vue
@@ -40,7 +40,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .van-doc-search {
   width: 200px;
diff --git a/packages/vant-cli/site/desktop/components/Simulator.vue b/packages/vant-cli/site/desktop/components/Simulator.vue
index b51b1df4e..50b4a8e38 100644
--- a/packages/vant-cli/site/desktop/components/Simulator.vue
+++ b/packages/vant-cli/site/desktop/components/Simulator.vue
@@ -44,7 +44,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .van-doc-simulator {
   position: absolute;
diff --git a/packages/vant-cli/site/desktop/components/index.vue b/packages/vant-cli/site/desktop/components/index.vue
index 9767b1aaf..1b078658a 100644
--- a/packages/vant-cli/site/desktop/components/index.vue
+++ b/packages/vant-cli/site/desktop/components/index.vue
@@ -104,5 +104,5 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 </style>
diff --git a/packages/vant-cli/site/mobile/App.vue b/packages/vant-cli/site/mobile/App.vue
index a238bb5b4..b5ca849c1 100644
--- a/packages/vant-cli/site/mobile/App.vue
+++ b/packages/vant-cli/site/mobile/App.vue
@@ -16,13 +16,11 @@ export default {
 </script>
 
 <style lang="less">
+@import '../common/style/var';
+@import '../common/style/base';
+
 body {
   min-width: 100vw;
-  color: #323233;
-  font-family: 'PingFang SC', Helvetica, Tohoma, Arial, sans-serif;
-  line-height: 1;
-  background-color: #f8f8f8;
-  -webkit-font-smoothing: antialiased;
 }
 
 ::-webkit-scrollbar {
diff --git a/packages/vant-cli/site/mobile/components/DemoBlock.vue b/packages/vant-cli/site/mobile/components/DemoBlock.vue
index 8521b8815..93bfbea03 100644
--- a/packages/vant-cli/site/mobile/components/DemoBlock.vue
+++ b/packages/vant-cli/site/mobile/components/DemoBlock.vue
@@ -16,7 +16,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .van-doc-demo-block {
   &__title {
@@ -25,6 +25,7 @@ export default {
     color: @van-doc-text-light-blue;
     font-weight: normal;
     font-size: 14px;
+    line-height: 16px;
   }
 
   &:first-of-type {
diff --git a/packages/vant-cli/site/mobile/components/DemoHome.vue b/packages/vant-cli/site/mobile/components/DemoHome.vue
index 28dae6053..e8d77b68e 100644
--- a/packages/vant-cli/site/mobile/components/DemoHome.vue
+++ b/packages/vant-cli/site/mobile/components/DemoHome.vue
@@ -51,7 +51,7 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .demo-home {
   box-sizing: border-box;
@@ -64,6 +64,7 @@ export default {
   &__desc {
     padding-left: 16px;
     font-weight: normal;
+    line-height: 1;
     user-select: none;
   }
 
diff --git a/packages/vant-cli/site/mobile/components/DemoHomeNav.vue b/packages/vant-cli/site/mobile/components/DemoHomeNav.vue
index be649feae..63b26a31f 100644
--- a/packages/vant-cli/site/mobile/components/DemoHomeNav.vue
+++ b/packages/vant-cli/site/mobile/components/DemoHomeNav.vue
@@ -43,11 +43,11 @@ export default {
 </script>
 
 <style lang="less">
-@import '../../common/style/index';
+@import '../../common/style/var';
 
 .demo-home-nav {
   &__title {
-    margin: 24px 0 12px 16px;
+    margin: 24px 0 8px 16px;
     color: rgba(69, 90, 100, 0.6);
     font-size: 14px;
   }
diff --git a/src/address-edit/demo/index.vue b/src/address-edit/demo/index.vue
index 893c1d2c0..b681b2ecd 100644
--- a/src/address-edit/demo/index.vue
+++ b/src/address-edit/demo/index.vue
@@ -70,3 +70,11 @@ export default {
   }
 };
 </script>
+
+<style lang="less">
+.demo-address-edit {
+  .van-doc-demo-block__title {
+    padding-bottom: 0;
+  }
+}
+</style>
diff --git a/src/address-list/demo/index.vue b/src/address-list/demo/index.vue
index d1982cba2..9bc0d5109 100644
--- a/src/address-list/demo/index.vue
+++ b/src/address-list/demo/index.vue
@@ -94,3 +94,11 @@ export default {
   }
 };
 </script>
+
+<style lang="less">
+.demo-address-list {
+  .van-doc-demo-block__title {
+    padding-bottom: 0;
+  }
+}
+</style>