Authored by yyq

Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0

@@ -14,14 +14,22 @@ @@ -14,14 +14,22 @@
14 </label> 14 </label>
15 <label class="page-info"><span class="cur-page">{{page}}</span>/<span class="total-page">{{pageTotal}}</span></label> 15 <label class="page-info"><span class="cur-page">{{page}}</span>/<span class="total-page">{{pageTotal}}</span></label>
16 {{#isEqual page 1}} 16 {{#isEqual page 1}}
17 - <span class="iconfont page disable page-pre">&#xe607;</span> 17 + <div class="page disable page-pre">
  18 + <span class="iconfont">&#xe607;</span>
  19 + </div>
18 {{^}} 20 {{^}}
19 - <span class="iconfont page page-pre">&#xe607;</span> 21 + <div class="page page-pre">
  22 + <span class="iconfont ">&#xe607;</span>
  23 + </div>
20 {{/isEqual}} 24 {{/isEqual}}
21 {{#isEqual page pageTotal}} 25 {{#isEqual page pageTotal}}
22 - <span class="iconfont page disable page-next">&#xe61e;</span> 26 + <div class="page disable page-next">
  27 + <span class="iconfont">&#xe61e;</span>
  28 + </div>
23 {{^}} 29 {{^}}
24 - <span class="iconfont page page-next">&#xe61e;</span> 30 + <div class="page page-next">
  31 + <span class="iconfont">&#xe61e;</span>
  32 + </div>
25 {{/isEqual}} 33 {{/isEqual}}
26 </div> 34 </div>
27 {{/paginationData}} 35 {{/paginationData}}
@@ -67,16 +67,22 @@ @@ -67,16 +67,22 @@
67 67
68 .page { 68 .page {
69 color: #1b1b1b; 69 color: #1b1b1b;
70 - font-weight: 700;  
71 border: 2px solid #1b1b1b; 70 border: 2px solid #1b1b1b;
72 width: 24px; 71 width: 24px;
73 height: 24px; 72 height: 24px;
74 - line-height: 24px; 73 + /*line-height: 24px;*/
75 display: inline-block; 74 display: inline-block;
76 - font-size: 14px;  
77 - text-align: center;  
78 margin-right: 8px; 75 margin-right: 8px;
79 cursor: pointer; 76 cursor: pointer;
  77 +
  78 + span {
  79 + font-weight: 700;
  80 + font-size: 14px;
  81 + display: block;
  82 + position: relative;
  83 + line-height: 22px;
  84 + text-align: center;
  85 + }
80 } 86 }
81 87
82 .page.disable { 88 .page.disable {
@@ -85,11 +91,15 @@ @@ -85,11 +91,15 @@
85 } 91 }
86 92
87 .page.page-next { 93 .page.page-next {
88 - line-height: 20px; 94 + span {
  95 + top: -1px;
  96 + }
89 } 97 }
90 98
91 .page.page-pre { 99 .page.page-pre {
92 - line-height: 20px; 100 + span {
  101 + left: -1px;
  102 + }
93 } 103 }
94 } 104 }
95 } 105 }