From 451083936feeaa4ee90f843bd788365f7a4cf020 Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Tue, 24 Nov 2020 14:46:33 +0100
Subject: [PATCH] fix: css for structure-details and addr display
---
src/app/home/home.component.ts | 4 ++--
.../structure-details.component.html | 12 ++++++------
.../structure-details.component.scss | 12 ++++++++----
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 873be218a..b2e80e6b8 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -96,7 +96,7 @@ export class HomeComponent implements OnInit {
private getStructurePosition(structure: Structure): Promise<Structure> {
return new Promise((resolve, reject) => {
this.getCoord(structure.n, structure.voie, structure.commune).subscribe((coord: GeoJson) => {
- structure.address = coord.properties.name + ' - ' + coord.properties.postcode + ' ' + coord.properties.city;
+ structure.address = structure.voie + ' - ' + coord.properties.postcode + ' ' + coord.properties.city;
structure.distance = parseInt(
this.geoJsonService.getDistance(
coord.geometry.getLon(),
@@ -135,7 +135,7 @@ export class HomeComponent implements OnInit {
(location) => {
this.currentLocation = location;
},
- (err) => console.error(err)
+ (err) => error(err)
);
}
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 1dbd4399a..15e99c896 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
@@ -3,7 +3,7 @@
<div fxLayout="row" fxLayoutAlign="end center">
<div (click)="close()" class="ico-close-details"></div>
</div>
- <div fxLayout="row" class="structrue-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
+ <div fxLayout="row" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
<div fxLayout="column" fxLayoutGap="10px" fxFlex="100%">
<div fxLayout="row" fxLayoutAlign="space-between start">
<div fxLayout="column">
@@ -60,7 +60,7 @@
<div
*ngIf="structure.accompagnementDesDemarches[0] !== ''"
fxLayout="column"
- class="structrue-details-block"
+ class="structure-details-block"
fxLayoutAlign="baseline baseline"
fxLayoutGap="20px"
>
@@ -85,7 +85,7 @@
<div
*ngIf="isBaseSkills() || isAccessRights()"
fxLayout="column"
- class="structrue-details-block"
+ class="structure-details-block"
fxLayoutAlign="baseline baseline"
fxLayoutGap="20px"
>
@@ -105,7 +105,7 @@
</div>
</div>
<!-- Accueil -->
- <div fxLayout="column" class="structrue-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
+ <div fxLayout="column" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px">
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
<app-svg-icon [type]="'ico'" [icon]="'accueil'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Accueil</h2>
@@ -149,7 +149,7 @@
<div
*ngIf="structure.hasEquipments()"
fxLayout="column"
- class="structrue-details-block"
+ class="structure-details-block"
fxLayoutAlign="baseline baseline"
>
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
@@ -169,7 +169,7 @@
<div
*ngIf="structure.labelsEtQualifications[0] !== ''"
fxLayout="column"
- class="structrue-details-block"
+ class="structure-details-block"
fxLayoutAlign="baseline baseline"
fxLayoutGap="20px"
>
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 17dde0436..5e622e077 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
@@ -17,16 +17,20 @@
overflow: auto;
}
-.structrue-details-block {
+.structrue-details-container > .structure-details-block {
+ padding: 0px 68px 24px 0;
border-bottom: 1px dashed $grey-2;
- padding-bottom: 24px;
- padding-right: 68px;
.subtitle {
text-transform: uppercase;
@include cn-bold-16;
}
}
-.structrue-details-block:last-child {
+
+.structrue-details-container > .structure-details-block ~ .structure-details-block {
+ padding: 24px 68px 24px 0;
+}
+
+.structure-details-block:last-child {
border-bottom: none;
}
--
GitLab