Skip to content
This repository was archived by the owner on Sep 4, 2020. It is now read-only.

Commit 7101361

Browse files
Merge branch 'master' into remove-parjs
2 parents 089a655 + 6d16abb commit 7101361

File tree

11 files changed

+16
-67
lines changed

11 files changed

+16
-67
lines changed

projects/components/src/paginator/paginator.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
flex-direction: row;
77
align-items: center;
88

9-
height: 40px;
9+
height: 50px;
1010
padding-top: 6px;
1111
border-top: 1px solid $color-border;
1212

projects/components/src/panel/panel.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
border-radius: 2px;
1111

1212
&.expanded {
13-
margin-bottom: 10px;
13+
margin-bottom: 8px;
1414
}
1515

1616
.header-content {

projects/components/src/select/select.component.scss

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
.select {
1616
display: flex;
1717
align-items: center;
18-
border-radius: 4px;
18+
border: 1px solid $gray-2;
19+
border-radius: 6px;
1920
height: 100%;
2021
width: 100%;
21-
background: $gray-1;
2222

2323
.select-container {
2424
width: 100%;
@@ -28,10 +28,6 @@
2828
opacity: 0.4;
2929
}
3030

31-
&.default {
32-
background: $gray-1;
33-
}
34-
3531
&.primary {
3632
background: $green-3;
3733
}

projects/components/src/tabs/navigable/navigable-tab-group.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99

1010
.tab-group {
1111
::ng-deep .mat-tab-link {
12-
font: inherit;
12+
@include body-1-medium($gray-5);
13+
line-height: 20px;
1314
}
1415

1516
::ng-deep .mat-tab-label-active {
16-
color: $gray-7;
17+
color: $gray-9;
1718
}
1819

1920
::ng-deep .mat-ink-bar {

projects/dashboards/src/widgets/header/widget-header.model.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,4 +49,10 @@ export class WidgetHeaderModel {
4949
} as ModelModelPropertyTypeInstance
5050
})
5151
public link?: LinkWidgetModel;
52+
53+
@ModelProperty({
54+
key: 'top-margin',
55+
type: BOOLEAN_PROPERTY.type
56+
})
57+
public topMargin?: boolean = false;
5258
}

projects/distributed-tracing/src/public-api.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ export * from './shared/graphql/request/builders/selections/graphql-selection-bu
1515
export * from './shared/graphql/request/builders/specification/specification-builder';
1616
export * from './shared/graphql/request/builders/specification/trace/trace-status/trace-status-specification-builder';
1717

18-
// Context
19-
export { SpecificationContextBuilder } from './shared/graphql/request/builders/context/specification-context-builder.service';
20-
2118
// Dashboard Graphql
2219
export * from './shared/dashboard/data/graphql/filter/graphql-filter-data-source.model';
2320
export * from './shared/dashboard/data/graphql/filter/graphql-filter-data-source.model';

projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
width: 100%;
99
}
1010

11-
.with-header {
11+
.header-margin {
1212
margin-top: 16px;
1313
}
1414
}

projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { TableWidgetModel } from './table-widget.model';
2121
>
2222
<htc-table
2323
class="table"
24-
[ngClass]="{ 'with-header': this.model.header }"
24+
[ngClass]="{ 'header-margin': this.model.header?.topMargin }"
2525
[columnConfigs]="this.columnDefs"
2626
[mode]="this.model.mode"
2727
[display]="this.model.style"
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Dictionary, TimeDuration } from '@hypertrace/common';
1+
import { Dictionary } from '@hypertrace/common';
22
import { GraphQlSelection } from '@hypertrace/graphql-client';
33
import { GraphQlSortWithoutDirection } from '../sort/graphql-sort-without-direction';
44

@@ -10,7 +10,3 @@ export interface Specification {
1010
asGraphQlOrderByFragment(): GraphQlSortWithoutDirection;
1111
extractFromServerData(resultContainer: Dictionary<unknown>): unknown;
1212
}
13-
14-
export interface SpecificationResolutionContext {
15-
getAutoInterval(): TimeDuration;
16-
}

projects/distributed-tracing/src/shared/graphql/request/builders/context/specification-context-builder.service.test.ts

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)