Merge remote-tracking branch 'origin/master'

ThirdCornerLLC · Jun 24, 2015 · 6c6d071 · 6c6d071
2 parents 752bc94 + b81b388
commit 6c6d071
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/dist/tc-grid.css b/dist/tc-grid.css
@@ -176,7 +176,7 @@
   border-bottom: 0;
 }
 .tcGrid__scope .tc-grid_blank .tc-style_table .tc-display_thead .tc-style_tr {
-  background-color: #ffffff;
+  background-color: inherit;
 }
 .tcGrid__scope .tc-grid_blank .tc-style_table .tc-display_thead .tc-style_th {
   font-weight: bold;
@@ -208,13 +208,13 @@
   content: "\25B2";
 }
 .tcGrid__scope .tc-grid_blank .tc-style_table .tc-display_tbody .tc-style_tr:nth-child(odd) {
-  background-color: #ffffff;
+  background-color: inherit;
 }
 .tcGrid__scope .tc-grid_blank .tc-style_table .tc-display_tbody .tc-style_tr:nth-child(even) {
-  background-color: #ffffff;
+  background-color: inherit;
 }
 .tcGrid__scope .tc-grid_blank .tc-style_table .tc-display_tbody .tc-style_tr[ng-click]:hover {
-  background-color: #ffffff;
+  background-color: inherit;
 }
 .tcGrid__scope .tc-grid_blank .tc-style_table .tc-display_tbody .tc-display_tr .tc-mobile-header {
   padding-right: 5px;
@@ -246,7 +246,7 @@
   }
 }
 .tcGrid__scope .tc-grid_blank .tc-display_pager {
-  background-color: #ffffff;
+  background-color: inherit;
   padding: 0;
   margin-top: 10px;
 }

diff --git a/dist/tc-grid.min.css b/dist/tc-grid.min.css
diff --git a/src/less/tcGrid.less b/src/less/tcGrid.less
@@ -31,11 +31,11 @@
 .tcGrid_blank(
   @border:0,
   @pagerMarginTop: 10px,
-  @pagerColor: #FFF,
-  @headerColor: #FFF,
-  @rowColor: #FFF,
-  @rowColorAlternating: #FFF,
-  @rowColorHover: #FFF,
+  @pagerColor: inherit,
+  @headerColor: inherit,
+  @rowColor: inherit,
+  @rowColorAlternating: inherit,
+  @rowColorHover: inherit,
   @rowBorder: 0,
   @headerRowBorder: 0,
   @cellPadding:0