Merge branch 'develop/ng2-smart-table-int' into development

package.json

@@ -41,7 +41,7 @@
     "ng2-bootstrap": "^1.0.20",
     "ng2-branchy": "^0.0.2-5",
     "ng2-ckeditor": "^1.0.4",
-    "ng2-smart-table": "^0.1.5",
+    "ng2-smart-table": "^0.1.6",
     "ng2-uploader": "0.5.6",
     "normalize.css": "^4.1.1",
     "rxjs": "5.0.0-beta.6",

src/app/pages/tables/components/smartTables/smartTables.component.ts

@@ -66,33 +66,4 @@ export class SmartTables {
       this.source.load(data);
     });
   }
-
-  onSearch(): void {
-    this.source.setFilter([
-      {
-        field: 'id',
-        search: this.query
-      },
-      {
-        field: 'firstName',
-        search: this.query
-      },
-      {
-        field: 'lastName',
-        search: this.query
-      },
-      {
-        field: 'username',
-        search: this.query
-      },
-      {
-        field: 'email',
-        search: this.query
-      },
-      {
-        field: 'age',
-        search: this.query
-      }
-    ], false);
-  }
 }

src/app/pages/tables/components/smartTables/smartTables.html

@@ -2,13 +2,6 @@
 
   <div class="row">
     <ba-card title="Basic Example" baCardClass="with-scroll">
-      <div class="row">
-        <div class="form-group col-sm-3 col-xs-6">
-          <input type="text" class="form-control" placeholder="Search" [(ngModel)]="query" (keydown.enter)="onSearch()">
-        </div>
-        <button type="submit" class="btn btn-primary" (click)="onSearch()">Search</button>
-      </div>
-
       <ng2-smart-table [settings]="settings" [source]="source"></ng2-smart-table>
     </ba-card>
   </div>

src/app/pages/tables/components/smartTables/smartTables.scss

@@ -2,8 +2,9 @@
 
 .ng2-smart-table-container table.ng2-smart-table {
   th, td {
-    border: 1px solid $border;
+    border: 1px solid $border-light !important;
     line-height: 35px;
+    vertical-align: middle;
   }
 
   color: $default-text;
@@ -12,12 +13,22 @@
     line-height: 1.5 !important;
   }
 
+  tbody {
+    tr:hover {
+      background: rgba(0, 0, 0, 0.03);
+    }
+  }
+
   a.ng2-smart-sort-link {
     font-size: 14px !important;
     color: $default-text;
     font-weight: $font-bolder;
     &.sort {
       font-weight: $font-bolder !important;
+
+      &::after {
+        border-bottom-color: $default-text !important;
+      }
     }
   }
 
@@ -27,9 +38,6 @@
     .actions {
       float: none;
       text-align: center;
-      a + a {
-        padding-left: 10px;
-      }
     }
   }
 
@@ -37,6 +45,7 @@
     font-size: 14px !important;
     color: $default-text;
     padding: 0 5px;
+    display: inline-block;
 
     &.ng2-smart-action-add-add {
       font-size: 25px !important;