From 87f8ea5c59c2dbadb963d7e2fa5359375d47a2d7 Mon Sep 17 00:00:00 2001 From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com> Date: Thu, 31 Mar 2022 16:01:46 +0200 Subject: [PATCH] fix(orientation): issue on height --- .../orientation-form/orientation-form.component.html | 8 +++++++- .../orientation-form/orientation-form.component.scss | 12 ++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/app/form/orientation-form/orientation-form.component.html b/src/app/form/orientation-form/orientation-form.component.html index c8c0679cf..1b6a81317 100644 --- a/src/app/form/orientation-form/orientation-form.component.html +++ b/src/app/form/orientation-form/orientation-form.component.html @@ -1,4 +1,10 @@ -<div id="body" *ngIf="!multiPrint" class="form" fxLayout="column"> +<div + id="body" + *ngIf="!multiPrint" + class="form" + fxLayout="column" + [ngClass]="{ 'form-override': currentPage == pageTypeEnum.structuresSelection }" +> <app-modal-confirmation [openned]="showConfirmationModal" [content]="'Il vous faudra de nouveau remplir le formulaire si vous quittez'" diff --git a/src/app/form/orientation-form/orientation-form.component.scss b/src/app/form/orientation-form/orientation-form.component.scss index 8e992f74c..86fa85133 100644 --- a/src/app/form/orientation-form/orientation-form.component.scss +++ b/src/app/form/orientation-form/orientation-form.component.scss @@ -72,8 +72,8 @@ margin: 0 0.5em; } -.form { - height: calc(var(--vh, 1vh) * 100 - $header-height); +.form-override { + height: calc(var(--vh, 1vh) * 100 - $header-height) !important; } .form-footer { @@ -137,14 +137,6 @@ float: right; height: 58vh; padding: unset; - // height: 100%; - @media #{$tablet} { - height: 57vh !important; - } - - @media #{$desktop} { - height: 100%; - } ::ng-deep .structure-card .structure { margin-right: 16px; -- GitLab