Skip to content

Commit 5183cf9

Browse files
authored
Merge branch 'master' into issue-255
2 parents 50dff11 + 656aba1 commit 5183cf9

File tree

10 files changed

+38
-11
lines changed

10 files changed

+38
-11
lines changed

src/app/app.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@
8181
<button mat-icon-button (click)="clearHistory()"
8282
*ngIf="currentInstance"
8383
[disabled]="!currentInstance"
84-
matTooltip="{{currentInstance?'Clear all history':''}}">
84+
matTooltip="{{currentInstance?'Clear History':''}}">
8585
<i class="material-icons">clear_all</i>
8686
</button>
8787

8888
<button mat-icon-button (click)="toggleCli()"
8989
*ngIf="currentInstance"
9090
[disabled]="!currentInstance"
91-
matTooltip="{{currentInstance?'Toggle Cli panel':''}}">
91+
matTooltip="{{currentInstance?'Toggle Panel':''}}">
9292
<i class="material-icons">{{(cli$ | async)?.expanded ? 'keyboard_arrow_down':'keyboard_arrow_up'}}</i>
9393
</button>
9494

src/app/components/add-value-form/add-value-form.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
type="number">
3636
</mat-form-field>
3737

38-
<button mat-icon-button (click)="onRemoveItem(getItemArray(),i)" *ngIf="!isEditMode && getItemArray().length > 1">
38+
<button mat-icon-button (click)="onRemoveItem(getItemArray(),i)" *ngIf="!isEditMode && getItemArray().length > 1"
39+
matTooltip="Delete">
3940
<i class="material-icons delete-icon">delete</i>
4041
</button>
4142
</div>

src/app/components/data-viewer/data-viewer.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
[(ngModel)]="stringValue"
3636
#autosize="cdkTextareaAutosize"
3737
cdkAutosizeMinRows="2"
38-
[maxLength]="2000"></textarea>
38+
cdkAutosizeMaxRows="{{(cli$ | async)?.expanded ? 8 : 15}}"></textarea>
3939
</mat-form-field>
4040

4141
<button mat-raised-button

src/app/components/data-viewer/data-viewer.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,8 @@ export class DataViewerComponent implements OnInit, OnChanges {
276276
}).afterClosed().subscribe(ret => {
277277
if (ret) {
278278
ret.onSuccess = () => {
279-
if (this.pageData.item.type === 'folder') {
280-
} else {
281-
this._store.dispatch(new ReqFetchTree({id: this.pageData.id}));
279+
this._store.dispatch(new ReqFetchTree({id: this.pageData.id}));
280+
if (this.pageData.item.type !== 'folder') {
282281
this.hashCachedData = null;
283282
this.setCachedData = null;
284283
this.fetchData();

src/app/components/instance-tree/instance-tree.component.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
.instance-root {
22
margin-top: 16px;
33
.item-line {
4-
cursor: pointer;
54
display: flex;
65
flex-direction: row;
76
padding: 2px;
@@ -19,6 +18,9 @@
1918
}
2019
}
2120
}
21+
>.item-line {
22+
cursor: pointer;
23+
}
2224
.sub-items {
2325
margin-top: 8px;
2426
}

src/app/components/tree-node/tree-node.component.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.item-line {
2-
cursor: pointer;
2+
33
display: flex;
44
flex-direction: row;
55
padding: 2px;
@@ -28,11 +28,12 @@
2828
display: none;
2929
}
3030
.single-line {
31+
cursor: pointer;
3132
height: 20px;
3233
display: flex;
3334
flex-direction: row;
3435
align-items: center;
35-
padding-right: 24px;
36+
padding-right: 12px;
3637

3738
.value-type {
3839
font-size: 8px;

src/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ mat-form-field {
7070
.mat-expansion-panel-header {
7171
height: 64px;
7272
}
73-
73+
7474
.mat-expansion-panel-content {
7575
height: auto;
7676
}

src/themes/dark-theme.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,11 @@ $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn);
8686
.dark-theme .cli.mat-elevation-z12 {
8787
box-shadow: 0px 7px 8px -4px rgba(0, 0, 0, 0.2), 0px 12px 17px 2px rgba(0, 0, 0, 0.14), 0px 5px 22px 4px rgba(0, 0, 0, 8)
8888
}
89+
90+
.dark-theme .mat-dialog-content .mat-expansion-panel {
91+
&.mat-expanded {
92+
.mat-expansion-panel-header {
93+
background-color: #878787;
94+
}
95+
}
96+
}

src/themes/light-theme.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,11 @@ $app-bg-color: white;
8989
.light-theme .cli.mat-elevation-z12 {
9090
box-shadow: 0px 7px 8px -4px rgba(0, 0, 0, 0.2), 0px 12px 17px 2px rgba(0, 0, 0, 0.14), 0px 5px 22px 4px rgba(0, 0, 0, 0.8)
9191
}
92+
93+
.light-theme .mat-dialog-content .mat-expansion-panel {
94+
&.mat-expanded {
95+
.mat-expansion-panel-header {
96+
background-color: #dfdfdf;
97+
}
98+
}
99+
}

src/themes/magenta-theme.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,11 @@ $app-bg-color: white;
176176
.magenta-theme .cli.mat-elevation-z12 {
177177
box-shadow: 0px 7px 8px -4px rgba(0, 0, 0, 0.2), 0px 12px 17px 2px rgba(0, 0, 0, 0.14), 0px 5px 22px 4px rgba(0, 0, 0, 0.8);
178178
}
179+
180+
.magenta-theme .mat-dialog-content .mat-expansion-panel {
181+
&.mat-expanded {
182+
.mat-expansion-panel-header {
183+
background-color: mat-color($tmo-brand, 500);
184+
}
185+
}
186+
}

0 commit comments

Comments
 (0)