diff --git a/lib/core/src/lib/form/components/widgets/core/form.model.ts b/lib/core/src/lib/form/components/widgets/core/form.model.ts index d6b8b33667..2278f1eb33 100644 --- a/lib/core/src/lib/form/components/widgets/core/form.model.ts +++ b/lib/core/src/lib/form/components/widgets/core/form.model.ts @@ -119,7 +119,7 @@ export class FormModel implements ProcessFormModel { this.enableFixedSpace = enableFixedSpace; this.confirmMessage = json.confirmMessage || {}; this.displayMode = json.displayMode; - this.theme = json.theme; + this.theme = json.theme || json.formDefinition?.theme; this.tabs = (json.tabs || []).map((tabJson) => new TabModel(this, tabJson)); diff --git a/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.scss b/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.scss index 3f1e3a310e..c9b475ef35 100644 --- a/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.scss +++ b/lib/core/src/lib/form/components/widgets/display-text/display-text.widget.scss @@ -3,4 +3,5 @@ font-size: var(--adf-readonly-text-font-size, var(--adf-form-label-font-size, var(--theme-body-1-font-size))); font-weight: var(--adf-readonly-text-font-weight, var(--adf-form-label-font-weight, var(--theme-font-weight))); color: var(--adf-readonly-text-color, var(--adf-form-label-color, var(--theme-text-color))); + line-height: normal; } diff --git a/lib/core/src/lib/form/components/widgets/header/header.widget.scss b/lib/core/src/lib/form/components/widgets/header/header.widget.scss index 99d4ce8816..c3156fc107 100644 --- a/lib/core/src/lib/form/components/widgets/header/header.widget.scss +++ b/lib/core/src/lib/form/components/widgets/header/header.widget.scss @@ -6,6 +6,7 @@ font-size: var(--adf-header-font-size); font-weight: var(--adf-header-font-weight); color: var(--adf-header-color); + line-height: normal; &.adf-collapsible { cursor: pointer; diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.scss b/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.scss index 5ef2ad3a4f..162f81f2ab 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.scss +++ b/lib/process-services-cloud/src/lib/form/components/widgets/radio-buttons/radio-buttons-cloud.widget.scss @@ -4,6 +4,7 @@ font-size: var(--adf-radio-buttons-font-size, var(--adf-form-label-font-size, var(--theme-caption-font-size))); font-weight: var(--adf-radio-buttons-font-weight, var(--adf-form-label-font-weight, var(--theme-font-weight))); color: var(--adf-radio-buttons-color, var(--adf-form-label-color, var(--adf-theme-foreground-secondary-text-color))); + line-height: normal; } }