Merge pull request #3 from ElemeFE/dev

merge

examples/components/header.vue

@@ -228,7 +228,7 @@
     },
     watch: {
       '$route.path'() {
-        this.isHome = this.$route.name === 'home';
+        this.isHome = /^home/.test(this.$route.name);
         this.headerStyle.backgroundColor = `rgba(32, 160, 255, ${ this.isHome ? '0' : '1' })`;
       }
     },

examples/docs/en-US/pagination.md

@@ -51,7 +51,7 @@ Add more modules based on your scenario.
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage1"
       :page-size="100"
       layout="total, prev, pager, next"
       :total="1000">
@@ -62,7 +62,7 @@ Add more modules based on your scenario.
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage2"
       :page-sizes="[100, 200, 300, 400]"
       :page-size="100"
       layout="sizes, prev, pager, next"
@@ -74,7 +74,7 @@ Add more modules based on your scenario.
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage3"
       :page-size="100"
       layout="prev, pager, next, jumper"
       :total="1000">
@@ -85,7 +85,7 @@ Add more modules based on your scenario.
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage4"
       :page-sizes="[100, 200, 300, 400]"
       :page-size="100"
       layout="total, sizes, prev, pager, next, jumper"
@@ -106,7 +106,10 @@ Add more modules based on your scenario.
     },
     data() {
       return {
-        currentPage: 5
+        currentPage1: 5,
+        currentPage2: 5,
+        currentPage3: 5,
+        currentPage4: 5
       };
     }
   }
@@ -117,7 +120,10 @@ Add more modules based on your scenario.
   export default {
     data() {
       return {
-        currentPage: 5
+        currentPage1: 5,
+        currentPage2: 5,
+        currentPage3: 5,
+        currentPage4: 5
       };
     },
     methods: {

examples/docs/zh-CN/pagination.md

@@ -51,7 +51,7 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage1"
       :page-size="100"
       layout="total, prev, pager, next"
       :total="1000">
@@ -62,7 +62,7 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage2"
       :page-sizes="[100, 200, 300, 400]"
       :page-size="100"
       layout="sizes, prev, pager, next"
@@ -74,7 +74,7 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage3"
       :page-size="100"
       layout="prev, pager, next, jumper"
       :total="1000">
@@ -85,7 +85,7 @@
     <el-pagination
       @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="currentPage"
+      :current-page="currentPage4"
       :page-sizes="[100, 200, 300, 400]"
       :page-size="100"
       layout="total, sizes, prev, pager, next, jumper"
@@ -106,7 +106,10 @@
     },
     data() {
       return {
-        currentPage: 5
+        currentPage1: 5,
+        currentPage2: 5,
+        currentPage3: 5,
+        currentPage4: 5
       };
     }
   }
@@ -127,7 +130,10 @@
     },
     data() {
       return {
-        currentPage: 5
+        currentPage1: 5,
+        currentPage2: 5,
+        currentPage3: 5,
+        currentPage4: 5
       };
     },
     mounted() {

packages/theme-default/src/pagination.css

@@ -6,7 +6,6 @@
   @b pagination {
     white-space: nowrap;
     padding: 2px 5px;
-    background: var(--pagination-fill);
     color: var(--pagination-color);
 
     span,
@@ -51,6 +50,7 @@
     .btn-next {
       background: center center no-repeat;
       background-size: 16px;
+      background-color: var(--pagination-fill);
       border: 1px solid var(--pagination-border-color);
       cursor: pointer;
       margin: 0;