Skip to content

Commit 69e920e

Browse files
authored
feat(admin): update css for dsfr (#3997)
1 parent b938a0b commit 69e920e

File tree

8 files changed

+55
-33
lines changed

8 files changed

+55
-33
lines changed

.talismanrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ fileignoreconfig:
3838
- filename: packages/portail-usagers/src/app/modules/general/components/_static/politique/politique.component.ts
3939
checksum: dfdbbe1892cf17b22d28f529914eb5df3a07063d5e3071e59c36c907020260d3
4040
- filename: yarn.lock
41-
checksum: 9a27f36165f5ea6fb6751b8bb4579d465175a06e63a2f2c3845e34e0175e954e
41+
checksum: ea995d3d75a1260f5d03f9edf282b9968eb5ea3e61f4d76370ebcbae333653da
4242
threshold: medium
4343
version: "1.0"

packages/portail-admins/angular.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"src/styles.scss",
2525
"./node_modules/@gouvfr/dsfr/dist/dsfr/dsfr.main.min.css",
2626
"./node_modules/@gouvfr/dsfr/dist/utility/utility.main.min.css",
27+
"src/assets/css/dsfr-custom.scss",
2728
"src/assets/css/bootstrap-custom.scss",
2829
"src/assets/css/forms.scss",
2930
"src/assets/css/fonts.scss",

packages/portail-admins/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"@angular/platform-browser-dynamic": "^18.2.13",
2929
"@angular/router": "^18.2.13",
3030
"@domifa/common": "workspace:^",
31-
"@edugouvfr/ngx-dsfr": "^1.14.3",
31+
"@edugouvfr/ngx-dsfr": "^1.16.2",
32+
"@edugouvfr/ngx-dsfr-ext": "^1.4.3",
3233
"@fortawesome/angular-fontawesome": "0.15.0",
3334
"@fortawesome/fontawesome-svg-core": "^6.7.2",
3435
"@fortawesome/free-regular-svg-icons": "^6.7.2",

packages/portail-admins/src/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<dsfr-skiplinks [links]="skipLinks"></dsfr-skiplinks>
33
<header id="page-header" role="banner">
44
<nav
5-
class="navbar bg-white shadow-sm p-3 mb-5 rounded"
5+
class="navbar bg-white shadow-sm"
66
role="navigation"
77
aria-label="Navigation principale"
88
style="position: sticky; top: 0; z-index: 1000"

packages/portail-admins/src/app/modules/shared/components/table-head-sort/table-head-sort.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<button
22
type="button"
33
[ngClass]="sortKey === currentKey ? 'fw-bold text-primary' : ''"
4-
class="btn"
54
[attr.aria-sort]="sortKey === currentKey ? sortValue : null"
65
(click)="rotate()"
76
>

packages/portail-admins/src/assets/css/bootstrap-custom.scss

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -157,38 +157,13 @@ thead th {
157157
background-color: white !important;
158158
}
159159

160-
.dropdown-menu {
161-
padding: 0 !important;
162-
margin: 0;
163-
border-radius: 5px;
164-
background: #ffffff;
165-
border: 1px solid #ececec;
166-
}
167-
168160
.dropdown-item:hover {
169161
background-color: #9b9b9b !important;
170162
color: black;
171163
}
172164

173-
.dropdown-item {
174-
padding: 0.6rem 1rem;
175-
cursor: pointer;
176-
min-width: 200px;
177-
border-bottom: 1px solid #9b9b9b;
178-
}
179-
180-
.dropdown-item:not(:last-child) {
181-
border-bottom: 1px solid #cfcfd9;
182-
}
183-
184-
.dropdown-item:last-child {
185-
border: 0 !important;
186-
}
187-
188-
.dropdown-item .ng-fa-icon {
189-
width: 30px;
190-
display: inline-block;
191-
vertical-align: middle;
165+
.dropdown-item button {
166+
width: 100%;
192167
}
193168

194169
.text-sm {
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.fr-modal__content {
2+
text-wrap: stable;
3+
}

yarn.lock

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4294,7 +4294,8 @@ __metadata:
42944294
"@angular/platform-browser-dynamic": "npm:^18.2.13"
42954295
"@angular/router": "npm:^18.2.13"
42964296
"@domifa/common": "workspace:^"
4297-
"@edugouvfr/ngx-dsfr": "npm:^1.14.3"
4297+
"@edugouvfr/ngx-dsfr": "npm:^1.16.2"
4298+
"@edugouvfr/ngx-dsfr-ext": "npm:^1.4.3"
42984299
"@fortawesome/angular-fontawesome": "npm:0.15.0"
42994300
"@fortawesome/fontawesome-svg-core": "npm:^6.7.2"
43004301
"@fortawesome/free-regular-svg-icons": "npm:^6.7.2"
@@ -4427,7 +4428,32 @@ __metadata:
44274428
languageName: node
44284429
linkType: hard
44294430

4430-
"@edugouvfr/ngx-dsfr@npm:^1.14.3, @edugouvfr/ngx-dsfr@npm:^1.15.3":
4431+
"@edugouvfr/ngx-dsfr-ext@npm:^1.4.3":
4432+
version: 1.4.3
4433+
resolution: "@edugouvfr/ngx-dsfr-ext@npm:1.4.3"
4434+
dependencies:
4435+
tslib: "npm:^2.3.0"
4436+
peerDependencies:
4437+
"@angular/cdk": ">=18"
4438+
"@angular/common": ">=18.2"
4439+
"@angular/core": ">=18.2"
4440+
"@angular/forms": ">=18.2"
4441+
"@edugouvfr/ngx-dsfr": ">=1.15.0"
4442+
ag-grid-angular: ">=32"
4443+
ag-grid-community: ">=32"
4444+
quill: ">=2"
4445+
peerDependenciesMeta:
4446+
ag-grid-angular:
4447+
optional: true
4448+
ag-grid-community:
4449+
optional: true
4450+
quill:
4451+
optional: true
4452+
checksum: 10/23ab9744524399fdba3d24c1eb8d58c1cf30565706db41d56c7f0eae551896d27be872cf5add2f953dda423536946cfa8ac857a2d7b2ed0229750911a2e70e7e
4453+
languageName: node
4454+
linkType: hard
4455+
4456+
"@edugouvfr/ngx-dsfr@npm:^1.15.3":
44314457
version: 1.16.1
44324458
resolution: "@edugouvfr/ngx-dsfr@npm:1.16.1"
44334459
dependencies:
@@ -4444,6 +4470,23 @@ __metadata:
44444470
languageName: node
44454471
linkType: hard
44464472

4473+
"@edugouvfr/ngx-dsfr@npm:^1.16.2":
4474+
version: 1.16.2
4475+
resolution: "@edugouvfr/ngx-dsfr@npm:1.16.2"
4476+
dependencies:
4477+
"@gouvfr/dsfr": "npm:1.14.2"
4478+
tslib: "npm:^2.6.0"
4479+
peerDependencies:
4480+
"@angular/common": ">=18.2"
4481+
"@angular/core": ">=18.2"
4482+
"@angular/forms": ">=18.2"
4483+
args-parser: ">=1.3.0"
4484+
rxjs: ^6 || ^7
4485+
uuid: ">=8.3.0"
4486+
checksum: 10/441bf0a55fc6110ebcf1294ec544b471624c1d29929a6afc615106c5919857a05615359ce7addd1062bc2b9df4aa85e76f4a84859dcba4ed539c5e82501b2c80
4487+
languageName: node
4488+
linkType: hard
4489+
44474490
"@emnapi/core@npm:^1.1.0":
44484491
version: 1.3.1
44494492
resolution: "@emnapi/core@npm:1.3.1"

0 commit comments

Comments
 (0)