Skip to content

Commit 76ed92d

Browse files
cdebarroscdebarros
committed
corrections maquette css
1 parent cda04fd commit 76ed92d

File tree

8 files changed

+46
-28
lines changed

8 files changed

+46
-28
lines changed

‎src/app/controls/layerswitcher/layerswitcher.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { LayerSwitcher } from "geopf-extensions-openlayers/src";
99
standalone: true,
1010
imports: [],
1111
template: '',
12-
styles: ['::ng-deep .GPlayerRemove{display: none;}', '::ng-deep div[id^="GPlayerSwitcher"]{margin-bottom: 0px !important;}'],
12+
styles: ['::ng-deep .GPlayerRemove, ::ng-deep .GPlayerGreyscale{display: none;}', '::ng-deep div[id^="GPlayerSwitcher"]{margin-bottom: 0px !important;}'],
1313
})
1414
export class LayerswitcherComponent implements OnInit {
1515
@Input() map!: Map;

‎src/app/controls/scaleline/scaleline.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import ScaleLine from 'ol/control/ScaleLine';
88
selector: 'app-scaleline',
99
standalone: true,
1010
template: '',
11-
styles: ['::ng-deep .ol-scale-line{left: 60px;}']
11+
styles: ['::ng-deep .ol-scale-line{left:unset; right: 65px;}']
1212
})
1313
export class ScalelineComponent implements OnInit {
1414
@Input() map!: Map;

‎src/app/pages/annexes/mentions-legales/mentions-legales.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 class="margin-title">Traitement des données à caractère personnel</h2>
2424
<p class="fr-col-12">Les informations issues des demandes d’accès au site sont utilisées exclusivement pour la gestion des permissions d’accès aux différents contenus et fonctionnalités du site cartosp.modernisation.gouv.fr.</p>
2525
<p class="fr-col-12">Le destinataire des données est la DITP.</p>
2626
<p class="fr-col-12">Conformément à la loi « Informatique et libertés » du 6 janvier 1978, vous bénéficiez d’un droit d’accès et de rectification des informations qui vous concernent, que vous pouvez exercer en vous adressant à l’IGN aux coordonnées accessibles via le lien « Nous écrire » dans la rubrique aide.</p>
27-
<p class="fr-col-12"><a class="fr-link fr-link--download" href="#">En savoir plus sur les données à caractère personnel</a></p>
27+
<p class="fr-col-12"><a class="fr-link fr-link" href="/donnees-personnelles">En savoir plus sur les données à caractère personnel</a></p>
2828
<h2 class="margin-title">Droit de propriété intellectuelle</h2>
2929
<p class="fr-col-12">Les illustrations, le contenu éditorial, les divers éléments de la charte graphique ainsi que les données cartographiques issues de la consultation en ligne figurant sur le site cartosp.modernisation.gouv.fr sont des éléments dont la DITP détient la propriété ou le droit d’exploitation.</p>
3030
<p class="fr-col-12">L’utilisation des documents ou éléments du site est soumise à l’accord préalable de notre établissement.</p>

‎src/app/rightpanel/content/localisation/localisation.component.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ export class LocalisationComponent implements OnInit {
5454
//@ts-ignore
5555
name: "highlight",
5656
style: {
57-
'stroke-color': 'red',
58-
'stroke-width': 3,
57+
'stroke-color': '#C8191F',
58+
'stroke-width': 1,
59+
'fill-color': 'rgba(0, 0, 0, 0.08)'
5960
},
6061
});
6162

@@ -129,8 +130,8 @@ export class LocalisationComponent implements OnInit {
129130
self.WfsService.getEpciFromBbox(e.getView().calculateExtent(e.getSize()).toString()).subscribe({
130131
next : (response: any) => {
131132
self.epcis = [];
132-
response.features.forEach( (feature: { properties: { id: any; nom: any; code_siren: any; }; }) => {
133-
self.epcis.push({id: feature.properties.id , name: feature.properties.nom, number: feature.properties.code_siren });
133+
response.features.forEach( (feature: { properties: { cleabs: any; nom_officiel: any; code_siren: any; }; }) => {
134+
self.epcis.push({id: feature.properties.cleabs , name: feature.properties.nom_officiel, number: feature.properties.code_siren });
134135
});
135136
},
136137
error : (error: any) => { console.error('Error fetching epci datas:', error); }
@@ -143,8 +144,8 @@ export class LocalisationComponent implements OnInit {
143144
self.WfsService.getCommuneFromBbox(e.getView().calculateExtent(e.getSize()).toString()).subscribe({
144145
next : (response: any) => {
145146
self.communes = [];
146-
response.features.forEach( (feature: { properties: { id: any; nom: any; insee_dep: any; }; }) => {
147-
self.communes.push({id: feature.properties.id , name: feature.properties.nom, number: feature.properties.insee_dep });
147+
response.features.forEach( (feature: { properties: { cleabs: any; nom_officiel: any; code_insee_du_departement : any; }; }) => {
148+
self.communes.push({id: feature.properties.cleabs , name: feature.properties.nom_officiel, number: feature.properties.code_insee_du_departement });
148149
});
149150
},
150151
error : (error: any) => { console.error('Error fetching commune datas:', error); }

‎src/app/rightpanel/content/service-public/service-public.component.css‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
:host > .fr-h3 {
33
margin-top: 15px;
44
margin-bottom: 5px;
5+
font-size: 28px !important;
6+
font-weight: 700 !important;
7+
line-height: 36px !important;
8+
letter-spacing: 0%;
59
}
610

711
.fr-h4-tab {
@@ -10,16 +14,23 @@
1014
}
1115

1216
:host > .fr-h6 {
13-
font-weight: 300 !important;
14-
font-size: 1.1rem !important;
15-
margin-bottom: 20px;
17+
font-weight: 500 !important;
18+
font-size: 14px !important;
19+
color: #0063CB !important;
20+
font-style: Medium !important;
21+
font-weight: 500 !important;
22+
line-height: 24px !important;
23+
margin-bottom: 5px !important;
1624
}
1725

1826
:host > .fr-h7 {
19-
font-size: 1.1rem !important;
20-
margin-bottom: 5px;
21-
font-weight: 500;
22-
color: #0078f3;
27+
font-size: 1rem !important;
28+
margin-bottom: 5px !important;
29+
font-weight: 500 !important;
30+
font-style: Medium !important;
31+
color: #666666 !important;
32+
line-height: 24px !important;
33+
margin-bottom: 20px !important;
2334
}
2435

2536
/* Informations sur le SP */
@@ -39,12 +50,16 @@
3950
}
4051

4152
.permanence-hebergement{
42-
font-size: 0.9rem;
53+
font-size: 14px;
54+
color: #000091;
55+
font-weight: 500;
56+
font-style: Medium;
4357
}
4458

4559
.info-list > .info-content {
4660
padding-left: 10px;
47-
font-size: 0.9rem;
61+
font-size: 1rem;
62+
font-weight: 500;
4863
}
4964

5065
.opentimes{

‎src/app/rightpanel/content/service-public/service-public.component.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
<!-- Titres -->
2828
@if(typeStructure === "Permanence"){
2929
<h3 class="fr-h3">{{ data.selectedSP.permanence_nom}}</h3>
30-
<h6 class="fr-h7">{{ data.selectedSP.permanence_typologie }}</h6>
31-
<h6 class="fr-h6">{{ data.selectedSP.permanence_thematique }}</h6>
30+
<h6 class="fr-h6">{{ data.selectedSP.permanence_typologie }}</h6>
31+
<h6 class="fr-h7">{{ data.selectedSP.permanence_thematique }}</h6>
3232
} @else {
3333
<h3 class="fr-h3">{{ data.selectedSP.service_nom }}</h3>
34-
<h6 class="fr-h7">{{ data.selectedSP.service_typologie }}</h6>
35-
<h6 class="fr-h6">{{ data.selectedSP.service_thematique }}</h6>
34+
<h6 class="fr-h6">{{ data.selectedSP.service_typologie }}</h6>
35+
<h6 class="fr-h7">{{ data.selectedSP.service_thematique }}</h6>
3636
}
3737
<!-- Onglets d'informations -->
3838
<dsfr-tabs
@@ -113,7 +113,7 @@ <h6 class="fr-h6">{{ data.selectedSP.service_thematique }}</h6>
113113
@if(serviceOpeningHours.weekstable == true){
114114
@for (entry of serviceOpeningHours.openingHours; track entry.day) {
115115
<div class="spopening">
116-
<div class="spopening-day">{{ entry.day }}</div>
116+
<div class="spopening-day">{{ entry.day| titlecase }}</div>
117117
<div class="spopening-hours">
118118
@for (halfday of entry.time; track halfday) {
119119
<p>{{ halfday }}</p>
@@ -128,7 +128,7 @@ <h6 class="fr-h6">{{ data.selectedSP.service_thematique }}</h6>
128128
<div class="spopening-day">Dates</div>
129129
<div class="spopening-date">
130130
@for (date of serviceOpeningHours.openingHours.dates; track date) {
131-
<p>{{ date }}</p>
131+
<p>{{ date| titlecase }}</p>
132132
}
133133
</div>
134134
</div>
@@ -233,7 +233,7 @@ <h4 class="fr-h4 fr-h4-tab">Circuit</h4>
233233
@if(entry.openinghours.weekstable == true){
234234
@for (entry of entry.openinghours.openingHours; track entry.day) {
235235
<div class="spopening">
236-
<div class="spopening-day">{{ entry.day }}</div>
236+
<div class="spopening-day">{{ entry.day | titlecase}}</div>
237237
<div class="spopening-hours">
238238
@for (halfday of entry.time; track halfday) {
239239
<p>{{ halfday }}</p>
@@ -248,7 +248,7 @@ <h4 class="fr-h4 fr-h4-tab">Circuit</h4>
248248
<div class="spopening-day">Dates</div>
249249
<div class="spopening-date">
250250
@for (date of entry.openinghours.openingHours.dates; track date) {
251-
<p>{{ date }}</p>
251+
<p>{{ date | titlecase}}</p>
252252
}
253253
</div>
254254
</div>

‎src/app/rightpanel/content/service-public/service-public.component.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import { Component, Input, OnInit } from '@angular/core';
22

3+
import {TitleCasePipe} from '@angular/common';
4+
35
import { DsfrTabsModule, DsfrAccordionModule, DsfrButtonModule } from '@edugouvfr/ngx-dsfr';
46

57
import { RightpanelService } from '../../rightpanel.service';
@@ -21,7 +23,7 @@ interface responseListType {
2123
@Component({
2224
selector: 'app-service-public',
2325
standalone: true,
24-
imports: [DsfrTabsModule, DsfrAccordionModule, DsfrButtonModule],
26+
imports: [DsfrTabsModule, DsfrAccordionModule, DsfrButtonModule, TitleCasePipe],
2527
templateUrl: './service-public.component.html',
2628
styleUrl: './service-public.component.css'
2729
})

‎src/app/services/wfs.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class WfsService {
3434
getEpciFromBbox(bbox: string): Observable<any> {
3535
var req = Object.assign(this.defaultParams, {
3636
TYPENAME: "ADMINEXPRESS-COG.LATEST:epci",
37-
PROPERTYNAME: "id,nom,code_siren",
37+
PROPERTYNAME: "cleabs,nom_officiel,code_siren",
3838
BBOX: bbox + ",EPSG:3857"
3939
});
4040

0 commit comments

Comments
 (0)