Skip to content
Snippets Groups Projects
Commit 45108393 authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

fix: css for structure-details and addr display

parent 25778129
No related branches found
No related tags found
1 merge request!31Recette
...@@ -96,7 +96,7 @@ export class HomeComponent implements OnInit { ...@@ -96,7 +96,7 @@ export class HomeComponent implements OnInit {
private getStructurePosition(structure: Structure): Promise<Structure> { private getStructurePosition(structure: Structure): Promise<Structure> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.getCoord(structure.n, structure.voie, structure.commune).subscribe((coord: GeoJson) => { 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( structure.distance = parseInt(
this.geoJsonService.getDistance( this.geoJsonService.getDistance(
coord.geometry.getLon(), coord.geometry.getLon(),
...@@ -135,7 +135,7 @@ export class HomeComponent implements OnInit { ...@@ -135,7 +135,7 @@ export class HomeComponent implements OnInit {
(location) => { (location) => {
this.currentLocation = location; this.currentLocation = location;
}, },
(err) => console.error(err) (err) => error(err)
); );
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div fxLayout="row" fxLayoutAlign="end center"> <div fxLayout="row" fxLayoutAlign="end center">
<div (click)="close()" class="ico-close-details"></div> <div (click)="close()" class="ico-close-details"></div>
</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="column" fxLayoutGap="10px" fxFlex="100%">
<div fxLayout="row" fxLayoutAlign="space-between start"> <div fxLayout="row" fxLayoutAlign="space-between start">
<div fxLayout="column"> <div fxLayout="column">
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<div <div
*ngIf="structure.accompagnementDesDemarches[0] !== ''" *ngIf="structure.accompagnementDesDemarches[0] !== ''"
fxLayout="column" fxLayout="column"
class="structrue-details-block" class="structure-details-block"
fxLayoutAlign="baseline baseline" fxLayoutAlign="baseline baseline"
fxLayoutGap="20px" fxLayoutGap="20px"
> >
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<div <div
*ngIf="isBaseSkills() || isAccessRights()" *ngIf="isBaseSkills() || isAccessRights()"
fxLayout="column" fxLayout="column"
class="structrue-details-block" class="structure-details-block"
fxLayoutAlign="baseline baseline" fxLayoutAlign="baseline baseline"
fxLayoutGap="20px" fxLayoutGap="20px"
> >
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
</div> </div>
</div> </div>
<!-- Accueil --> <!-- 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"> <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
<app-svg-icon [type]="'ico'" [icon]="'accueil'" [iconClass]="'icon-32'"></app-svg-icon> <app-svg-icon [type]="'ico'" [icon]="'accueil'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Accueil</h2> <h2>Accueil</h2>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
<div <div
*ngIf="structure.hasEquipments()" *ngIf="structure.hasEquipments()"
fxLayout="column" fxLayout="column"
class="structrue-details-block" class="structure-details-block"
fxLayoutAlign="baseline baseline" fxLayoutAlign="baseline baseline"
> >
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px"> <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px">
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<div <div
*ngIf="structure.labelsEtQualifications[0] !== ''" *ngIf="structure.labelsEtQualifications[0] !== ''"
fxLayout="column" fxLayout="column"
class="structrue-details-block" class="structure-details-block"
fxLayoutAlign="baseline baseline" fxLayoutAlign="baseline baseline"
fxLayoutGap="20px" fxLayoutGap="20px"
> >
......
...@@ -17,16 +17,20 @@ ...@@ -17,16 +17,20 @@
overflow: auto; overflow: auto;
} }
.structrue-details-block { .structrue-details-container > .structure-details-block {
padding: 0px 68px 24px 0;
border-bottom: 1px dashed $grey-2; border-bottom: 1px dashed $grey-2;
padding-bottom: 24px;
padding-right: 68px;
.subtitle { .subtitle {
text-transform: uppercase; text-transform: uppercase;
@include cn-bold-16; @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; border-bottom: none;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment