diff --git a/frontend/src/resources/css/inbox-lkrp.css b/frontend/src/resources/css/inbox-lkrp.css index c6a39c27..cf1947d5 100644 --- a/frontend/src/resources/css/inbox-lkrp.css +++ b/frontend/src/resources/css/inbox-lkrp.css @@ -81,7 +81,7 @@ body.webbpm.ervu_lkrp_ul { --size-text-title: 36px; --size-text-subtitle: 20px; --size-text-primary: 18px; - --size-text-secondary: 16px; + --size-text-secondary: 16px; --indent-huge: 48px; --indent-big: 40px; @@ -94,7 +94,7 @@ body.webbpm.ervu_lkrp_ul { --l-size-text-title: 40px; --l-size-text-subtitle: 32px; --l-size-text-primary: 20px; - + --l-indent-huge: 72px; --l-indent-big: 52px; } @@ -108,7 +108,7 @@ body.webbpm.ervu_lkrp_ul { } .webbpm.ervu_lkrp_ul .header { - font-family: 'Inter'; + font-family: 'Inter'; min-height: var(--h-header); border: 0; background-color: var(--color-bg-main); @@ -136,7 +136,7 @@ body.webbpm.ervu_lkrp_ul { } .webbpm.ervu_lkrp_ul .header .header-logo .header-menu-left { font-family: 'InterL'; - margin-left: 24px; + margin-left: 24px; } .webbpm.ervu_lkrp_ul .header .header-logo .active { font-family: 'InterSB'; @@ -385,7 +385,16 @@ body.webbpm.ervu_lkrp_ul { } /*--------------- end Login -------------- */ -.webbpm.ervu_lkrp_ul .loader { +.webbpm.ervu_lkrp_ul .modal.show.loader .modal-content { + background: none; + border: none; +} + +.webbpm.ervu_lkrp_ul .modal.show.loader .modal-dialog { + margin: auto; +} + +.webbpm.ervu_lkrp_ul .loader:not(.modal) { font-size: 15px; left: calc(50% - 0.4em); top: calc(50% - 0.4em); diff --git a/frontend/src/ts/modules/security/guard/auth.guard.ts b/frontend/src/ts/modules/security/guard/auth.guard.ts index be72a006..46975053 100644 --- a/frontend/src/ts/modules/security/guard/auth.guard.ts +++ b/frontend/src/ts/modules/security/guard/auth.guard.ts @@ -61,6 +61,7 @@ export abstract class AuthGuard implements CanActivate { return false; } if (code && state) { + this.progressIndicationService.showProgressBar(); const params = new HttpParams().set('code', code).set('state', state); this.httpClient.get("esia/auth", { @@ -74,6 +75,7 @@ export abstract class AuthGuard implements CanActivate { .toPromise() .then( () => { + this.progressIndicationService.hideProgressBar(); window.open(url.origin + url.pathname, "_self"); }) .catch(reason => { @@ -81,7 +83,8 @@ export abstract class AuthGuard implements CanActivate { json.messages.forEach((errorMessage) => { this.messageService.error(errorMessage, json); }) - }); + }) + .finally(() => this.progressIndicationService.hideProgressBar()); return false; } else { @@ -107,4 +110,4 @@ export abstract class AuthGuard implements CanActivate { const match = message.match(regex); return match ? match[0] : null; } -} \ No newline at end of file +}