ソースを参照

Merge pull request #1479 from geeyan/patch-5

fix #1130 (table-condensed is not working)
文翼 10 年 前
コミット
14d9c04cc8
1 ファイル変更7 行追加7 行削除
  1. 7 7
      src/bootstrap-table.css

+ 7 - 7
src/bootstrap-table.css

@@ -11,12 +11,12 @@
     border-radius: 1px;
     border-radius: 1px;
 }
 }
 
 
-.bootstrap-table .table,
-.bootstrap-table .table > tbody > tr > th,
-.bootstrap-table .table > tfoot > tr > th,
-.bootstrap-table .table > thead > tr > td,
-.bootstrap-table .table > tbody > tr > td,
-.bootstrap-table .table > tfoot > tr > td {
+.bootstrap-table .table:not(.table-condensed),
+.bootstrap-table .table:not(.table-condensed) > tbody > tr > th,
+.bootstrap-table .table:not(.table-condensed) > tfoot > tr > th,
+.bootstrap-table .table:not(.table-condensed) > thead > tr > td,
+.bootstrap-table .table:not(.table-condensed) > tbody > tr > td,
+.bootstrap-table .table:not(.table-condensed) > tfoot > tr > td {
     padding: 8px !important;
     padding: 8px !important;
 }
 }
 
 
@@ -294,4 +294,4 @@ div.fixed-table-scroll-outer {
     width: 200px;
     width: 200px;
     height: 150px;
     height: 150px;
     overflow: hidden;
     overflow: hidden;
-}
+}