diff --git a/src/layouts/fourCorners/fourCorners.component.ts b/src/layouts/fourCorners/fourCorners.component.ts index 181bb85285ed389cc4fd59f5bf34d527b52cbc65..6bae516c960e2c6b3e7344b8bb46274a310d1c95 100644 --- a/src/layouts/fourCorners/fourCorners.component.ts +++ b/src/layouts/fourCorners/fourCorners.component.ts @@ -1,4 +1,4 @@ -import { Component } from "@angular/core"; +import { Component, Input } from "@angular/core"; @Component({ selector: 'iav-layout-fourcorners', @@ -8,4 +8,7 @@ import { Component } from "@angular/core"; ] }) -export class FourCornersCmp{} \ No newline at end of file +export class FourCornersCmp{ + @Input('iav-layout-fourcorners-cnr-cntr-ngclass') + cornerContainerClasses = {} +} diff --git a/src/layouts/fourCorners/fourCorners.template.html b/src/layouts/fourCorners/fourCorners.template.html index c99f8b0a8bf791a3b6efc256bf8b86cf3594c9b4..96cfe86cdb46e296f4b44fa92adfb377dec010fd 100644 --- a/src/layouts/fourCorners/fourCorners.template.html +++ b/src/layouts/fourCorners/fourCorners.template.html @@ -2,15 +2,19 @@ <ng-content select="[iavLayoutFourCornersContent]"></ng-content> </div> -<div class="corner-container position-absolute top-0 left-0"> +<div [ngClass]="cornerContainerClasses" + class="corner-container position-absolute top-0 left-0"> <ng-content select="[iavLayoutFourCornersTopLeft]"></ng-content> </div> -<div class="corner-container position-absolute top-0 right-0"> +<div [ngClass]="cornerContainerClasses" + class="corner-container position-absolute top-0 right-0"> <ng-content select="[iavLayoutFourCornersTopRight]"></ng-content> </div> -<div class="corner-container position-absolute bottom-0 left-0"> +<div [ngClass]="cornerContainerClasses" + class="corner-container position-absolute bottom-0 left-0"> <ng-content select="[iavLayoutFourCornersBottomLeft]"></ng-content> </div> -<div class="corner-container position-absolute bottom-0 right-0"> +<div [ngClass]="cornerContainerClasses" + class="corner-container position-absolute bottom-0 right-0"> <ng-content select="[iavLayoutFourCornersBottomRight]"></ng-content> </div> \ No newline at end of file diff --git a/src/ui/topMenu/topMenuCmp/topMenu.template.html b/src/ui/topMenu/topMenuCmp/topMenu.template.html index f3ef18322bbb703d96c9fbdf2b52980d50c46401..e76a092a2be712b7493517e82d783eab05128f66 100644 --- a/src/ui/topMenu/topMenuCmp/topMenu.template.html +++ b/src/ui/topMenu/topMenuCmp/topMenu.template.html @@ -1,6 +1,7 @@ <ng-template [ngIf]="ismobile" [ngIfElse]="fullTmpl"> <div iav-fab-speed-dial-container - #fab="iavFabSpeedDialContainer"> + #fab="iavFabSpeedDialContainer" + class="d-flex flex-column align-items-center"> <button mat-fab iav-fab-speed-dial-trigger [color]="fab.isOpen ? 'basic' : 'accent'"> diff --git a/src/viewerModule/viewerCmp/viewerCmp.template.html b/src/viewerModule/viewerCmp/viewerCmp.template.html index 2df56a69fd5e00480757e94a6514be539c574790..bf340a35ee4ded9ce809070b6aae4339675ad70c 100644 --- a/src/viewerModule/viewerCmp/viewerCmp.template.html +++ b/src/viewerModule/viewerCmp/viewerCmp.template.html @@ -55,42 +55,49 @@ <mat-drawer-content class="visible position-relative pe-none"> - <iav-layout-fourcorners> + <iav-layout-fourcorners [iav-layout-fourcorners-cnr-cntr-ngclass]="{'w-100': true}"> <!-- pullable tab top right corner --> - <div iavLayoutFourCornersTopLeft class="d-inline-flex"> - - <div *ngIf="viewerLoaded" - class="pe-all tab-toggle-container" - (click)="sideNavTopSwitch && sideNavTopSwitch.toggle()"> - <ng-container *ngTemplateOutlet="tabTmpl; context: { - isOpen: sideNavTopSwitch.switchState, - regionSelected: selectedRegions$ | async, - iavAdditionallayers: iavAdditionalLayers$ | async - }"> - </ng-container> + <div iavLayoutFourCornersTopLeft class="d-flex flex-nowrap w-100"> + + <!-- top left --> + <div class="flex-grow-1 d-flex flex-nowrap"> + + <div *ngIf="viewerLoaded" + class="pe-all tab-toggle-container" + (click)="sideNavTopSwitch && sideNavTopSwitch.toggle()"> + <ng-container *ngTemplateOutlet="tabTmpl; context: { + isOpen: sideNavTopSwitch.switchState, + regionSelected: selectedRegions$ | async, + iavAdditionallayers: iavAdditionalLayers$ | async + }"> + </ng-container> + </div> + + <iav-cmp-viewer-nehuba-status *ngIf="viewerLoaded" + class="pe-all mt-2 muted-7"> + </iav-cmp-viewer-nehuba-status> </div> - <iav-cmp-viewer-nehuba-status *ngIf="viewerLoaded" - class="pe-all mt-2 muted-7"> - </iav-cmp-viewer-nehuba-status> - </div> + <!-- top right --> + <div class="flex-grow-0 d-inline-flex align-items-start"> - <!-- signin banner at top right corner --> - <div iavLayoutFourCornersTopRight - class="d-inline-flex align-items-start"> + <!-- signin banner at top right corner --> + - <top-menu-cmp class="mt-3 mr-2 d-inline-block" - [ismobile]="ismobile" - [viewerLoaded]="viewerLoaded"> - </top-menu-cmp> + <top-menu-cmp class="mt-3 mr-2 d-inline-block" + [ismobile]="ismobile" + [viewerLoaded]="viewerLoaded"> + </top-menu-cmp> - <div *ngIf="viewerLoaded" - class="iv-custom-comp bg card m-2 mat-elevation-z2"> - <atlas-dropdown-selector class="pe-all mt-2"> - </atlas-dropdown-selector> + <div *ngIf="viewerLoaded" + class="iv-custom-comp bg card m-2 mat-elevation-z2"> + <atlas-dropdown-selector class="pe-all mt-2"> + </atlas-dropdown-selector> + </div> </div> </div> + </iav-layout-fourcorners> </mat-drawer-content>