Skip to content

Commit d9c7252

Browse files
author
Patricio Albizu
committed
Merge branch 'main' of github.com:hypertrace/hypertrace-ui into ModifyDefaultSizeOptionToggleSwitch
2 parents ca81a93 + 427932c commit d9c7252

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed

package-lock.json

Lines changed: 9 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"@angular/platform-browser": "^11.2.0",
3636
"@angular/platform-browser-dynamic": "^11.2.0",
3737
"@angular/router": "^11.2.0",
38-
"@apollo/client": "^3.3.10",
38+
"@apollo/client": "^3.3.11",
3939
"@hypertrace/hyperdash": "^1.2.1",
4040
"@hypertrace/hyperdash-angular": "^2.5.0",
4141
"@types/d3-hierarchy": "^2.0.0",

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

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

4-
.table {
4+
.table-container {
55
position: relative;
66
display: flex;
77
flex-direction: column;
8-
flex: 1 1;
8+
height: 100%;
9+
width: 100%;
10+
}
11+
12+
.table {
13+
display: flex;
14+
flex-direction: column;
15+
flex: 1 1 0;
916
height: 100%;
1017
width: 100%;
1118
overflow: auto;
@@ -116,6 +123,7 @@
116123
.pagination-controls {
117124
position: fixed;
118125
width: 100%;
126+
height: #{$paginator-height};
119127
bottom: 0;
120128
background: white;
121129
}

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">
62+
<div class="table-container">
6363
<cdk-table
6464
*ngIf="this.dataSource"
6565
[multiTemplateDataRows]="this.isDetailType()"

0 commit comments

Comments
 (0)