This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 9bc9eb544 [hotfix] Fix some layout bugs after mdc migration
9bc9eb544 is described below
commit 9bc9eb544142c07c4f3f9e3a80c110416a424167
Author: Dominik Riemer <[email protected]>
AuthorDate: Thu Jul 20 21:43:26 2023 +0200
[hotfix] Fix some layout bugs after mdc migration
---
.../static-properties/static-property.component.html | 2 +-
.../core-ui/static-properties/static-property.component.ts | 5 +++--
.../components/panel/dashboard-panel.component.html | 4 ++--
.../data-explorer-widget-data-settings.component.html | 3 ++-
.../pipeline-element-icon-stand-row.component.html | 2 +-
ui/src/scss/sp/buttons.scss | 8 ++++++++
ui/src/scss/sp/forms.scss | 4 ++++
ui/src/scss/sp/mat-tab.scss | 8 +++++---
ui/src/scss/sp/sp-theme.scss | 14 ++++++++++----
9 files changed, 36 insertions(+), 14 deletions(-)
diff --git
a/ui/src/app/core-ui/static-properties/static-property.component.html
b/ui/src/app/core-ui/static-properties/static-property.component.html
index c7b980e71..bfd8ef034 100644
--- a/ui/src/app/core-ui/static-properties/static-property.component.html
+++ b/ui/src/app/core-ui/static-properties/static-property.component.html
@@ -16,7 +16,7 @@
~
-->
-<div fxFlex="100" fxLayout="column">
+<div fxFlex="100" fxLayout="column" class="small-form-field-density">
<div
fxFlex="100"
fxLayout="column"
diff --git a/ui/src/app/core-ui/static-properties/static-property.component.ts
b/ui/src/app/core-ui/static-properties/static-property.component.ts
index 5372928b4..a62c2f839 100644
--- a/ui/src/app/core-ui/static-properties/static-property.component.ts
+++ b/ui/src/app/core-ui/static-properties/static-property.component.ts
@@ -92,8 +92,9 @@ export class StaticPropertyComponent implements OnInit {
ngOnInit() {
this.showLabel =
- !(this.staticProperty instanceof StaticPropertyGroup) ||
- (this.staticProperty as StaticPropertyGroup).showLabel;
+ (!(this.staticProperty instanceof StaticPropertyGroup) ||
+ (this.staticProperty as StaticPropertyGroup).showLabel) &&
+ this.staticProperty.label !== '';
}
isCodeInputStaticProperty(val) {
diff --git
a/ui/src/app/dashboard/components/panel/dashboard-panel.component.html
b/ui/src/app/dashboard/components/panel/dashboard-panel.component.html
index 9d252ae69..2245de211 100644
--- a/ui/src/app/dashboard/components/panel/dashboard-panel.component.html
+++ b/ui/src/app/dashboard/components/panel/dashboard-panel.component.html
@@ -43,7 +43,7 @@
data-cy="dashboard-save-edit-mode"
>
<i class="material-icons">save</i>
- <span> Save</span>
+ <span> Save</span>
</button>
<button
mat-button
@@ -52,7 +52,7 @@
(click)="discardChanges()"
>
<i class="material-icons">clear</i>
- <span> Discard</span>
+ <span> Discard</span>
</button>
<button
mat-button
diff --git
a/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.html
b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.html
index 3a9719cc4..8c946b734 100644
---
a/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.html
+++
b/ui/src/app/data-explorer/components/designer-panel/data-settings/data-explorer-widget-data-settings.component.html
@@ -92,6 +92,7 @@
*ngIf="sourceConfig.sourceType === 'pipeline'"
>
<mat-select
+ [panelClass]="'form-field-small'"
[(value)]="sourceConfig.measureName"
(selectionChange)="
updateMeasure(sourceConfig, $event.value)
@@ -105,7 +106,7 @@
<span class="pipeline-name">{{
pipeline.pipelineName
}}</span
- > {{ pipeline.measureName }}
+ ><br />{{ pipeline.measureName }}
</mat-option>
</mat-select>
</mat-form-field>
diff --git
a/ui/src/app/editor/components/pipeline-element-icon-stand-row/pipeline-element-icon-stand-row.component.html
b/ui/src/app/editor/components/pipeline-element-icon-stand-row/pipeline-element-icon-stand-row.component.html
index 5a08326f0..0acff873e 100644
---
a/ui/src/app/editor/components/pipeline-element-icon-stand-row/pipeline-element-icon-stand-row.component.html
+++
b/ui/src/app/editor/components/pipeline-element-icon-stand-row/pipeline-element-icon-stand-row.component.html
@@ -57,8 +57,8 @@
</div>
<div fxLayoutAlign="end start" *ngIf="currentMouseOver">
<button
+ style="height: 20px"
mat-raised-button
- mat-icon-button
color="accent"
class="help-button-stand"
(click)="openHelpDialog(element)"
diff --git a/ui/src/scss/sp/buttons.scss b/ui/src/scss/sp/buttons.scss
index 781b44423..e8e030812 100644
--- a/ui/src/scss/sp/buttons.scss
+++ b/ui/src/scss/sp/buttons.scss
@@ -150,3 +150,11 @@
color: #cdcdcd;
background: rgba(0, 0, 0, 0);
}
+
+.mdc-button__label {
+ font-weight: 500;
+ text-transform: uppercase;
+ font-family: 'Roboto-Medium', sans-serif;
+ letter-spacing: 0.7px;
+ font-size: 13px;
+}
diff --git a/ui/src/scss/sp/forms.scss b/ui/src/scss/sp/forms.scss
index b8353eb30..dbbd94682 100644
--- a/ui/src/scss/sp/forms.scss
+++ b/ui/src/scss/sp/forms.scss
@@ -196,3 +196,7 @@ mat-form-field.mat-mdc-form-field.form-field-size-smaller {
font-size: 11pt;
}
}
+
+.fix-input-label {
+ margin-bottom: 20px;
+}
diff --git a/ui/src/scss/sp/mat-tab.scss b/ui/src/scss/sp/mat-tab.scss
index d3c624933..6522ff8bb 100644
--- a/ui/src/scss/sp/mat-tab.scss
+++ b/ui/src/scss/sp/mat-tab.scss
@@ -16,12 +16,14 @@
*
*/
-.mat-tab-label-content {
+.mdc-tab__text-label {
text-transform: uppercase;
+ font-family: 'Roboto', Arial, sans-serif;
+ color: rgba(0, 0, 0, 0.87);
+ letter-spacing: normal;
}
-.small .mat-tab-label {
- min-width: 100px;
+.small .mdc-tab__text-label {
height: 32px;
font-size: 10pt;
}
diff --git a/ui/src/scss/sp/sp-theme.scss b/ui/src/scss/sp/sp-theme.scss
index f0e513548..4db4f336f 100644
--- a/ui/src/scss/sp/sp-theme.scss
+++ b/ui/src/scss/sp/sp-theme.scss
@@ -187,10 +187,6 @@ $accent: map-get($custom-theme-light, accent);
font-size: 11pt;
}
-.mdc-tab__text-label {
- font-family: 'Roboto-Medium';
-}
-
.dark-mode {
@include mat.all-component-themes($custom-theme-dark);
@@ -227,6 +223,10 @@ $accent: map-get($custom-theme-light, accent);
@include mat.all-component-typographies();
@include mat.all-component-themes($custom-theme-light);
+ .small-form-field-density {
+ @include mat.form-field-density(-3);
+ }
+
.base-style {
color: #121212;
background: #ffffff;
@@ -262,4 +262,10 @@ $accent: map-get($custom-theme-light, accent);
.mat-form-field-appearance-fill .mat-mdc-select-arrow-wrapper {
transform: none;
}
+
+ .form-field-small {
+ .mdc-list-item__primary-text {
+ font-size: 14px;
+ }
+ }
}
