CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.16.3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.2...v1.16.3) (2022-03-31)
+
+
+### Bug Fixes
+
+* **orientation:** broken layout ([67c6b23](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/67c6b23945b60b5f0fbc76d50f5b213deab7be61))
+* **orientation:** issue on height ([87f8ea5](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/87f8ea5c59c2dbadb963d7e2fa5359375d47a2d7))
+* **orientation:** map height ([cd75ee2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/cd75ee22bee5e241624cd200b6e066794faa1634))
+
 ### [1.16.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.16.1...v1.16.2) (2022-03-31)
 
 

package-lock.json

 {
   "name": "pamn",
-  "version": "1.16.2",
+  "version": "1.16.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

 {
   "name": "pamn",
-  "version": "1.16.2",
+  "version": "1.16.3",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --configuration=fr --proxy-config proxy.conf.json",

src/app/app.component.scss

@@ -17,7 +17,7 @@
   overflow-y: auto;
   overflow-x: hidden;
   position: relative;
-  height: calc(var(--vh, 1vh) * 100 - #{$header-height});
+  height: calc(100vh - #{$header-height});
 }
 
 .motif {

src/app/form/orientation-form/orientation-form.component.html

-<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'"

src/app/form/orientation-form/orientation-form.component.scss

@@ -72,12 +72,17 @@
   margin: 0 0.5em;
 }
 
+.form-override {
+  height: unset !important;
+}
+
 .form-footer {
   padding: 17px 0;
   width: 100%;
   text-align: center;
   z-index: calc($btn-phone-switch-map-list-z-index - 1);
   background: $grey-6;
+  height: $footer-form-height;
 }
 
 .btnSwitch {
@@ -100,7 +105,7 @@
 }
 
 .content {
-  min-height: 450px;
+  height: 100% !important;
   background-color: $white;
   margin-left: 25%;
   margin-right: 24%;
@@ -132,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;
@@ -157,7 +154,6 @@
 }
 
 .progress-container {
-  margin-top: 1%;
   margin-left: 25.5%;
   width: 50%;
   @media #{$tablet} {

src/assets/scss/_layout.scss

 $header-height: 70px;
 $footer-height: 56px;
+$footer-form-height: 36px;
 $header-height-phone: 70px;
 $footer-height-phone: 75px;
 $progressBar-height: 50px;