Skip to content

Commit 67c4da6

Browse files
fix: Improve styling of adapter asset browser (apache#3818)
1 parent 39228cc commit 67c4da6

File tree

7 files changed

+39
-82
lines changed

7 files changed

+39
-82
lines changed

ui/deployment/i18n/de.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"Group": "Gruppe",
7575
"Save Pipeline": "Pipeline speichern",
7676
"Save pipeline": "Pipeline speichern",
77-
"Auto Layout": "Automatisches Layout",
77+
"Auto Layout": "Auto-Layout",
7878
"Add pipeline element": "Pipeline-Element hinzufügen",
7979
"Add element": "Element hinzufügen",
8080
"Add from template": "Aus Vorlage hinzufügen",

ui/src/app/configuration/security-configuration/alternate-id-configuration/alternate-id-configuration.component.html

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@
2929
</button>
3030
</div>
3131
}
32-
<div fxLayout="row" fxLayoutAlign="start center" class="alternate-id-row">
32+
<div
33+
fxLayout="row"
34+
fxLayoutAlign="start center"
35+
class="alternate-id-row"
36+
fxLayoutGap="10px"
37+
>
3338
<mat-form-field color="accent" fxFlex subscriptSizing="dynamic">
3439
<mat-label>New Alternate ID</mat-label>
3540
<input
@@ -40,7 +45,11 @@
4045
/>
4146
</mat-form-field>
4247
<div fxLayoutAlign="start center">
43-
<button mat-button class="mat-basic" (click)="addAlternateId()">
48+
<button
49+
mat-flat-button
50+
class="mat-basic"
51+
(click)="addAlternateId()"
52+
>
4453
<mat-icon>add</mat-icon><span>Add</span>
4554
</button>
4655
</div>

ui/src/app/configuration/security-configuration/edit-group-dialog/edit-group-dialog.component.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@
5858
<div class="sp-dialog-actions">
5959
<div fxLayout="row">
6060
<button
61-
mat-button
6261
mat-flat-button
63-
color="accent"
6462
(click)="save()"
6563
style="margin-right: 10px"
6664
[disabled]="!parentForm.valid || clonedGroup.roles.length === 0"

ui/src/app/connect/components/adapter-configuration/adapter-asset-configuration/adapter-asset-configuration.component.html

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,15 @@
1515
~ limitations under the License.
1616
~
1717
-->
18-
<div *ngIf="assetsData?.length">
18+
<div *ngIf="assetsData?.length" class="mt-10">
1919
<mat-tree
2020
[dataSource]="dataSource"
2121
[treeControl]="treeControl"
2222
class="asset-tree"
2323
>
2424
<!-- Parent Node Definition -->
2525
<mat-nested-tree-node *matTreeNodeDef="let node; when: hasChild">
26-
<div
27-
class="mat-tree-node"
28-
(click)="onAssetSelect(node)"
29-
[class.selected-node]="isSelected(node)"
30-
>
26+
<div class="mat-tree-node" (click)="onAssetSelect(node)">
3127
<button
3228
mat-icon-button
3329
matTreeNodeToggle
@@ -39,7 +35,9 @@
3935
: 'chevron_right'
4036
}}</mat-icon>
4137
</button>
42-
<span>{{ node.assetName }}</span>
38+
<span [class.selected-node]="isSelected(node)">{{
39+
node.assetName
40+
}}</span>
4341
</div>
4442
<div *ngIf="treeControl.isExpanded(node)" role="group">
4543
<ng-container matTreeNodeOutlet></ng-container>
@@ -48,19 +46,13 @@
4846

4947
<!-- Leaf Node Definition (no children) -->
5048
<mat-tree-node *matTreeNodeDef="let node" matTreeNodeToggle>
51-
<div
52-
class="mat-tree-node"
53-
(click)="onAssetSelect(node)"
54-
[class.selected-node]="isSelected(node)"
55-
>
56-
<button
57-
mat-icon-button
58-
matTreeNodeToggle
59-
[attr.aria-label]="'Toggle ' + node.assetName"
60-
>
61-
<mat-icon></mat-icon>
62-
</button>
63-
<span>{{ node.assetName }}</span>
49+
<div class="mat-tree-node" (click)="onAssetSelect(node)">
50+
<span class="mat-icon-button placeholder-icon">
51+
<mat-icon class="invisible"></mat-icon>
52+
</span>
53+
<span [class.selected-node]="isSelected(node)">{{
54+
node.assetName
55+
}}</span>
6456
</div>
6557
</mat-tree-node>
6658
</mat-tree>

ui/src/app/connect/components/adapter-configuration/adapter-asset-configuration/adapter-asset-configuration.component.scss

Lines changed: 8 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ mat-form-field {
3737
mat-checkbox {
3838
margin-right: 20px;
3939
}
40+
4041
.asset-tree {
41-
font-family: 'Roboto', sans-serif;
4242
padding-left: 10px;
4343
margin-left: 10px;
4444
}
@@ -47,6 +47,7 @@ mat-checkbox {
4747
display: flex;
4848
align-items: center;
4949
padding-left: 10px;
50+
cursor: pointer;
5051
}
5152

5253
.mat-nested-tree-node {
@@ -58,64 +59,22 @@ button[mat-icon-button] {
5859
margin-right: 8px;
5960
}
6061

61-
mat-icon {
62-
font-size: 18px;
63-
color: #3f51b5;
64-
}
65-
66-
.mat-tree-node span {
67-
font-weight: bold;
68-
}
69-
7062
.mat-tree-node:hover {
71-
background-color: #e8e8e8;
72-
}
73-
74-
.mat-nested-tree-node span {
75-
margin-left: 8px;
76-
}
77-
78-
.mat-nested-tree-node mat-icon {
79-
margin-left: 16px;
80-
}
81-
82-
.transparent-btn {
83-
background: transparent;
84-
border: none;
85-
padding: 0;
86-
margin-left: 10px;
87-
cursor: pointer;
88-
}
89-
90-
.transparent-btn:hover {
91-
background-color: rgba(63, 81, 181, 0.1);
92-
}
93-
94-
.transparent-btn mat-icon {
95-
font-size: 18px;
96-
opacity: 0.4;
97-
}
98-
99-
.transparent-btn:hover mat-icon {
100-
opacity: 1;
101-
}
102-
103-
.selected-node {
104-
background-color: #e0f7fa;
63+
background-color: var(--color-bg-2);
10564
border-radius: 4px;
106-
padding: 5px;
107-
font-family: 'Roboto-Bold', serif;
108-
font-weight: bolder;
10965
}
11066

111-
.selected-node:hover {
112-
background-color: #b2ebf2;
67+
.selected-node {
68+
color: var(--color-secondary);
11369
}
11470

11571
.placeholder-icon {
11672
display: inline-flex;
11773
justify-content: center;
11874
align-items: center;
75+
margin-right: 8px;
76+
width: 32px;
77+
height: 32px;
11978
}
12079

12180
.placeholder-icon .mat-icon.invisible {

ui/src/app/connect/components/adapter-configuration/start-adapter-configuration/adapter-options-panel/adapter-options-panel.component.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,25 @@
1717
*/
1818

1919
.options-panel {
20-
border-left: 4px solid var(--color-primary);
20+
border-left: 1px solid var(--color-primary);
21+
border-radius: 5px;
2122
border-bottom: 1px solid var(--color-bg-2);
2223
border-top: 1px solid var(--color-bg-2);
2324
border-right: 1px solid var(--color-bg-2);
2425
padding: 8px;
25-
background: var(--color-bg-1);
2626
margin-top: 6px;
2727
margin-bottom: 6px;
2828
}
2929

3030
.title {
3131
color: var(--color-default-text);
32-
font-weight: 600;
32+
font-weight: 500;
3333
font-size: 13pt;
3434
}
3535

3636
.description {
3737
font-size: 10pt;
38+
font-weight: 300;
3839
}
3940

4041
.icon {

ui/src/app/editor/components/pipeline-assembly/pipeline-assembly-options/pipeline-assembly-options.component.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<div fxFlex="100" fxLayout="row" fxLayoutAlign="start center">
2020
<button
2121
mat-flat-button
22-
[matTooltip]="'Save Pipeline' | translate"
22+
[matTooltip]="'Save pipeline' | translate"
2323
[matTooltipPosition]="'above'"
2424
[disabled]="!pipelineValidationService.pipelineValid"
2525
(click)="savePipelineEmitter.emit()"
@@ -28,7 +28,7 @@
2828
>
2929
<div fxLayoutAlign="start center" fxLayout="row">
3030
<i class="material-icons">save</i>
31-
<span>&nbsp;{{ 'Save pipeline' | translate }}</span>
31+
<span>&nbsp;{{ 'Save' | translate }}</span>
3232
</div>
3333
</button>
3434
<span class="assembly-options-divider"></span>
@@ -52,14 +52,12 @@
5252
</button>
5353
<span class="assembly-options-divider"></span>
5454
<button
55-
mat-flat-button
56-
class="mat-basic"
55+
mat-icon-button
5756
[matTooltip]="'Auto Layout' | translate"
5857
[matTooltipPosition]="'above'"
5958
(click)="autoLayout()"
6059
>
6160
<i class="material-icons">settings_overscan</i>
62-
<span>&nbsp;{{ 'Auto Layout' | translate }}</span>
6361
</button>
6462
<span class="assembly-options-divider"></span>
6563
<button

0 commit comments

Comments
 (0)