github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3 from ElemeFE/dev 

merge
pull/1406/head
Leon Zhang 2016-11-28 16:05:32 +08:00 committed by GitHub
parent 640ac48ef5 84efedcc71
commit d2f6b21bba
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/components/header.vue
View File

@ -228,7 +228,7 @@
}, },
watch: { watch: {
'$route.path'() { '$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' })`; this.headerStyle.backgroundColor = `rgba(32, 160, 255, ${ this.isHome ? '0' : '1' })`;
} }
}, },

18
examples/docs/en-US/pagination.md
View File

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

18
examples/docs/zh-CN/pagination.md
View File

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

2
packages/theme-default/src/pagination.css
View File

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