style(table): fix #112, fix #290

akveo · Apr 21, 2017 · 4504fcf · 4504fcf
1 parent 68205eb
commit 4504fcf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/src/app/shared/components/basic-example/basic-example.component.ts b/src/app/shared/components/basic-example/basic-example.component.ts
@@ -12,7 +12,7 @@ export class BasicExampleComponent {
     columns: {
       id: {
         title: 'ID',
-        width: '60px',
+        width: '100px',
       },
       name: {
         title: 'Full Name',

diff --git a/src/ng2-smart-table/components/cell/cell-editors/editor.component.scss b/src/ng2-smart-table/components/cell/cell-editors/editor.component.scss
@@ -3,6 +3,6 @@
   textarea {
     width: 100%;
     line-height: normal;
-    padding: .375rem .75rem;
+    padding: .375em .75em;
   }
 }
diff --git a/src/ng2-smart-table/components/filter/filter.component.scss b/src/ng2-smart-table/components/filter/filter.component.scss
@@ -5,7 +5,7 @@
       select {
         width: 100%;
         line-height: normal;
-        padding: .375rem .75rem;
+        padding: .375em .75em;
         font-weight: normal;
       }
       input[type="search"] {

diff --git a/src/ng2-smart-table/components/pager/pager.component.scss b/src/ng2-smart-table/components/pager/pager.component.scss
@@ -1,6 +1,6 @@
 .ng2-smart-pagination {
   display: inline-block;
-  font-size: .875rem;
+  font-size: .875em;
   padding: 0;
 
   .sr-only {

diff --git a/src/ng2-smart-table/ng2-smart-table.component.scss b/src/ng2-smart-table/ng2-smart-table.component.scss
@@ -1,11 +1,9 @@
-$table-font-color: #606c71;
-$table-border-color: #e9ebec;
-
 :host {
+  font-size: 1rem;
+
   /deep/ {
     * {
       box-sizing: border-box;
-      font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
     }
 
     button,
@@ -19,9 +17,7 @@ $table-border-color: #e9ebec;
     }
 
     table {
-      font-size: 16px;
-      line-height: 1.5;
-      color: $table-font-color;
+      line-height: 1.5em;
       border-collapse: collapse;
       border-spacing: 0;
       display: table;
@@ -36,15 +32,14 @@ $table-border-color: #e9ebec;
           font-weight: bold;
         }
         section {
-          font-size: .75rem;
+          font-size: .75em;
           font-weight: bold;
         }
         td,
         th {
-          font-size: .875rem;
+          font-size: .875em;
           margin: 0;
-          padding: 0.5rem 1rem;
-          border: 1px solid $table-border-color;
+          padding: 0.5em 1em;
         }
       }
     }