Skip to content
Snippets Groups Projects
Commit 1a8d0107 authored by Jérémie BRISON's avatar Jérémie BRISON Committed by Hugo SUBTIL
Browse files

fix: typo, alignements and others

parent 87921294
No related branches found
No related tags found
1 merge request!31Recette
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
<div fxLayout="row"> <div fxLayout="row">
<!-- <img class="logo-grand-lyon" src="/assets/logos/ram_logo.svg" alt /> --> <!-- <img class="logo-grand-lyon" src="/assets/logos/ram_logo.svg" alt /> -->
<div fxLayout="column" fxLayoutAlign="center"> <div fxLayout="column" fxLayoutAlign="center">
<p>Réseau des Acteurs de la Médiation</p> <p>Réseau des Acteurs de la Médiation Numérique</p>
<p>de la Métropole de Lyon</p> <p>de la Métropole de Lyon</p>
</div> </div>
</div> </div>
</div> </div>
<div fxLayout="row" class="right-header" fxLayoutAlign="center center" fxLayoutGap="3vw"> <div fxLayout="row" class="right-header" fxLayoutAlign="center center" fxLayoutGap="3vw">
<a routerLink="/home" [routerLinkActive]="'active'" i18n>Acteurs de la médiation</a> <a routerLink="/home" [routerLinkActive]="'active'" i18n>Acteurs de la médiation numérique</a>
<!-- <a routerLink="/resources" [routerLinkActive]="'active'" i18n>Ressources</a> <!-- <a routerLink="/resources" [routerLinkActive]="'active'" i18n>Ressources</a>
<a routerLink="/projects" [routerLinkActive]="'active'" i18n>Projets</a> --> <a routerLink="/projects" [routerLinkActive]="'active'" i18n>Projets</a> -->
<a routerLink="/about" [routerLinkActive]="'active'" i18n>Qui sommes-nous ?</a> <a routerLink="/about" [routerLinkActive]="'active'" i18n>Qui sommes-nous ?</a>
......
<div class="structure" fxLayout="column" (click)="cardClicked()" (mouseover)="cardHover()"> <div class="structure" fxLayout="column" (click)="cardClicked()" (mouseover)="cardHover()">
<span class="nomStructure">{{ structure.nomDeVotreStructure }}</span> <div class="headerStructure" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
<span class="nomStructure">{{ structure.nomDeVotreStructure }}</span>
<div class="headerStructure" fxLayout="row" fxLayoutAlign="space-between center">
<span class="typeStructure">{{ structure.typeDeStructure }}</span>
<div <div
*ngIf="structure.distance" *ngIf="structure.distance"
class="distanceStructure" class="distanceStructure"
fxLayout="row" fxLayout="row"
fxLayoutAlign="center center" fxLayoutAlign="end center"
fxLayoutGap="20px" fxLayoutGap="20px"
> >
<div fxLayout="row" fxLayoutAlign="center center"> <div fxLayout="row" fxLayoutAlign="center center">
...@@ -19,6 +16,7 @@ ...@@ -19,6 +16,7 @@
</div> </div>
</div> </div>
</div> </div>
<span class="typeStructure">{{ structure.typeDeStructure }}</span>
<br /> <br />
<app-structure-opening-status [structure]="structure"></app-structure-opening-status> <app-structure-opening-status [structure]="structure"></app-structure-opening-status>
</div> </div>
...@@ -31,10 +31,12 @@ ...@@ -31,10 +31,12 @@
color: $grey-1; color: $grey-1;
@include cn-bold-20; @include cn-bold-20;
padding-bottom: 5px; padding-bottom: 5px;
width: 100%;
} }
.distanceStructure { .distanceStructure {
@include cn-regular-16; @include cn-regular-16;
color: $grey-1; color: $grey-1;
width: 50%;
} }
&:last-child { &:last-child {
border-bottom: none; border-bottom: none;
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
} }
} }
.ligneFiltre { .ligneFiltre {
padding: 0 5px; padding: 5px;
} }
h4 { h4 {
@include cn-bold-14; @include cn-bold-14;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<form <form
[formGroup]="searchForm" [formGroup]="searchForm"
fxLayout="row" fxLayout="row"
fxLayoutGap="1.5vw" fxLayoutGap="16px"
fxLayoutAlign=" center" fxLayoutAlign=" center"
(ngSubmit)="applyFilter(searchForm.value.searchTerm)" (ngSubmit)="applyFilter(searchForm.value.searchTerm)"
> >
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</form> </form>
</div> </div>
<div (clickOutside)="closeModal()"> <div (clickOutside)="closeModal()">
<div class="btnSection" fxLayout="row" fxLayoutAlign="space-between center"> <div class="btnSection" fxLayout="row" fxLayoutAlign="space-between center" fxLayoutGap="16px">
<button <button
class="btn-filter" class="btn-filter"
type="button" type="button"
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
button { button {
background: $white; background: $white;
height: 40px; height: 40px;
width: 190px; width: 100%;
border: 1px solid $grey-4; border: 1px solid $grey-4;
padding: 3px 16px 3px 16px; padding: 3px 16px 3px 16px;
outline: none; outline: none;
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
</div> </div>
<div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px"> <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px">
<app-svg-icon [type]="'ico'" [icon]="'calendar'"></app-svg-icon> <app-svg-icon [type]="'ico'" [icon]="'calendar'"></app-svg-icon>
<p>Mise-à-jour le {{ structure.derniereModification | date: 'shortDate' }}</p> <p>Mise-à-jour le {{ structure.derniereModification | date: 'mediumDate' }}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -73,17 +73,23 @@ ...@@ -73,17 +73,23 @@
</div> </div>
</div> </div>
<!-- Services --> <!-- Services -->
<div fxLayout="column" class="structrue-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px"> <div
*ngIf="isBaseSkills() || isAccessRights()"
fxLayout="column"
class="structrue-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]="'services'" [iconClass]="'icon-32'"></app-svg-icon> <app-svg-icon [type]="'ico'" [icon]="'services'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Services</h2> <h2>Services</h2>
</div> </div>
<div fxLayout="row" class="w-100"> <div fxLayout="row" class="w-100">
<div fxFlex="50%" *ngIf="baseSkills && baseSkills[0] !== undefined"> <div fxFlex="50%" *ngIf="isBaseSkills()">
<h3 class="subtitle">Compétences de base</h3> <h3 class="subtitle">Compétences de base</h3>
<p *ngFor="let skill of baseSkills">{{ skill.text }}</p> <p *ngFor="let skill of baseSkills">{{ skill.text }}</p>
</div> </div>
<div fxFlex="50%" *ngIf="accessRights && accessRights[0] !== undefined"> <div fxFlex="50%" *ngIf="isAccessRights()">
<h3 class="subtitle">Accès au droits</h3> <h3 class="subtitle">Accès au droits</h3>
<p *ngFor="let rights of accessRights">{{ rights.text }}</p> <p *ngFor="let rights of accessRights">{{ rights.text }}</p>
</div> </div>
......
...@@ -81,4 +81,11 @@ export class StructureDetailsComponent implements OnInit { ...@@ -81,4 +81,11 @@ export class StructureDetailsComponent implements OnInit {
} }
public keepOriginalOrder = (a, b) => a.key; public keepOriginalOrder = (a, b) => a.key;
public isBaseSkills(): boolean {
return this.baseSkills && this.baseSkills[0] !== undefined;
}
public isAccessRights(): boolean {
return this.accessRights && this.accessRights[0] !== undefined;
}
} }
...@@ -88,7 +88,6 @@ a { ...@@ -88,7 +88,6 @@ a {
} }
} }
label { label {
align-items: center;
grid-template-columns: min-content auto; grid-template-columns: min-content auto;
display: inline-grid; display: inline-grid;
cursor: pointer; cursor: pointer;
......
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