Commit 1a4a76e903479e9730d7f16213ff16b25095f919

Authored by 梁灏
1 parent eb7f31db

update Page style

@@ -6,8 +6,8 @@ import Vue from 'vue'; @@ -6,8 +6,8 @@ import Vue from 'vue';
6 import VueRouter from 'vue-router'; 6 import VueRouter from 'vue-router';
7 import App from './app.vue'; 7 import App from './app.vue';
8 import iView from '../src/index'; 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 Vue.use(VueRouter); 12 Vue.use(VueRouter);
13 Vue.use(iView, { locale }); 13 Vue.use(iView, { locale });
examples/routers/page.vue
@@ -24,6 +24,14 @@ @@ -24,6 +24,14 @@
24 <div style="margin:10px 0px"> 24 <div style="margin:10px 0px">
25 <Page :total="500" show-sizer transfer ></Page> 25 <Page :total="500" show-sizer transfer ></Page>
26 </div> 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 </div> 35 </div>
28 </template> 36 </template>
29 <script> 37 <script>
src/styles/components/page.less
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 user-select: none; 24 user-select: none;
25 cursor: pointer; 25 cursor: pointer;
26 font-family: Arial; 26 font-family: Arial;
  27 + font-weight: 500;
27 border: 1px solid @border-color-base; 28 border: 1px solid @border-color-base;
28 border-radius: @btn-border-radius; 29 border-radius: @btn-border-radius;
29 //transition: all @transition-time @ease-in-out; 30 //transition: all @transition-time @ease-in-out;
@@ -44,11 +45,10 @@ @@ -44,11 +45,10 @@
44 } 45 }
45 46
46 &-active { 47 &-active {
47 - background-color: @primary-color;  
48 border-color: @primary-color; 48 border-color: @primary-color;
49 49
50 a, &:hover a { 50 a, &:hover a {
51 - color: #fff; 51 + color: @primary-color;
52 } 52 }
53 } 53 }
54 } 54 }
@@ -89,7 +89,7 @@ @@ -89,7 +89,7 @@
89 } 89 }
90 90
91 &-prev{ 91 &-prev{
92 - margin-right: 8px; 92 + margin-right: 4px;
93 } 93 }
94 94
95 &-item-jump-prev, 95 &-item-jump-prev,
@@ -97,10 +97,6 @@ @@ -97,10 +97,6 @@
97 margin-right: 4px; 97 margin-right: 4px;
98 } 98 }
99 99
100 - &-next{  
101 - margin-left: 4px;  
102 - }  
103 -  
104 &-prev, 100 &-prev,
105 &-next, 101 &-next,
106 &-item-jump-prev, 102 &-item-jump-prev,
@@ -120,6 +116,10 @@ @@ -120,6 +116,10 @@
120 border-radius: @btn-border-radius; 116 border-radius: @btn-border-radius;
121 transition: all @transition-time @ease-in-out; 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 &-prev, 124 &-prev,
125 &-next { 125 &-next {
src/styles/components/switch.less
@@ -163,7 +163,7 @@ @@ -163,7 +163,7 @@
163 color: #ccc; 163 color: #ccc;
164 } 164 }
165 } 165 }
166 - 166 +
167 } 167 }
168 168
169 @keyframes switch-loading { 169 @keyframes switch-loading {