Skip to content

Commit 167bfdf

Browse files
committed
fix(frontend): update margins
1 parent 56f6a09 commit 167bfdf

File tree

81 files changed

+1049
-1011
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1049
-1011
lines changed

.talismanrc

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
fileignoreconfig:
2-
- filename: .kontinuous/env/dev/templates/backend.sealed-secret.yaml
3-
checksum: b0fb543f5704f8c6c0410bd9d4dcb3fb0ee81078750f46cebeca6c37b56b63a8
4-
- filename: .kontinuous/env/preprod/templates/backend.sealed-secret.yaml
5-
checksum: 4328b99895292731f5e4e75391b442d1c098aff466c1649faa7c1840550a6cd6
6-
- filename: .kontinuous/env/prod/templates/backend.sealed-secret.yaml
7-
checksum: a6d69a27445845d23455b1440f449485fbeefd07ca2549f96b8dea8603e584bd
8-
- filename: _docs/dev/0.run-local-env.md
9-
checksum: 855b6f29ace746c86597d36382dbe7e40f771137734e3bf5eb53c948d6592a74
10-
- filename: _scripts/db/dumps/domifa_test.postgres.restore-data-only.sql
11-
checksum: f6e35be32579c7a13ed58db688c20a68521d89ece97171647cc2a3c58ac5cec5
12-
- filename: _scripts/db/dumps/domifa_test.postgres.truncate-restore-data-only.sql
13-
checksum: 0f73652f32a4d79243ee555a5dd6e5ca2186c87a3d0622a564328492e580a03c
14-
- filename: package.json
15-
checksum: 465eda885229f86c2fe1481503d698968fc73ecf71925e5b989294834822b509
16-
- filename: packages/backend/package.json
17-
checksum: 2f5813dbc35cdc3659516beabf9f93e2978eb62d1b5403cfbb2907f22bb25355
18-
- filename: packages/backend/src/_migrations/1757532174131-auto-migration.ts
19-
checksum: e2d06e63d58935b349f2591b0a3c407c254be26c4e833456829e7c605fc7411b
20-
- filename: packages/backend/src/_migrations/1759327920930-auto-migration.ts
21-
checksum: f9096a9010ab4dd663b09c37d6c84f3b9f273cf0fd9ac02d850bbafcc16371d0
22-
- filename: packages/backend/src/_migrations/1760044365787-auto-migration.ts
23-
checksum: 05cafb91fb17905b562fe559181b2d2e9eed43a650b07025a15e58d9311d4411
24-
- filename: packages/backend/src/_migrations/1763999725431-auto-migration.ts
25-
checksum: 3762d1281d4109a0f57e6f100d49340db6528a17b4b9421d02cf0349b93fc3a0
26-
- filename: packages/backend/src/_migrations/_init-db/domifa_test_schema.sql
27-
checksum: eb5830a53f6558916812a8c3628d7ffed713dc4d0842eee7580dccbae28bd607
28-
- filename: packages/frontend/src/app/modules/general/components/faq/fragments/faq-fiches/faq-fiches.component.html
29-
checksum: d15e4ac782125d7ce36a51c4beaa9ff328a3861ade4fcc6df7aa4ad8e93fb2e3
30-
- filename: packages/frontend/src/app/modules/general/components/faq/fragments/faq-usage/faq-usage.component.html
31-
checksum: bf8eacf9a3159ca56a992bf6595764bbc39918f9b146f6bb0a916635d6c524a5
32-
- filename: packages/frontend/src/app/modules/general/components/static-pages/politique/politique.component.html
33-
checksum: 2fe09c9da87a5780f4a852920721c744d65e65700f44ce2822359bf6ba2b5fc0
34-
- filename: packages/frontend/src/assets/images/discover/partenaire-fabrique.svg
35-
checksum: 57fe56d87f88e2640091654f554b10d1b10b971b65967a4ae28b6133259fe3b1
36-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.spec.ts
37-
checksum: 8f66091255109d0da277819584c6c69d4a7f720256842851a49b0dda16af6651
38-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.ts
39-
checksum: a0fbc6fca054f17c58d411b55a45acfa2351309a270968298aafcede7b7ae31f
40-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/services/structuresSearchStringFilter.service.ts
41-
checksum: fe3243c2d2adc23ed62431597b6ae7b3cb61fb25d876f1ada2de5387f0872b0b
42-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.spec.ts
43-
checksum: d202296bc7f349c0dc6bf140be961d8c321f57d9188325a07c49a6ca10c55b3b
44-
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.ts
45-
checksum: e6d4d9afca6797fbf98f12db96ad37a21d61289539827390ba5b4aefeb92a6b2
46-
- filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
47-
checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
48-
- filename: packages/portail-admins/src/app/modules/general/components/static-pages/politique/politique.component.ts
49-
checksum: d1cc83582130541b0aff2b8b3984e907b889c057b21f8f251c9b55583e864703
50-
- filename: packages/portail-usagers/src/app/modules/general/components/_static/politique/politique.component.html
51-
checksum: c569c439ae74865248ff9a0840b658903e31f2b64af367760de27155957c6ea9
52-
- filename: packages/portail-usagers/src/app/modules/general/components/_static/politique/politique.component.ts
53-
checksum: dfdbbe1892cf17b22d28f529914eb5df3a07063d5e3071e59c36c907020260d3
54-
- filename: pnpm-lock.yaml
55-
checksum: 76eefff26be1587a785ad9c7b43a263c809e3baec62c39cc5b7cc4cacaaa05b6
2+
- filename: .kontinuous/env/dev/templates/backend.sealed-secret.yaml
3+
checksum: b0fb543f5704f8c6c0410bd9d4dcb3fb0ee81078750f46cebeca6c37b56b63a8
4+
- filename: .kontinuous/env/preprod/templates/backend.sealed-secret.yaml
5+
checksum: 4328b99895292731f5e4e75391b442d1c098aff466c1649faa7c1840550a6cd6
6+
- filename: .kontinuous/env/prod/templates/backend.sealed-secret.yaml
7+
checksum: a6d69a27445845d23455b1440f449485fbeefd07ca2549f96b8dea8603e584bd
8+
- filename: _docs/dev/0.run-local-env.md
9+
checksum: 855b6f29ace746c86597d36382dbe7e40f771137734e3bf5eb53c948d6592a74
10+
- filename: _scripts/db/dumps/domifa_test.postgres.restore-data-only.sql
11+
checksum: f6e35be32579c7a13ed58db688c20a68521d89ece97171647cc2a3c58ac5cec5
12+
- filename: _scripts/db/dumps/domifa_test.postgres.truncate-restore-data-only.sql
13+
checksum: 0f73652f32a4d79243ee555a5dd6e5ca2186c87a3d0622a564328492e580a03c
14+
- filename: package.json
15+
checksum: 465eda885229f86c2fe1481503d698968fc73ecf71925e5b989294834822b509
16+
- filename: packages/backend/package.json
17+
checksum: 2f5813dbc35cdc3659516beabf9f93e2978eb62d1b5403cfbb2907f22bb25355
18+
- filename: packages/backend/src/_migrations/1757532174131-auto-migration.ts
19+
checksum: e2d06e63d58935b349f2591b0a3c407c254be26c4e833456829e7c605fc7411b
20+
- filename: packages/backend/src/_migrations/1759327920930-auto-migration.ts
21+
checksum: f9096a9010ab4dd663b09c37d6c84f3b9f273cf0fd9ac02d850bbafcc16371d0
22+
- filename: packages/backend/src/_migrations/1760044365787-auto-migration.ts
23+
checksum: 05cafb91fb17905b562fe559181b2d2e9eed43a650b07025a15e58d9311d4411
24+
- filename: packages/backend/src/_migrations/1763999725431-auto-migration.ts
25+
checksum: 3762d1281d4109a0f57e6f100d49340db6528a17b4b9421d02cf0349b93fc3a0
26+
- filename: packages/backend/src/_migrations/_init-db/domifa_test_schema.sql
27+
checksum: eb5830a53f6558916812a8c3628d7ffed713dc4d0842eee7580dccbae28bd607
28+
- filename: packages/frontend/src/app/modules/general/components/faq/fragments/faq-fiches/faq-fiches.component.html
29+
checksum: d15e4ac782125d7ce36a51c4beaa9ff328a3861ade4fcc6df7aa4ad8e93fb2e3
30+
- filename: packages/frontend/src/app/modules/general/components/faq/fragments/faq-usage/faq-usage.component.html
31+
checksum: bf8eacf9a3159ca56a992bf6595764bbc39918f9b146f6bb0a916635d6c524a5
32+
- filename: packages/frontend/src/app/modules/general/components/static-pages/politique/politique.component.html
33+
checksum: 2fe09c9da87a5780f4a852920721c744d65e65700f44ce2822359bf6ba2b5fc0
34+
- filename: packages/frontend/src/assets/images/discover/partenaire-fabrique.svg
35+
checksum: 57fe56d87f88e2640091654f554b10d1b10b971b65967a4ae28b6133259fe3b1
36+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.spec.ts
37+
checksum: 8f66091255109d0da277819584c6c69d4a7f720256842851a49b0dda16af6651
38+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/admin-structures-list.component.ts
39+
checksum: a0fbc6fca054f17c58d411b55a45acfa2351309a270968298aafcede7b7ae31f
40+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/admin-structures-list/services/structuresSearchStringFilter.service.ts
41+
checksum: fe3243c2d2adc23ed62431597b6ae7b3cb61fb25d876f1ada2de5387f0872b0b
42+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.spec.ts
43+
checksum: d202296bc7f349c0dc6bf140be961d8c321f57d9188325a07c49a6ca10c55b3b
44+
- filename: packages/portail-admins/src/app/modules/admin-structures/components/structure-filters/structure-filters.component.ts
45+
checksum: e6d4d9afca6797fbf98f12db96ad37a21d61289539827390ba5b4aefeb92a6b2
46+
- filename: packages/portail-admins/src/app/modules/admin-structures/utils/structure-filter-criteria.ts
47+
checksum: c54f1bf45a44280960869561243668e7a92713fb5265f008a95fc3fe66014bf1
48+
- filename: packages/portail-admins/src/app/modules/general/components/static-pages/politique/politique.component.ts
49+
checksum: d1cc83582130541b0aff2b8b3984e907b889c057b21f8f251c9b55583e864703
50+
- filename: packages/portail-usagers/src/app/modules/general/components/_static/politique/politique.component.html
51+
checksum: c569c439ae74865248ff9a0840b658903e31f2b64af367760de27155957c6ea9
52+
- filename: packages/portail-usagers/src/app/modules/general/components/_static/politique/politique.component.ts
53+
checksum: dfdbbe1892cf17b22d28f529914eb5df3a07063d5e3071e59c36c907020260d3
54+
- filename: pnpm-lock.yaml
55+
checksum: 04944a039a66ffc4e33f62949d78d210900a1d95b38b358168bfb56708dc95da
5656
allowed_patterns:
57-
- uses:\s*[\w\-\.]+/[\w\-\.]+@[a-fA-F0-9]{40}
58-
- uses:\s*[\w\-\.]+/[\w\-\.]+/[\w\-\./]*@[a-fA-F0-9]{40}
57+
- uses:\s*[\w\-\.]+/[\w\-\.]+@[a-fA-F0-9]{40}
58+
- uses:\s*[\w\-\.]+/[\w\-\.]+/[\w\-\./]*@[a-fA-F0-9]{40}
5959
threshold: medium
6060
version: "1.0"

packages/frontend/angular.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"src/assets/css/forms.scss",
3434
"src/assets/css/main.scss",
3535
"src/assets/css/print.css",
36-
"src/assets/css/icons.css",
3736
"node_modules/intl-tel-input/build/css/intlTelInput.css"
3837
],
3938
"scripts": ["./node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.module.js"],

packages/frontend/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"@fortawesome/fontawesome-svg-core": "^6.7.2",
4242
"@fortawesome/free-regular-svg-icons": "^6.7.2",
4343
"@fortawesome/free-solid-svg-icons": "^6.7.2",
44-
"@gouvfr/dsfr": "^1.14.2",
44+
"@gouvfr/dsfr": "1.14.4",
4545
"@khazii/ngx-intl-tel-input": "^17.0.1",
4646
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
4747
"@ngrx/effects": "^18.1.1",
@@ -102,6 +102,7 @@
102102
"parchment": "^3.0.0",
103103
"quill": "^2.0.3",
104104
"quill-delta": "^5.1.0",
105+
"remixicon": "^4.9.1",
105106
"rfdc": "1.4.1",
106107
"rxjs": "^7.8.2",
107108
"slug": "^9.1.0",

packages/frontend/src/_common/model/interaction/INTERACTION_ICONS.const.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const INTERACTION_ICONS: Record<
3333
label: "Appel",
3434
},
3535
visite: {
36-
icon: "fr-icon-walk-line",
36+
icon: "ri-walk-fill",
3737
label: "Visite",
3838
},
3939
} as const;
Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,34 @@
1-
<div class="d-flex flex-row gap-0">
2-
<div class="fr-background-alt--grey flex-grow-1 d-none d-sm-flex">
1+
<div class="fr-display-flex fr-flex-row fr-gap-0w">
2+
<div class="fr-background-alt--grey fr-flex-grow-1 d-none d-sm-flex">
33
<!-- clearfix -->
44
</div>
5-
<div class="fr-container d-flex flex-row flex-shrink-0 p-0">
5+
<div class="fr-container fr-display-flex fr-flex-row flex-shrink-0 p-0">
66
<div
7-
class="fr-col-12 fr-col-md-6 fr-col-sm-6 d-flex flex-column align-items-left px-3 py-5 fr-background-alt--grey"
7+
class="fr-col-12 fr-col-md-6 fr-col-sm-6 fr-display-flex fr-flex-column align-items-left px-3 py-5 fr-background-alt--grey"
88
>
99
<router-outlet> </router-outlet>
1010
</div>
11-
<div class="fr-col-12 fr-col-md-6 fr-col-sm-6 d-flex d-none d-sm-flex p-4">
12-
<div class="d-flex flex-column justify-content-center">
11+
<div
12+
class="fr-col-12 fr-col-md-6 fr-col-sm-6 fr-display-flex d-none d-sm-flex p-4"
13+
>
14+
<div class="fr-display-flex fr-flex-column fr-justify-content-center">
1315
<div
14-
class="row d-flex gap-2 align-self-start align-content-center py-4"
16+
class="fr-grid-row fr-display-flex fr-gap-2w fr-align-self-start align-content-center py-4"
1517
>
16-
<div class="d-flex flex-column fr-col-5 fr-col-md-5 fr-col-sm-12">
17-
<div class="d-flex flex-column fr-col-12 fr-col-md-12 fr-col-sm-12">
18+
<div
19+
class="fr-display-flex fr-flex-column fr-col-5 fr-col-md-5 fr-col-sm-12"
20+
>
21+
<div
22+
class="fr-display-flex fr-flex-column fr-col-12 fr-col-md-12 fr-col-sm-12"
23+
>
1824
<img src="assets/images/logo.svg" alt="" />
1925
</div>
2026
</div>
2127
<p class="fr-text-title--blue-france fw-bold">
2228
Votre outil de gestion pour simplifier la domiciliation
2329
</p>
2430
<div
25-
class="fr-col-12 fr-col-md-12 fr-col-sm-12 justify-content-center d-flex"
31+
class="fr-col-12 fr-col-md-12 fr-col-sm-12 fr-justify-content-center fr-display-flex"
2632
>
2733
<img
2834
aria-hidden="true"
@@ -35,7 +41,7 @@
3541
</div>
3642
</div>
3743
</div>
38-
<div class="flex-grow-1 d-none d-sm-flex">
44+
<div class="fr-flex-grow-1 d-none d-sm-flex">
3945
<!-- clearfix -->
4046
</div>
4147
</div>

packages/frontend/src/app/modules/auth/components/login/login-form.component.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<h1 class="align-self-start fr-h3">Se connecter avec mon compte</h1>
1+
<h1 class="fr-align-self-start fr-h3">Se connecter avec mon compte</h1>
22
<span class="fr-col-12 fr-col-md-12 fr-text-default--error">
33
* champs obligatoires
44
</span>
55
<form
66
[formGroup]="loginForm"
7-
class="column d-flex flex-column gap-3 pt-4 pt-md-5 pb-4 pb-md-5"
7+
class="column fr-display-flex fr-flex-column fr-gap-3w pt-4 pt-md-5 pb-4 pb-md-5"
88
(ngSubmit)="login()"
99
>
1010
@if (loginError) {
@@ -102,8 +102,8 @@ <h1 class="align-self-start fr-h3">Se connecter avec mon compte</h1>
102102
Mot de passe oublié ?
103103
</a>
104104
</div>
105-
<div class="fr-input-group my-2 fr-text--center">
106-
<button type="submit" class="fr-btn d-flex flex-column w-100">
105+
<div class="fr-input-group fr-my-2w fr-text--center">
106+
<button type="submit" class="fr-btn fr-display-flex fr-flex-column w-100">
107107
@if (!loading) {
108108
<span>Se connecter</span>
109109
} @if (loading) {
@@ -119,13 +119,13 @@ <h1 class="align-self-start fr-h3">Se connecter avec mon compte</h1>
119119
</div>
120120

121121
<hr />
122-
<div class="fr-col-12 d-flex flex-column gap-2">
122+
<div class="fr-col-12 fr-display-flex fr-flex-column fr-gap-2w">
123123
<h2 class="fr-h5 mb-0">Votre structure n’est pas encore inscrite ?</h2>
124-
<div class="fr-input-group my-2 fr-text--center">
124+
<div class="fr-input-group fr-my-2w fr-text--center">
125125
<a
126126
routerLink="/structures/inscription"
127127
id="inscriptionLink"
128-
class="fr-btn fr-btn--secondary d-flex flex-column w-100"
128+
class="fr-btn fr-btn--secondary fr-display-flex fr-flex-column w-100"
129129
>
130130
Inscrivez votre structure
131131
</a>

packages/frontend/src/app/modules/general/components/contact-support/contact-support.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ <h2 class="fr-mb-0">Remplir le formulaire de contact</h2>
141141
</div>
142142
</div>
143143

144-
<!-- Email + Téléphone -->
145144
<div class="fr-grid-row fr-grid-row--gutters fr-mb-3w">
146145
<div class="fr-col-12 fr-col-md-6">
147146
<div
@@ -153,6 +152,8 @@ <h2 class="fr-mb-0">Remplir le formulaire de contact</h2>
153152
<label class="fr-label" for="email">
154153
Adresse email de contact
155154
</label>
155+
<p class="fr-hint-text empty-hint"></p>
156+
156157
<input
157158
type="email"
158159
id="email"

0 commit comments

Comments
 (0)