From afe4d06cc11f0b144ca6bead3c525be82b480ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20BRISON?=
<ext.sopra.jbrison@grandlyon.com>
Date: Mon, 4 Jan 2021 08:58:31 +0100
Subject: [PATCH] fix: structure display modification + fix missing address
---
.../modal-filter/modal-filter.component.scss | 3 +-
.../structure-details.component.html | 22 ++++++------
.../structure-details.component.scss | 1 +
src/assets/scss/_icons.scss | 35 -------------------
src/styles.scss | 3 +-
5 files changed, 16 insertions(+), 48 deletions(-)
diff --git a/src/app/structure-list/components/modal-filter/modal-filter.component.scss b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
index 54c0403f5..dcd0cd490 100644
--- a/src/app/structure-list/components/modal-filter/modal-filter.component.scss
+++ b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
@@ -106,7 +106,7 @@
}
}
.ligneFiltre {
- padding: 5px;
+ padding: 5px 0;
}
h4 {
@include cn-bold-14;
@@ -122,6 +122,7 @@
@include cn-regular-14;
line-height: 16px;
color: $grey-3;
+ padding-top: 3px;
}
label {
@include cn-regular-14;
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html
index fa507e296..77524b636 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.html
+++ b/src/app/structure-list/components/structure-details/structure-details.component.html
@@ -9,7 +9,7 @@
<div fxLayout="row" fxLayoutAlign="end center">
<div (click)="close()" class="ico-close-details"></div>
</div>
- <div fxLayout="row" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
+ <div fxLayout="row" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="8px">
<div fxLayout="column" fxLayoutGap="10px" fxFlex="100%">
<div fxLayout="row" fxLayoutAlign="space-between start">
<div fxLayout="column">
@@ -36,9 +36,9 @@
[isCalledByDetails]="true"
></app-structure-opening-status>
</div>
- <div *ngIf="structure.adressWay" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
+ <div *ngIf="structure.address" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'adress'"></app-svg-icon>
- <p>{{ structure.adressNumero }} {{ structure.address }}</p>
+ <p>{{ structure.address.numero }} {{ structure.address.street }}, {{ structure.address.commune }}</p>
</div>
<div *ngIf="structure.website" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'web'"></app-svg-icon>
@@ -55,7 +55,7 @@
</div>
</div>
<div fxLayout="column" fxFlex="50%">
- <div *ngIf="structure.contactMail" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
+ <div *ngIf="structure.contactMail" fxLayout="row" fxLayoutAlign="none center" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'email'"></app-svg-icon>
<a [href]="'mailto:' + structure.contactMail">{{ structure.contactMail }}</a>
</div>
@@ -75,7 +75,7 @@
fxLayoutAlign="baseline baseline"
fxLayoutGap="20px"
>
- <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
+ <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px">
<app-svg-icon [type]="'ico'" [icon]="'demarches'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Démarches</h2>
</div>
@@ -100,7 +100,7 @@
fxLayoutAlign="baseline baseline"
fxLayoutGap="20px"
>
- <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
+ <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px">
<app-svg-icon [type]="'ico'" [icon]="'services'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Services</h2>
</div>
@@ -117,7 +117,7 @@
</div>
<!-- Accueil -->
<div fxLayout="column" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
- <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
+ <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px">
<app-svg-icon [type]="'ico'" [icon]="'accueil'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Accueil</h2>
</div>
@@ -148,7 +148,7 @@
*ngFor="let acces of structure.accessModality"
fxLayout="row"
fxLayoutAlign="none flex-end"
- fxLayoutGap="20px"
+ fxLayoutGap="8px"
>
<app-svg-icon [type]="'ico'" [icon]="getAccessIcon(acces)"></app-svg-icon>
<p>{{ getAccessLabel(acces) }}</p>
@@ -163,7 +163,7 @@
class="structure-details-block"
fxLayoutAlign="baseline baseline"
>
- <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
+ <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px">
<app-svg-icon [type]="'ico'" [icon]="'equipement'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Équipements</h2>
</div>
@@ -193,8 +193,8 @@
fxLayoutAlign="baseline baseline"
fxLayoutGap="20px"
>
- <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
- <em class="ic-toolbox"></em>
+ <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px">
+ <app-svg-icon [type]="'ico'" [icon]="'label'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Labelisation</h2>
</div>
<div fxLayout="row wrap" fxLayoutGap="24px">
diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss
index 69cd4d635..26c51a753 100644
--- a/src/app/structure-list/components/structure-details/structure-details.component.scss
+++ b/src/app/structure-list/components/structure-details/structure-details.component.scss
@@ -67,6 +67,7 @@ h3 {
h4 {
margin-left: 0;
margin-bottom: 0;
+ margin-top: 4px;
@include cn-regular-14;
color: $grey-2;
text-transform: uppercase;
diff --git a/src/assets/scss/_icons.scss b/src/assets/scss/_icons.scss
index b06335f3b..c93d6aa78 100644
--- a/src/assets/scss/_icons.scss
+++ b/src/assets/scss/_icons.scss
@@ -344,41 +344,6 @@
left: 5px;
}
-.ic-toolbox {
- box-sizing: border-box;
- display: block;
- transform: scale(var(--ggs, 1));
- width: 22px;
- height: 16px;
- border: 2px solid;
- border-radius: 2px;
-}
-.ic-toolbox::after,
-.ic-toolbox::before {
- content: '';
- display: block;
- box-sizing: border-box;
- position: absolute;
-}
-.ic-toolbox::before {
- border: 2px solid;
- border-bottom: 0;
- border-top-left-radius: 3px;
- border-top-right-radius: 3px;
- left: 4px;
- width: 10px;
- height: 4px;
- top: -5px;
-}
-.ic-toolbox::after {
- width: 18px;
- height: 2px;
- border-left: 4px solid transparent;
- border-right: 4px solid transparent;
- box-shadow: 0 -2px 0, inset 4px 0 0, inset -4px 0 0;
- top: 4px;
-}
-
.ic-wifi {
color: #000;
position: absolute;
diff --git a/src/styles.scss b/src/styles.scss
index 95a0c0d60..3e993cf99 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -101,7 +101,8 @@ a {
cursor: pointer;
}
.label {
- padding: 0 16px;
+ padding-left: 16px;
+ padding-right: 10px;
@include btn-pass;
}
.customCheck {
--
GitLab