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 7b360749140e2e10c6b174759617f488b084db80 Author: Dominik Riemer <[email protected]> AuthorDate: Thu Jul 8 22:12:09 2021 +0200 [STREAMPIPES-395] Harmonize css in configuration module --- ui/src/app/configuration/configuration.component.html | 2 +- .../datalake-configuration.component.html | 6 +++--- .../messaging-configuration.component.css | 10 +++++----- .../messaging-configuration.component.html | 10 +++++----- .../pipeline-element-configuration.component.css | 7 +++---- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/ui/src/app/configuration/configuration.component.html b/ui/src/app/configuration/configuration.component.html index 72f3c54..5bbb585 100644 --- a/ui/src/app/configuration/configuration.component.html +++ b/ui/src/app/configuration/configuration.component.html @@ -19,7 +19,7 @@ <div fxLayout="column" fxFlex="100" class="page-container"> <div fxLayout="row" class="p-0 sp-bg-lightgray page-container-nav"> <div fxLayout="fill"> - <mat-tab-group [selectedIndex]="selectedIndex" (selectedIndexChange)="selectedIndexChange($event)"> + <mat-tab-group [selectedIndex]="selectedIndex" (selectedIndexChange)="selectedIndexChange($event)" color="accent"> <mat-tab label="Pipeline Element Configuration"></mat-tab> <mat-tab label="Messaging"></mat-tab> <mat-tab label="DataLake"></mat-tab> diff --git a/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.html b/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.html index ba8f63e..6130038 100644 --- a/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.html +++ b/ui/src/app/configuration/datalake-configuration/datalake-configuration.component.html @@ -20,16 +20,16 @@ <div fxFlex="100" fxLayout="row wrap" fxLayoutAlign="start stretch"> <div fxFlex="100" class="assemblyOptions sp-blue-bg" style="padding:5px;"> <div fxLayout="row" fxLayoutAlign="start center" fxFlex="100"> - <h3>Datalake Settings</h3> + <h4>Datalake Settings</h4> <span flex></span> </div> </div> <div fxFlex="100" fxLayout="column" fxLayoutAlign="center center" class="sp-blue-border page-container-padding-inner"> - <form (ngSubmit)="removeDataFromDataLake()" class="form-width" fxFlex="100" fxLayout="column"> + <form (ngSubmit)="removeDataFromDataLake()" class="form-width mt-10" fxFlex="100" fxLayout="column"> <div fxLayoutAlign="center center"> <button mat-raised-button color="warn" type="submit" class="md-raised md-primary submit-button">Clean</button> </div> - <h4 style="color: #f44336">All data in the datalake will be deleted. This is a BETA feature and could break things!</h4> + <h4 style="color: var(--color-warn)">All data in the datalake will be deleted. This is a BETA feature and could break things!</h4> </form> </div> </div> diff --git a/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.css b/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.css index 0426615..d33275e 100644 --- a/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.css +++ b/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.css @@ -27,25 +27,25 @@ .data-format-list { width: 500px; max-width: 100%; - border: solid 1px #ccc; + border: solid 1px var(--color-bg-3); min-height: 60px; display: block; - background: white; + background: var(--color-bg-dialog); border-radius: 4px; overflow: hidden; } .data-format-box { padding: 20px 10px; - border-bottom: solid 1px #ccc; - color: rgba(0, 0, 0, 0.87); + border-bottom: solid 1px var(--color-bg-3); + color:var(--color-default-text); display: flex; flex-direction: row; align-items: center; justify-content: space-between; box-sizing: border-box; cursor: move; - background: white; + background: var(--color-bg-dialog); font-size: 14px; } diff --git a/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html b/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html index d9720ad..f8dba27 100644 --- a/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html +++ b/ui/src/app/configuration/messaging-configuration/messaging-configuration.component.html @@ -47,7 +47,7 @@ [ngModelOptions]="{standalone: true}"> </mat-form-field> <div fxLayoutAlign="end center"> - <button mat-raised-button color="primary" type="submit" class="md-raised md-primary submit-button">Update + <button mat-raised-button color="accent" type="submit" class="md-raised md-primary submit-button">Update </button> </div> @@ -69,7 +69,7 @@ </div> </div> <div fxLayoutAlign="end center"> - <button mat-raised-button color="primary" type="submit" class="md-raised md-primary submit-button" (click)="updateMessagingSettings()">Update + <button mat-raised-button color="accent" type="submit" class="md-raised md-primary submit-button" (click)="updateMessagingSettings()">Update </button> </div> </div> @@ -78,7 +78,7 @@ <div fxFlex="100" class="assemblyOptions sp-blue-bg" style="padding:5px;"> <div fxLayout="row" fxLayoutAlign="start center" fxFlex="100"> <h4>Protocols</h4> - <span flex></span> + <span fxFlex></span> </div> </div> <div fxFlex="100" fxLayout="column" fxLayoutAlign="start start" class="sp-blue-border page-container-padding-inner"> @@ -89,10 +89,10 @@ </div> </div> <div fxLayoutAlign="end center"> - <button mat-raised-button color="primary" type="submit" class="md-raised md-primary submit-button" (click)="updateMessagingSettings()">Update + <button mat-raised-button color="accent" type="submit" class="md-raised md-primary submit-button" (click)="updateMessagingSettings()">Update </button> </div> </div> </div> -</div> \ No newline at end of file +</div> diff --git a/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.css b/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.css index 3f36045..a4602a4 100644 --- a/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.css +++ b/ui/src/app/configuration/pipeline-element-configuration/pipeline-element-configuration.component.css @@ -36,11 +36,11 @@ tr.consul-configuration-detail-row { } tr.consul-configuration-row:not(.consul-configuration-row-expanded):hover { - background: #f5f5f5; + background: var(--color-bg-2); } tr.consul-configuration-row:not(.consul-configuration-row-expanded):active { - background: #efefef; + background: var(--color-bg-1); } .consul-configuration-row td { @@ -53,9 +53,8 @@ tr.consul-configuration-row:not(.consul-configuration-row-expanded):active { } .mat-table { - background: #FAFAFA; } .consul-service { padding: 5px; -} \ No newline at end of file +}
