You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2021/07/13 07:57:38 UTC
[incubator-streampipes] 01/04: [STREAMPIPES-395] Harmonize colors
in connect module
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-319
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 627dbadb277c10c9193e19828f9317c65a9ff127
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Thu Jul 8 21:48:04 2021 +0200
[STREAMPIPES-395] Harmonize colors in connect module
---
.../event-property-row/event-property-row.component.html | 6 +++---
.../schema-editor/event-schema/event-schema.component.scss | 4 ++--
.../start-adapter-configuration.component.html | 8 ++++----
.../adapter-started/adapter-started-dialog.component.html | 2 +-
.../edit-correction-value.component.html | 6 +++---
.../components/edit-data-type/edit-data-type.component.html | 2 +-
.../edit-timestamp-property.component.html | 6 +++---
.../edit-unit-transformation.component.html | 8 ++++----
.../edit-event-property/edit-event-property.component.html | 11 ++++++-----
9 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.html b/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.html
index fe6966d..2779bb6 100644
--- a/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.html
+++ b/ui/src/app/connect/components/schema-editor/event-property-row/event-property-row.component.html
@@ -37,13 +37,13 @@
<div fxFlex="0 1 auto" fxLayoutAlign="center center"
*ngIf="isNested">
- <button [disabled]="!isEditable" color="primary" mat-button (click)=addNestedProperty(node.data)>
+ <button [disabled]="!isEditable" color="accent" mat-button (click)=addNestedProperty(node.data)>
<mat-icon matTooltip="Add a Nested Property">queue</mat-icon>
</button>
</div>
<div fxFlex="0 1 auto" fxLayoutAlign="center center"
*ngIf="isNested || isPrimitive || isList">
- <button [disabled]="!isEditable" color="primary" mat-button
+ <button [disabled]="!isEditable" color="accent" mat-button
(click)="openEditDialog(node.data)"
[attr.data-cy]="'edit-' + label">
<mat-icon>edit</mat-icon>
@@ -56,4 +56,4 @@
[class.checkbox-selected]="node.data.selected" [checked]="node.data.selected">
</mat-checkbox>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.scss b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.scss
index 16786d5..ff253bb 100644
--- a/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.scss
+++ b/ui/src/app/connect/components/schema-editor/event-schema/event-schema.component.scss
@@ -56,7 +56,7 @@ ul {
width: 95%;
}
:host ::ng-deep .tree-node {
- color: #000;
+ color: var(--color-default-text);
border-left: none;
border-right: none;
border-bottom: none;
@@ -72,7 +72,7 @@ ul {
flex: 1;
}
:host ::ng-deep .node-content-wrapper:hover {
- background-color: darkgrey;
+ background-color: var(--color-bg-2);
}
:host ::ng-deep .node-content-wrapper-active, .node-content-wrapper-focused {
background: transparent;
diff --git a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
index c26b2c9..28f0dfb 100644
--- a/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
+++ b/ui/src/app/connect/components/start-adapter-configuration/start-adapter-configuration.component.html
@@ -23,11 +23,11 @@
<div class="sp-blue-border padding" style="padding: 15px; margin-bottom: 2%;">
<div fxLayoutAlign="center" fxLayout="column" fxFlex="100">
- <mat-form-field>
+ <mat-form-field color="accent">
<input matInput id="input-AdapterName" [ngModelOptions]="{standalone: true}" placeholder="Adapter Name"
[(ngModel)]="adapterDescription.name" data-cy="sp-adapter-name">
</mat-form-field>
- <mat-form-field>
+ <mat-form-field color="accent">
<input matInput id="input-AdapterDescription" [ngModelOptions]="{standalone: true}"
placeholder="Adapter Description" [(ngModel)]="adapterDescription.description">
</mat-form-field>
@@ -98,12 +98,12 @@
<button class="mat-basic" mat-raised-button (click)="removeSelection()">Cancel</button>
<button style="margin-left:10px;" class="mat-basic stepper-button" mat-raised-button (click)="goBack()">Back</button>
<button [disabled]="startAdapterSettingsFormValid" mat-raised-button
- id="button-saveTemplate" color="primary" (click)="saveTemplate()" mat-button
+ id="button-saveTemplate" color="accent" (click)="saveTemplate()" mat-button
style="margin-left:10px;">
Save as Template
</button>
<button [disabled]="startAdapterSettingsFormValid" mat-raised-button id="button-startAdapter"
- color="primary" (click)="startAdapter()" mat-button style="margin-left:10px;">
+ color="accent" (click)="startAdapter()" mat-button style="margin-left:10px;">
Start Adapter
</button>
</div>
diff --git a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
index 098575b..2525afd 100644
--- a/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
+++ b/ui/src/app/connect/dialog/adapter-started/adapter-started-dialog.component.html
@@ -20,7 +20,7 @@
<div class="sp-dialog-content p-15">
<div fxLayout="column" *ngIf="!adapterInstalled">
<div fxLayoutAlign="center" >
- <mat-spinner fxLayoutAlign="center" style="margin: 10px 0 5px 0" >Loading</mat-spinner>
+ <mat-spinner fxLayoutAlign="center" style="margin: 10px 0 5px 0" color="accent">Loading</mat-spinner>
</div>
<div fxLayoutAlign="center">
<h3>Please wait while your new adapter is being generated...</h3>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.html
index b9dbe8e..718797b 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-correction-value/edit-correction-value.component.html
@@ -18,12 +18,12 @@
<div fxLayout="row" fxLayoutAlign="start">
<div class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width" style="margin-right: 10px" >
+ <mat-form-field class="example-full-width" style="margin-right: 10px" color="accent">
<input matInput name="correction" placeholder="Correction Value" [(ngModel)]="cachedProperty.correctionValue" (change)="valueChanged()">
</mat-form-field>
</div>
<div class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width">
+ <mat-form-field class="example-full-width" color="accent">
<mat-select
required
placeholder="Math Operator"
@@ -36,4 +36,4 @@
</mat-select>
</mat-form-field>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.html
index 92aef57..f8da0c0 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-data-type/edit-data-type.component.html
@@ -16,7 +16,7 @@
~
-->
-<mat-form-field class="doubleWidth" >
+<mat-form-field class="doubleWidth" color="accent">
<mat-select placeholder="Runtime Type" [(ngModel)]="cachedProperty.runtimeType" (selectionChange)="valueChanged()">
<mat-option *ngFor="let dataType of runtimeDataTypes" [value]="dataType.url">
{{ dataType.label }}
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.html
index aaf84ea..e36dfa8 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-timestamp-property/edit-timestamp-property.component.html
@@ -17,7 +17,7 @@
-->
<div fxLayout="row" fxLayoutAlign="start">
- <mat-form-field class="doubleWidth">
+ <mat-form-field class="doubleWidth" color="accent">
<mat-select placeholder="Timestamp converter (unix timestamp)"
[(value)]="cachedProperty.timestampTransformationMode">
<mat-option value="none">None</mat-option>
@@ -30,11 +30,11 @@
<div fxLayout="row" fxLayoutAlign="start">
<div class="form-group" fxFlexAlign="center">
- <mat-form-field class="doubleWidth" *ngIf="cachedProperty.timestampTransformationMode === 'formatString'">
+ <mat-form-field class="doubleWidth" *ngIf="cachedProperty.timestampTransformationMode === 'formatString'" color="accent">
<input matInput placeholder="E.g. yyyy-MM-dd HH:mm:ss.SSSZ"
[(ngModel)]="cachedProperty.timestampTransformationFormatString">
</mat-form-field>
- <mat-form-field class="doubleWidth" *ngIf="cachedProperty.timestampTransformationMode === 'timeUnit'">
+ <mat-form-field class="doubleWidth" *ngIf="cachedProperty.timestampTransformationMode === 'timeUnit'" color="accent">
<mat-select placeholder="Current time unit" [(value)]="selectedTimeMultiplier">
<mat-option value="milliseconds" (click)="cachedProperty.timestampTransformationMultiplier = 0">
Milliseconds</mat-option>
diff --git a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html
index e85e126..43a8b05 100644
--- a/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/components/edit-unit-transformation/edit-unit-transformation.component.html
@@ -18,7 +18,7 @@
<div fxLayout="row" fxLayoutAlign="start" *ngIf="showUnitTransformation">
<div class="form-group" fxFlexAlign="center" style="width: 155px">
- <mat-form-field *ngIf="!hadMeasurementUnit" class="example-full-width" style="width: 155px">
+ <mat-form-field *ngIf="!hadMeasurementUnit" class="example-full-width" style="width: 155px" color="accent">
<input matInput placeholder="Unit" [matAutocomplete]="auto" [formControl]="stateCtrl"
[attr.disabled]="transformUnitEnable ? '' : null">
<mat-autocomplete #auto="matAutocomplete" [displayWith]="displayFn" [panelWidth]="'300px'">
@@ -27,17 +27,17 @@
</mat-option>
</mat-autocomplete>
</mat-form-field>
- <mat-form-field *ngIf="hadMeasurementUnit" class="example-full-width" style="width: 155px">
+ <mat-form-field *ngIf="hadMeasurementUnit" class="example-full-width" style="width: 155px" color="accent">
<input matInput placeholder="Unit" disabled [(ngModel)]="oldMeasurementUnitDipsplay">
</mat-form-field>
</div>
- <button mat-button (click)="transformUnit()" color="primary" class="form-group" fxFlexAlign="center"
+ <button mat-button (click)="transformUnit()" color="accent" class="form-group" fxFlexAlign="center"
style="min-width: 60px; max-width: 60px">
<mat-icon *ngIf="!transformUnitEnable">arrow_forward</mat-icon>
<mat-icon *ngIf="transformUnitEnable" style="transform: rotate(180deg)">arrow_forward</mat-icon>
</button>
- <mat-form-field class="example-full-width" style="width: 155px" *ngIf="transformUnitEnable">
+ <mat-form-field class="example-full-width" style="width: 155px" *ngIf="transformUnitEnable" color="accent">
<mat-select placeholder="New Unit" [(ngModel)]="selectUnit" [formControl]="newUnitStateCtrl"[compareWith]="compareFn">
<mat-option *ngFor="let unit of possibleUnitTransformations" [value]="unit"
(click)="changeTargetUnit(unit)">
diff --git a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
index 823516b..f7f278d 100644
--- a/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
+++ b/ui/src/app/connect/dialog/edit-event-property/edit-event-property.component.html
@@ -21,12 +21,12 @@
<form #propertyForm="ngForm">
<div fxLayout="row" fxLayoutAlign="start">
<div class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width" style="margin-right: 10px">
+ <mat-form-field class="example-full-width" style="margin-right: 10px" color="accent">
<input matInput placeholder="Label" name="label" id="label" [(ngModel)]="cachedProperty.label">
</mat-form-field>
</div>
<div attr.id="input-runtime-name-{{cachedProperty.label}}" class="form-group" fxFlexAlign="center">
- <mat-form-field class="example-full-width">
+ <mat-form-field class="example-full-width" color="accent">
<input matInput placeholder="RuntimeName" name="runtimename" id="runtimename"
[(ngModel)]="cachedProperty.runtimeName">
</mat-form-field>
@@ -34,7 +34,7 @@
</div>
<div class="form-group">
- <mat-form-field class="doubleWidth">
+ <mat-form-field class="doubleWidth" color="accent">
<textarea matInput name="description" placeholder="Description" id="description"
[(ngModel)]="cachedProperty.description" cols="20" rows="2"></textarea>
</mat-form-field>
@@ -47,7 +47,7 @@
</sp-edit-correction-value>
<div class="form-group">
- <mat-form-field class="doubleWidth">
+ <mat-form-field class="doubleWidth" color="accent">
<input matInput placeholder="Semantic Type" class="dmainProperty" name="domainproperty" id="domainproperty"
[(ngModel)]="cachedProperty.domainProperties[0]" [matAutocomplete]="st" [formControl]="domainPropertyControl">
<mat-autocomplete #st="matAutocomplete" [panelWidth]="'300px'">
@@ -60,6 +60,7 @@
<mat-checkbox name="timestampCheckbox"
(change)="editTimestampDomainProperty($event.checked)"
[checked]="isTimestampProperty"
+ color="accent"
data-cy="sp-mark-as-timestamp">
Mark as timestamp
</mat-checkbox>
@@ -82,7 +83,7 @@
<mat-dialog-actions>
<button mat-button mat-raised-button class="mat-basic" mat-dialog-close>Close</button>
- <button mat-button mat-raised-button color="primary"
+ <button mat-button mat-raised-button color="accent"
[disabled]="isSaveBtnEnabled"
(click)="save();
isSaveBtnEnabled = false"