Skip to content

Commit 622c844

Browse files
committed
Merge branch 'master' of github.com:Ecodev/my-ichtus
2 parents 5bb53a7 + 25e69c7 commit 622c844

33 files changed

Lines changed: 112 additions & 114 deletions

File tree

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ jobs:
2020
sudo apt-get update
2121
sudo apt-get install mariadb-client
2222
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424
with:
2525
fetch-depth: 2
2626

27-
- uses: pnpm/action-setup@v5
28-
- uses: actions/setup-node@v4
27+
- uses: pnpm/action-setup@v6
28+
- uses: actions/setup-node@v6
2929
with:
3030
node-version: '22'
3131
cache: 'pnpm'
@@ -37,7 +37,7 @@ jobs:
3737
tools: cs2pr
3838
extensions: imagick
3939

40-
- uses: actions/cache@v4
40+
- uses: actions/cache@v5
4141
with:
4242
path: ~/.cache/composer
4343
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

client/app/admin/accounts/accounts/accounts.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<div class="nat-vertical">
44
<div class="nat-horizontal">
55
<div class="nat-horizontal nat-wrap nat-expand nat-align">
6-
<div class="mat-font-headline-sm nat-margin-right" [routerLink]="getChildLink(null)">
6+
<h1 class="nat-margin-right" [routerLink]="getChildLink(null)">
77
{{ routeData?.seo.title }}
8-
</div>
8+
</h1>
99
@for (element of breadcrumbs; track element) {
1010
<div>
1111
/

client/app/admin/admin/admin.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ mat-accordion {
2222
);
2323
}
2424

25-
::ng-deep app-admin .mat-font-title-lg {
25+
::ng-deep app-admin h2 {
2626
margin-bottom: 0.3em;
2727
}

client/app/admin/bookableTags/bookableTags/bookableTags.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@if (dataSource) {
22
<div class="nat-vertical">
33
<div class="nat-horizontal">
4-
<div class="mat-font-headline-sm nat-expand">
4+
<h1 class="nat-expand">
55
{{ routeData?.seo.title }}
6-
</div>
6+
</h1>
77
<natural-columns-picker
88
[availableColumns]="availableColumns"
99
[selections]="selectedColumns"

client/app/admin/bookables/bookable/bookable.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
</div>
9696

9797
<div class="nat-md-expand-33 nat-vertical">
98-
<h2 class="mat-font-title-lg">Réservation</h2>
98+
<h2>Réservation</h2>
9999
<natural-select-enum
100100
enumName="BookableStatus"
101101
formControlName="status"
@@ -204,7 +204,7 @@ <h2 class="mat-font-title-lg">Réservation</h2>
204204
<div class="nat-md-expand-66 nat-vertical">
205205
@if (isUpdatePage() && isSelfApproved()) {
206206
<div>
207-
<h2 class="mat-font-title-lg">Certifications</h2>
207+
<h2>Certifications</h2>
208208
<natural-relations
209209
placeholder="Associer à une certification"
210210
[main]="data.model"
@@ -228,7 +228,7 @@ <h2 class="mat-font-title-lg">Certifications</h2>
228228
<div class="nat-md-expand-33 nat-vertical">
229229
@if (isUpdatePage()) {
230230
<div>
231-
<h2 class="mat-font-title-lg">Tags</h2>
231+
<h2>Tags</h2>
232232
<natural-relations
233233
placeholder="Ajouter un tag"
234234
[main]="data.model"

client/app/admin/bookables/bookables/bookables.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
@if (dataSource) {
77
<div class="nat-vertical">
88
<div class="nat-horizontal">
9-
<div class="mat-font-headline-sm nat-expand">
9+
<h1 class="nat-expand">
1010
{{ routeData?.seo.title }}
11-
</div>
11+
</h1>
1212
<natural-columns-picker
1313
[class.nat-hide]="!(route.snapshot.data.showColumnPicker ?? true)"
1414
[availableColumns]="availableColumns"

client/app/admin/bookings/booking/booking.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
}
127127
</div>
128128

129-
<h2 class="mat-font-title-lg">Commentaires</h2>
129+
<h2>Commentaires</h2>
130130
<mat-form-field>
131131
<mat-label>Remarques</mat-label>
132132
<textarea
@@ -158,7 +158,7 @@ <h2 class="mat-font-title-lg">Commentaires</h2>
158158
) {
159159
<div>
160160
<mat-divider class="nat-margin-bottom" />
161-
<div class="mat-font-title-lg">Attribuer un stockage / service</div>
161+
<h2>Attribuer un stockage / service</h2>
162162
<app-usage-bookables
163163
[availableColumns]="availableColumns"
164164
[persistSearch]="false"
@@ -172,7 +172,7 @@ <h2 class="mat-font-title-lg">Commentaires</h2>
172172
@if (isSelfApproved()) {
173173
<div>
174174
<mat-divider class="nat-margin-vertical" />
175-
<h1 class="mat-font-title-lg">Sorties</h1>
175+
<h2>Sorties</h2>
176176
<mat-form-field style="width: 100px">
177177
<mat-label>Nb participants</mat-label>
178178
<input
@@ -187,7 +187,7 @@ <h1 class="mat-font-title-lg">Sorties</h1>
187187
<div class="nat-vertical nat-md-horizontal nat-gap-horizontal">
188188
<div class="nat-expand nat-vertical">
189189
<div class="nat-horizontal nat-margin-bottom nat-gap-10 nat-align">
190-
<h2 class="mat-font-title-lg">Début</h2>
190+
<h2>Début</h2>
191191
<div>{{ data.model.startDate | date }}</div>
192192
</div>
193193
<mat-form-field>
@@ -208,7 +208,7 @@ <h2 class="mat-font-title-lg">Début</h2>
208208
</div>
209209
<div class="nat-expand nat-vertical">
210210
<div class="nat-horizontal nat-margin-bottom nat-gap-10 nat-align">
211-
<h2 class="mat-font-title-lg">Fin</h2>
211+
<h2>Fin</h2>
212212
<div class="nat-expand">{{ data.model.endDate | date }}</div>
213213
</div>
214214
<mat-form-field>

client/app/admin/bookings/bookings/bookings.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
@if (dataSource) {
33
<div class="nat-vertical">
44
<div class="nat-horizontal">
5-
<div class="mat-font-headline-sm nat-expand">
5+
<h1 class="nat-expand">
66
{{ routeData?.seo.title }}
7-
</div>
7+
</h1>
88
<natural-columns-picker
99
[availableColumns]="availableColumns"
1010
[selections]="selectedColumns"

client/app/admin/expenseClaim/expenseClaim/expenseClaim.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162

163163
<mat-divider />
164164

165-
<h2 class="mat-font-title-lg">Commentaires</h2>
165+
<h2>Commentaires</h2>
166166

167167
<div class="nat-vertical nat-md-horizontal nat-gap-horizontal">
168168
<div class="nat-expand nat-vertical">
@@ -196,7 +196,7 @@ <h2 class="mat-font-title-lg">Commentaires</h2>
196196
<mat-divider />
197197

198198
<div>
199-
<div class="mat-font-title-lg">Pièces justificatives</div>
199+
<h2>Pièces justificatives</h2>
200200
<div class="nat-horizontal nat-gap-10">
201201
@for (file of data.model.accountingDocuments; track file.id) {
202202
<natural-file action="download" [model]="file" [height]="150" [style.width.px]="200" />

client/app/admin/expenseClaim/expenseClaims/expenseClaims.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@if (dataSource) {
22
<div class="nat-vertical">
33
<div class="nat-horizontal">
4-
<div class="mat-font-headline-sm nat-expand">
4+
<h1 class="nat-expand">
55
{{ routeData?.seo.title }}
6-
</div>
6+
</h1>
77
<natural-columns-picker
88
[availableColumns]="availableColumns"
99
[selections]="selectedColumns"

0 commit comments

Comments
 (0)