diff --git a/lib/core/src/lib/form/components/form-renderer.component.html b/lib/core/src/lib/form/components/form-renderer.component.html index fa508c0ca4d..8325a561c93 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.html +++ b/lib/core/src/lib/form/components/form-renderer.component.html @@ -3,7 +3,7 @@
- + diff --git a/lib/core/src/lib/form/components/form-renderer.component.scss b/lib/core/src/lib/form/components/form-renderer.component.scss index c39b3c5ccf6..5cda0c2fd8d 100644 --- a/lib/core/src/lib/form/components/form-renderer.component.scss +++ b/lib/core/src/lib/form/components/form-renderer.component.scss @@ -88,7 +88,7 @@ top: 1.8em; } - #{$mat-form-field} { + #{$mat-focused} { width: 100%; #{$mat-text-field-focused} { @@ -98,7 +98,6 @@ } label { - transform: scaleX(1); transition: transform 150ms linear; background-color: 300ms cubic-bezier(0.55, 0, 0.55, 0.2); } @@ -113,7 +112,8 @@ width: 80%; } - adf-form-field { + adf-form-field, + mat-form-field { width: 100%; } } @@ -146,7 +146,9 @@ } & #{$mat-tab-ink-bar} { - height: 4px; + #{$mat-tab-indicator-underline} { + border-top-width: 4px; + } } & #{$mat-form-field-wrapper} { @@ -217,6 +219,10 @@ & #{$mat-button} { height: 36px; border-radius: 5px; + width: auto; + padding: 0 16px; + margin: 0 8px; + white-space: nowrap; } & #{$mat-button-label} { diff --git a/lib/core/src/lib/form/components/widgets/error/error.component.html b/lib/core/src/lib/form/components/widgets/error/error.component.html index 939bcf0249e..c4807b5a5b0 100644 --- a/lib/core/src/lib/form/components/widgets/error/error.component.html +++ b/lib/core/src/lib/form/components/widgets/error/error.component.html @@ -1,4 +1,4 @@ -
+
error_outline
{{ error.message | translate:translateParameters }}
diff --git a/lib/core/src/lib/form/components/widgets/error/error.component.scss b/lib/core/src/lib/form/components/widgets/error/error.component.scss index faa6bfac4e2..4687c05c03b 100644 --- a/lib/core/src/lib/form/components/widgets/error/error.component.scss +++ b/lib/core/src/lib/form/components/widgets/error/error.component.scss @@ -1,3 +1,8 @@ .adf-error { display: flex; + + &-widget-container { + height: auto; + padding: 5px 0; + } } diff --git a/lib/core/src/lib/styles/_mat-selectors.scss b/lib/core/src/lib/styles/_mat-selectors.scss index ac025aba9a3..fc8c3d06a76 100644 --- a/lib/core/src/lib/styles/_mat-selectors.scss +++ b/lib/core/src/lib/styles/_mat-selectors.scss @@ -129,6 +129,8 @@ $cdk-overlay-pane: '.cdk-overlay-pane'; $mat-snackbar: '.mdc-snackbar'; $mat-snack-bar-container: '.mat-mdc-snack-bar-container'; $mat-snackbar-label: '.mdc-snackbar__label'; +$mat-datetimepicker-dialog: '.mat-datetimepicker-dialog'; +$mat-tab-indicator-underline: '.mdc-tab-indicator__content--underline'; $mat-autocomplete-panel: '.mat-mdc-autocomplete-panel'; $mat-menu-surface: '.mdc-menu-surface'; $mat-text-field-filled: '.mdc-text-field--filled'; diff --git a/lib/core/src/lib/styles/material.theme.scss b/lib/core/src/lib/styles/material.theme.scss index fd6b4c19192..538257621c5 100644 --- a/lib/core/src/lib/styles/material.theme.scss +++ b/lib/core/src/lib/styles/material.theme.scss @@ -74,4 +74,12 @@ color: var(--theme-primary-color); } } + + #{$mat-datetimepicker-dialog} { + #{$mat-dialog-container} { + #{$mat-dialog-surface} { + padding: 0; + } + } + } } diff --git a/lib/process-services/src/lib/form/form.component.html b/lib/process-services/src/lib/form/form.component.html index fa386638dc2..4eb6f1d27a4 100644 --- a/lib/process-services/src/lib/form/form.component.html +++ b/lib/process-services/src/lib/form/form.component.html @@ -4,7 +4,7 @@
- diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss index 6542d8b7d2f..e54a46d1aa0 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-file-widget.component.scss @@ -24,6 +24,16 @@ align-items: center; } + &-attach-widget__menu-trigger { + display: flex; + flex-direction: row-reverse; + + #{$mat-icon} { + margin-left: 4px; + margin-right: 0; + } + } + &-attach-widget__input-type { width: 0.1px; height: 0.1px; @@ -76,7 +86,6 @@ } @include layout-bp(lt-md) { - #{$mat-list-item-primary-text} { max-width: 150px; } diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html index 8ae433c6097..48504680da1 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.html @@ -19,7 +19,8 @@ diff --git a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss index a376e31d69d..b6e033b2581 100644 --- a/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss +++ b/lib/process-services/src/lib/form/widgets/content-widget/attach-folder-widget.component.scss @@ -37,4 +37,14 @@ display: flex; align-items: center; } + + &-attach-folder-menu-trigger { + display: flex; + flex-direction: row-reverse; + + #{$mat-icon} { + margin-left: 4px; + margin-right: 0; + } + } } diff --git a/lib/process-services/src/lib/process-list/components/start-process/start-process.component.html b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.html index c7a18fe39d4..adcf9f2e256 100644 --- a/lib/process-services/src/lib/process-list/components/start-process/start-process.component.html +++ b/lib/process-services/src/lib/process-list/components/start-process/start-process.component.html @@ -9,7 +9,7 @@
{{ title | translate}}
- + {{ 'ADF_PROCESS_LIST.START_PROCESS.FORM.LABEL.SELECT_APPLICATION' | translate }} - + {{'ADF_PROCESS_LIST.START_PROCESS.FORM.LABEL.TYPE' | translate}} - +