merge #63

AllenFang · Oct 10, 2015 · 43e484f · 43e484f
2 parents 7de3322 + 0cc7d0b
commit 43e484f
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 16 deletions.
diff --git a/css/react-bootstrap-table.css b/css/react-bootstrap-table.css
@@ -6,17 +6,16 @@
 }
 .react-bs-table .table-header{
   height: 42px;
-  border-right-width: 1px;
-  border-right-style: solid;
-  border-right-color: rgb(221, 221, 221);
   border-top-width: 1px;
   border-top-style: solid;
   border-top-color: rgb(221, 221, 221);
+  border-bottom-width: 0px;
+  border-bottom-style: solid;
+  border-bottom-color: rgb(221, 221, 221);
 }
 
 .react-bs-table .table-header > table{
   table-layout: fixed;
-  border-right-style: hidden;
   border-top-style: hidden;
 }
 

diff --git a/css/react-bootstrap-table.min.css b/css/react-bootstrap-table.min.css
diff --git a/demo/basic-example.html b/demo/basic-example.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>react-bootstrap-table demo</title>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
-    <link rel="stylesheet" href="../css/react-bootstrap-table.min.css">
+    <link rel="stylesheet" href="../css/react-bootstrap-table.css">
     <script src="http://code.jquery.com/jquery-2.1.3.min.js"></script>
 		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>