浏览代码

Fix #26: bootstrap v2.3 th display error.

zhixin 11 年之前
父节点
当前提交
0f085a28db

文件差异内容过多而无法显示
+ 1109 - 0
assets/bootstrap2.3/css/bootstrap-responsive.css


文件差异内容过多而无法显示
+ 9 - 0
assets/bootstrap2.3/css/bootstrap-responsive.min.css


文件差异内容过多而无法显示
+ 6167 - 0
assets/bootstrap2.3/css/bootstrap.css


文件差异内容过多而无法显示
+ 9 - 0
assets/bootstrap2.3/css/bootstrap.min.css


二进制
assets/bootstrap2.3/img/glyphicons-halflings-white.png


二进制
assets/bootstrap2.3/img/glyphicons-halflings.png


文件差异内容过多而无法显示
+ 2280 - 0
assets/bootstrap2.3/js/bootstrap.js


文件差异内容过多而无法显示
+ 6 - 0
assets/bootstrap2.3/js/bootstrap.min.js


+ 5 - 2
docs/examples.html

@@ -6,6 +6,8 @@
     <meta name="author" content="zhixin">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="../assets/bootstrap/css/bootstrap.min.css">
+    <!--<link rel="stylesheet" href="../assets/bootstrap2.3/css/bootstrap.min.css">-->
+    <!--<link rel="stylesheet" href="../assets/bootstrap2.3/css/bootstrap-responsive.min.css">-->
     <link rel="stylesheet" href="../src/bootstrap-table.css">
     <link rel="stylesheet" href="../assets/highlightjs/default.min.css">
     <link rel="stylesheet" href="docs.css">
@@ -17,6 +19,7 @@
 
     <script src="../assets/jquery.min.js"></script>
     <script src="../assets/bootstrap/js/bootstrap.min.js"></script>
+    <!--<script src="../assets/bootstrap2.3/js/bootstrap.min.js"></script>-->
     <script src="../docs/examples.js"></script>
 </head>
 <body>
@@ -64,7 +67,7 @@
 </div>
 <div class="container">
     <div class="row">
-        <div class="col-md-3">
+        <div class="col-md-3 span3">
             <div class="bs-sidebar" role="complementary">
                 <ul class="nav bs-sidenav">
                     <li><a href="#basic-table">Basic Table</a></li>
@@ -103,7 +106,7 @@
                 </ul>
             </div>
         </div>
-        <div class="col-md-9" role="main">
+        <div class="col-md-9 span9" role="main">
             <div class="page-header alert alert-info">
                 <a class="close" data-dismiss="alert" href="#" aria-hidden="true">&times;</a>
                 <b>NOTE:</b> Bootstrap Table is licensed under the <a href="https://github.com/wenzhixin/bootstrap-table/blob/master/LICENSE">The MIT License</a>. Completely free, you can arbitrarily use and modify this plugin. If you like this plugin, you can <a href="http://github.com/wenzhixin/bootstrap-table"><b>Star</b></a> this repo, your support is my biggest motive force, thanks.

+ 8 - 3
src/bootstrap-table.css

@@ -76,9 +76,13 @@
     background-color: #d9edf7;
 }
 
-.fixed-table-body .checkbox {
-    margin-left: auto;
-    margin-right: auto;
+.fixed-table-body .bs-checkbox {
+    text-align: center;
+}
+
+.fixed-table-body input[type="radio"],
+.fixed-table-body input[type="checkbox"] {
+    margin: 0 auto !important;
 }
 
 .fixed-table-body .no-records-found {
@@ -168,6 +172,7 @@
 
 .table th, .table td {
     vertical-align: middle;
+    box-sizing: border-box;
 }
 
 .fixed-table-toolbar .dropdown-menu {

+ 7 - 4
src/bootstrap-table.js

@@ -230,7 +230,10 @@
             style = sprintf('width: %spx; ', column.checkbox || column.radio ? 36 : column.width);
             style += column.sortable ? 'cursor: pointer; ' : '';
 
-            html.push('<th' + sprintf(' style="%s"', style) + '>');
+            html.push('<th',
+                column.checkbox || column.radio ? ' class="bs-checkbox"' : '',
+                sprintf(' style="%s"', style),
+                '>');
             html.push('<div class="th-inner">');
 
             text = column.title;
@@ -239,7 +242,7 @@
             }
 
             if (column.checkbox && !that.options.singleSelect) {
-                text = '<input name="btSelectAll" type="checkbox" class="checkbox" />';
+                text = '<input name="btSelectAll" type="checkbox" />';
                 that.header.stateField = column.field;
             }
             if (column.radio) {
@@ -646,8 +649,8 @@
                     type = that.options.columns[j].checkbox ? 'checkbox' : type;
                     type = that.options.columns[j].radio ? 'radio' : type;
 
-                    text = ['<td>',
-                        '<input class="checkbox"' +
+                    text = ['<td class="bs-checkbox">',
+                        '<input' +
                             sprintf(' data-index="%s"', i) +
                             sprintf(' name="%s"', that.options.selectItemName) +
                             sprintf(' type="%s"', type) +