浏览代码

Fix #430: Flat UI style bug.

zhixin 10 年之前
父节点
当前提交
d673ed9327
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. 1 1
      src/bootstrap-table.css
  2. 1 2
      src/bootstrap-table.js

+ 1 - 1
src/bootstrap-table.css

@@ -126,7 +126,7 @@
     text-align: center;
 }
 
-.fixed-table-pagination .pagination,
+.fixed-table-pagination div.pagination,
 .fixed-table-pagination .pagination-detail {
     margin-top: 10px;
     margin-bottom: 10px;

+ 1 - 2
src/bootstrap-table.js

@@ -997,9 +997,8 @@
         html.push(this.options.formatRecordsPerPage(pageNumber.join('')));
         html.push('</span>');
 
-        // Fixed #611 vertical-align between pagination block and pagination-detail block. Remove class pagination.
         html.push('</div>',
-            '<div class="pull-' + this.options.paginationHAlign + '">',
+            '<div class="pull-' + this.options.paginationHAlign + ' pagination">',
             '<ul class="pagination' + (this.options.iconSize === undefined ? '' : ' pagination-' + this.options.iconSize) + '">',
             '<li class="page-first"><a href="javascript:void(0)">' + this.options.paginationFirstText + '</a></li>',
             '<li class="page-pre"><a href="javascript:void(0)">' + this.options.paginationPreText + '</a></li>');