Merge branch 'develop' into feature/WEBBPMNEXT-9175_migrate_to_tomcat

This commit is contained in:
Халтобин Евгений 2024-09-16 08:56:55 +03:00
commit 74a807a825
2 changed files with 19 additions and 4 deletions

View file

@ -87,7 +87,13 @@ body.webbpm.ervu_lkrp_fl {
color: var(--white);
font-family: 'Inter';
}
.webbpm.ervu_lkrp_fl .header .header-logo .logo {
position: relative;
display: flex;
align-items: center;
}
.webbpm.ervu_lkrp_fl .header .header-logo .logo a {
position: absolute;
width: 62px;
height: 40px;
background: url(../img/svg/mil-logo.svg) no-repeat 0 50%;
@ -166,6 +172,11 @@ body.webbpm.ervu_lkrp_fl {
}
.webbpm.ervu_lkrp_fl footer {
position: relative;
top: auto;
bottom: auto;
left: auto;
right: auto;
height: var(--h-footer);
border: 0;
background-color: var(--color-text-primary);
@ -173,10 +184,15 @@ body.webbpm.ervu_lkrp_fl {
.webbpm.ervu_lkrp_fl .container {
padding-top: var(--h-header);
bottom: var(--h-footer);
bottom: 0;
}
.webbpm.ervu_lkrp_fl .container-inside {
font-family: 'Inter';
height: 100%;
padding: 0;
overflow: auto;
}
.webbpm.ervu_lkrp_fl .container-inside > div {
padding: var(--indent-huge) var(--w-screen);
}
@ -308,7 +324,7 @@ body.webbpm.ervu_lkrp_fl {
.webbpm.ervu_lkrp_fl .loader {
font-size: 15px;
left: calc(50% - 50px);
top: calc(50% - 50px);
top: calc(50% - 50px);
width: 0.8em;
height: 0.8em;
border-radius: 50%;

View file

@ -5,8 +5,7 @@
<div class="container">
<div class="container-inside" id="webbpm-angular-application-container">
<router-outlet></router-outlet>
<app-footer *ngIf="footerVisible"></app-footer>
</div>
</div>
<app-footer *ngIf="footerVisible">
</app-footer>
</div>