Commit 1a4a76e903479e9730d7f16213ff16b25095f919
1 parent
eb7f31db
update Page style
Showing
4 changed files
with
18 additions
and
10 deletions
Show diff stats
examples/main.js
... | ... | @@ -6,8 +6,8 @@ import Vue from 'vue'; |
6 | 6 | import VueRouter from 'vue-router'; |
7 | 7 | import App from './app.vue'; |
8 | 8 | import iView from '../src/index'; |
9 | -import locale from '../src/locale/lang/en-US'; | |
10 | -// import locale from '../src/locale/lang/zh-CN'; | |
9 | +// import locale from '../src/locale/lang/en-US'; | |
10 | +import locale from '../src/locale/lang/zh-CN'; | |
11 | 11 | |
12 | 12 | Vue.use(VueRouter); |
13 | 13 | Vue.use(iView, { locale }); | ... | ... |
examples/routers/page.vue
... | ... | @@ -24,6 +24,14 @@ |
24 | 24 | <div style="margin:10px 0px"> |
25 | 25 | <Page :total="500" show-sizer transfer ></Page> |
26 | 26 | </div> |
27 | + <div style="margin: 10px 0px"> | |
28 | + <Page :total="40" size="small"></Page> | |
29 | + <br><br> | |
30 | + <Page :total="40" size="small" show-elevator show-sizer></Page> | |
31 | + <br><br> | |
32 | + <Page :total="40" size="small" show-total></Page> | |
33 | + <br><br> | |
34 | + </div> | |
27 | 35 | </div> |
28 | 36 | </template> |
29 | 37 | <script> | ... | ... |
src/styles/components/page.less
... | ... | @@ -24,6 +24,7 @@ |
24 | 24 | user-select: none; |
25 | 25 | cursor: pointer; |
26 | 26 | font-family: Arial; |
27 | + font-weight: 500; | |
27 | 28 | border: 1px solid @border-color-base; |
28 | 29 | border-radius: @btn-border-radius; |
29 | 30 | //transition: all @transition-time @ease-in-out; |
... | ... | @@ -44,11 +45,10 @@ |
44 | 45 | } |
45 | 46 | |
46 | 47 | &-active { |
47 | - background-color: @primary-color; | |
48 | 48 | border-color: @primary-color; |
49 | 49 | |
50 | 50 | a, &:hover a { |
51 | - color: #fff; | |
51 | + color: @primary-color; | |
52 | 52 | } |
53 | 53 | } |
54 | 54 | } |
... | ... | @@ -89,7 +89,7 @@ |
89 | 89 | } |
90 | 90 | |
91 | 91 | &-prev{ |
92 | - margin-right: 8px; | |
92 | + margin-right: 4px; | |
93 | 93 | } |
94 | 94 | |
95 | 95 | &-item-jump-prev, |
... | ... | @@ -97,10 +97,6 @@ |
97 | 97 | margin-right: 4px; |
98 | 98 | } |
99 | 99 | |
100 | - &-next{ | |
101 | - margin-left: 4px; | |
102 | - } | |
103 | - | |
104 | 100 | &-prev, |
105 | 101 | &-next, |
106 | 102 | &-item-jump-prev, |
... | ... | @@ -120,6 +116,10 @@ |
120 | 116 | border-radius: @btn-border-radius; |
121 | 117 | transition: all @transition-time @ease-in-out; |
122 | 118 | } |
119 | + &-item-jump-prev, | |
120 | + &-item-jump-next{ | |
121 | + border-color: transparent; | |
122 | + } | |
123 | 123 | |
124 | 124 | &-prev, |
125 | 125 | &-next { | ... | ... |