Merge pull request #70 from wenzhixin/master

Update my repo
wenzhixin · Jun 27, 2015 · 50360ce · 50360ce
2 parents ac6e744 + 64446db
commit 50360ce
Show file tree

Hide file tree

Showing 12 changed files with 273 additions and 148 deletions.
diff --git a/docs/_i18n/en/documentation/column-options.md b/docs/_i18n/en/documentation/column-options.md
@@ -62,12 +62,26 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
         <td>undefined</td>
         <td>The column class name.</td>
     </tr>
+    <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
     <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indicate how to align the column data. "left', 'right', 'center' can be used.</td>
+        <td>Indicate how to align the column data. 'left', 'right', 'center' can be used.</td>
     </tr>
     <tr>
         <td>halign</td>

diff --git a/docs/_i18n/es/documentation/column-options.md b/docs/_i18n/es/documentation/column-options.md
@@ -62,12 +62,26 @@ Las propiedades de la columna están definidas en `jQuery.fn.bootstrapTable.colu
         <td>undefined</td>
         <td>La clase CSS de la columna.</td>
     </tr>
+    <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
     <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indica cómo se alinea la columna. Se puede usar "left', 'right', 'center'.</td>
+        <td>Indica cómo se alinea la columna. Se puede usar 'left', 'right', 'center'.</td>
     </tr>
     <tr>
         <td>halign</td>
@@ -216,4 +230,4 @@ Las propiedades de la columna están definidas en `jQuery.fn.bootstrapTable.colu
         <td>True para incluir la columna en la búsqueda.</td>
     </tr>
     </tbody>
-</table>
+</table>
diff --git a/docs/_i18n/zh-cn/documentation/column-options.md b/docs/_i18n/zh-cn/documentation/column-options.md
@@ -62,12 +62,26 @@ The column options is defined in `jQuery.fn.bootstrapTable.columnDefaults`.
         <td>undefined</td>
         <td>The column class name.</td>
     </tr>
+    <tr>
+        <td>rowspan</td>
+        <td>rowspan / data-rowspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many rows a cell should take up.</td>
+    </tr>
+    <tr>
+        <td>colspan</td>
+        <td>colspan / data-colspan</td>
+        <td>Number</td>
+        <td>undefined</td>
+        <td>Indicate how many columns a cell should take up.</td>
+    </tr>
     <tr>
         <td>align</td>
         <td>data-align</td>
         <td>String</td>
         <td>undefined</td>
-        <td>Indicate how to align the column data. "left', 'right', 'center' can be used.</td>
+        <td>Indicate how to align the column data. 'left', 'right', 'center' can be used.</td>
     </tr>
     <tr>
         <td>halign</td>

diff --git a/src/bootstrap-table.css b/src/bootstrap-table.css
@@ -40,17 +40,12 @@
 
 .fixed-table-footer,
 .fixed-table-header {
-    height: 37px; /*cellHeight*/
     overflow: hidden;
     border-radius: 4px 4px 0 0;
     -webkit-border-radius: 4px 4px 0 0;
     -moz-border-radius: 4px 4px 0 0;
 }
 
-.fixed-table-header {
-    border-bottom: 1px solid #dddddd;
-}
-
 .fixed-table-footer {
     border-top: 1px solid #dddddd;
 }
@@ -265,7 +260,7 @@
 
 .bootstrap-table .table > thead > tr > th {
     vertical-align: bottom;
-    border-bottom: 2px solid #ddd;
+    border-bottom: 1px solid #ddd;
 }
 
 /* support bootstrap 3 */