diff --git a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.scss b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.scss index 15c54cccf..188346cd1 100644 --- a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.scss +++ b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.scss @@ -1,7 +1,7 @@ :host { - height: calc(100vh - 61px); + height: calc(100vh - var(--iqser-top-bar-height)); &.dossier-templates { - height: calc(100vh - 111px); + height: calc(100vh - var(--iqser-top-bar-height) - 50px); } } diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.scss b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.scss index 48957efa4..8e6ef9f2c 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.scss +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.scss @@ -1,7 +1,7 @@ :host { - height: calc(100vh - 61px); + height: calc(100vh - var(--iqser-top-bar-height)); &.smaller { - height: calc(100vh - 111px); + height: calc(100vh - var(--iqser-top-bar-height) - 50px); } } diff --git a/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.scss b/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.scss index 1301cc73e..37792961d 100644 --- a/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.scss +++ b/apps/red-ui/src/app/modules/pdf-viewer/pdf-viewer.component.scss @@ -1,6 +1,6 @@ :host { --workload-width: 350px; - --header-height: 111px; + --header-height: calc(var(--iqser-top-bar-height) + 50px); } div { diff --git a/apps/red-ui/src/app/utils/index.ts b/apps/red-ui/src/app/utils/index.ts index 8e4d31c0a..4dd4d4f26 100644 --- a/apps/red-ui/src/app/utils/index.ts +++ b/apps/red-ui/src/app/utils/index.ts @@ -10,4 +10,3 @@ export * from './functions'; export * from './global-error-handler.service'; export * from './missing-translations-handler'; export * from './page-stamper'; -export * from './pruning-translation-loader'; diff --git a/apps/red-ui/src/app/utils/pruning-translation-loader.ts b/apps/red-ui/src/app/utils/pruning-translation-loader.ts deleted file mode 100644 index faafe68e5..000000000 --- a/apps/red-ui/src/app/utils/pruning-translation-loader.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { HttpClient } from '@angular/common/http'; -import { TranslateLoader } from '@ngx-translate/core'; -import { map } from 'rxjs/operators'; - -export class PruningTranslationLoader implements TranslateLoader { - constructor(private _http: HttpClient, private _prefix: string, private _suffix: string) {} - - getTranslation(lang: string): any { - return this._http.get(`${this._prefix}${lang}${this._suffix}`).pipe(map((result: object) => this._process(result))); - } - - private _process(object: object) { - return ( - Object.keys(object) - // eslint-disable-next-line no-prototype-builtins - .filter(key => object.hasOwnProperty(key) && object[key] !== '') - .reduce( - (result, key) => ((result[key] = typeof object[key] === 'object' ? this._process(object[key]) : object[key]), result), - {}, - ) - ); - } -} diff --git a/libs/common-ui b/libs/common-ui index ab8d16420..5208063f4 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit ab8d16420560461ca88b6d5d6024febc36af147a +Subproject commit 5208063f48cab62f1c019c71683c575dd0b594c5