Skip to content

Commit 52befc5

Browse files
authored
Revert "refactor: fixing table css so that it can work inside flex container (#668)" (#671)
This reverts commit 427932c.
1 parent 1b74046 commit 52befc5

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

projects/components/src/table/table.component.scss

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
@import 'mixins';
22
@import 'layout';
33

4-
.table-container {
5-
position: relative;
6-
display: flex;
7-
flex-direction: column;
8-
height: 100%;
9-
width: 100%;
10-
}
11-
124
.table {
5+
position: relative;
136
display: flex;
147
flex-direction: column;
15-
flex: 1 1 0;
8+
flex: 1 1;
169
height: 100%;
1710
width: 100%;
1811
overflow: auto;
@@ -123,7 +116,6 @@
123116
.pagination-controls {
124117
position: fixed;
125118
width: 100%;
126-
height: #{$paginator-height};
127119
bottom: 0;
128120
background: white;
129121
}

projects/components/src/table/table.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import { TableColumnConfigExtended, TableService } from './table.service';
5959
styleUrls: ['./table.component.scss'],
6060
changeDetection: ChangeDetectionStrategy.OnPush,
6161
template: `
62-
<div class="table-container">
62+
<div class="table">
6363
<cdk-table
6464
*ngIf="this.dataSource"
6565
[multiTemplateDataRows]="this.isDetailType()"

0 commit comments

Comments
 (0)