diff --git a/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss b/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss index 0903809a1930387927e969572e343329cb048436..0a4a5eb628123dcd123cbbb566029e2ad5cc31d1 100644 --- a/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss +++ b/src/app/form/orientation-form-view/global-components/login-modal/login-modal.component.scss @@ -40,7 +40,7 @@ h3 { .fullWidth { width: 100% !important; } -::ng-deep .tertiary { +.contentModal ::ng-deep .tertiary { border-radius: 4px !important; width: 100% !important; } diff --git a/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss b/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss index 978b88ecd437a0c4e69da66668cd01677831e4cf..5617385e8bc29a6fab5e479964c244fd91ad485a 100644 --- a/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss +++ b/src/app/form/orientation-form-view/global-components/multi-radio-form/multi-radio-form.component.scss @@ -8,7 +8,7 @@ gap: 1rem; height: 85px; background-color: $grey-8; - border: none; + border: solid 3px transparent; font-size: 1rem; padding: 1.5rem 1rem; box-sizing: border-box; diff --git a/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss b/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss index 43eb14ed41b6b915737f83bd8e38e655d58c230a..a80630433180222ed7cd5d5f61375ce885d1893b 100644 --- a/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss +++ b/src/app/form/orientation-form-view/global-components/print-header/print-header.component.scss @@ -1,17 +1,25 @@ @import '../../../../../assets/scss/color'; +@import '../../../../../assets/scss/typography'; .header-infos { display: flex; align-items: flex-start; + h3 { + @include lato-bold-16; + margin-top: 0.25rem; + } img { margin-right: 3rem; width: 160px; } } .date { + @include lato-regular-13; text-align: right; text-transform: capitalize; font-style: italic; + margin-bottom: 0.5rem; + color: $grey-3; } hr { height: 1px; diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html b/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html index 3d93880322fcee12d2f25bb2e5ea910f486953eb..1323afbf34035aa72c9d53cbe418efaf8d83a0a0 100644 --- a/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html +++ b/src/app/form/orientation-form-view/online-demarch/mediation-beneciary-info/mediation-beneciary-info.component.html @@ -10,11 +10,18 @@ class="form-input" (input)="updatedForm('name', $event.target.value)" /> - <img - *ngIf="form.get('name').invalid && form.get('name').value" - src="../../assets/form/notValidate.svg" - alt="logo invalid" - /> + <app-svg-icon + *ngIf="form.get('name').valid" + [iconClass]="'validation'" + [type]="'form'" + [icon]="'validate'" + ></app-svg-icon> + <app-svg-icon + *ngIf="form.get('name').value && !form.get('name').valid" + [iconClass]="'validation'" + [type]="'form'" + [icon]="'notValidate'" + ></app-svg-icon> </div> </div> <div class="form-group" fxLayout="column"> @@ -27,11 +34,18 @@ class="form-input" (input)="updatedForm('surname', $event.target.value)" /> - <img - *ngIf="form.get('surname').invalid && form.get('surname').value" - src="../../assets/form/notValidate.svg" - alt="logo invalid" - /> + <app-svg-icon + *ngIf="form.get('surname').valid" + [iconClass]="'validation'" + [type]="'form'" + [icon]="'validate'" + ></app-svg-icon> + <app-svg-icon + *ngIf="form.get('surname').value && !form.get('surname').valid" + [iconClass]="'validation'" + [type]="'form'" + [icon]="'notValidate'" + ></app-svg-icon> </div> </div> <div class="form-group" fxLayout="column"> @@ -44,11 +58,18 @@ formControlName="phone" class="form-input" /> - <img - *ngIf="form.get('phone').invalid && form.get('phone').value" - src="../../assets/form/notValidate.svg" - alt="logo invalid" - /> + <app-svg-icon + *ngIf="form.get('phone').valid" + [iconClass]="'validation'" + [type]="'form'" + [icon]="'validate'" + ></app-svg-icon> + <app-svg-icon + *ngIf="form.get('phone').value && !form.get('phone').valid" + [iconClass]="'validation'" + [type]="'form'" + [icon]="'notValidate'" + ></app-svg-icon> </div> </div> </form> diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html index fdc6c9b756d66ceb1e499574e7a836cf1627b352..81622f83894c13ed6b801fc3a59562c0cbd90253 100644 --- a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html +++ b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.html @@ -1,6 +1,5 @@ <app-print-header></app-print-header> <div class="container"> - <!-- <div class="oriented" *ngIf="profile"><h3>Orienté par</h3></div> --> <div class="beneficiary"> <h3>Bénéficiaire</h3> <div class="content"> diff --git a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss index 0f1dc11764cf0ee25b4a3da786ef5037c28572cf..10d6572830c570298cd16a3cb21ea5ac3341f5b3 100644 --- a/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss +++ b/src/app/form/orientation-form-view/online-demarch/mediation-recap/mediation-recap.component.scss @@ -6,6 +6,9 @@ display: flex; gap: 1.5rem; padding: 1rem 0; + max-width: 680px; + width: 100%; + margin: auto; * { -webkit-print-color-adjust: exact; } @@ -47,13 +50,16 @@ } } .date { - max-width: 350px; + max-width: 680px; + width: 100%; + box-sizing: border-box; margin: 1rem auto 2rem auto; @include lato-bold-18; } .service-info { max-width: 680px; width: 100%; + box-sizing: border-box; border-radius: 24px; border: 1.5px solid $black; display: flex; diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss index 7674341394ace169c88d6b1e87826a2a40442ac7..bff7a90897f7774eacc4cb59833c06f848b6672b 100644 --- a/src/app/profile/edit/edit.component.scss +++ b/src/app/profile/edit/edit.component.scss @@ -120,6 +120,12 @@ } } } + .credentialsTab ::ng-deep .secondary { + width: 220px !important; + } + .credentialsTab ::ng-deep .secondary .text { + place-content: center center !important; + } .descriptionTab { p.descriptionLength { @@ -130,7 +136,9 @@ margin-top: 8px; } } - + .search-structure input { + width: 600px; + } .structureResults { position: absolute; width: 600px; diff --git a/src/app/profile/edit/edit.component.ts b/src/app/profile/edit/edit.component.ts index 925001c88c0929b86b3b80d33801c1aa9df0bdc1..9b64854b7e43c8ea0ceddc1770d332453d291e03 100644 --- a/src/app/profile/edit/edit.component.ts +++ b/src/app/profile/edit/edit.component.ts @@ -39,7 +39,7 @@ export class EditComponent implements OnInit { public initialUserProfile: User; private emailModal = false; private passwordModal = false; - private deleteAccountModal = false; + public deleteAccountModal = false; private newEmail = ''; private newEmailConfirm = ''; private oldPassword = ''; diff --git a/src/app/profile/structure-members-management/structure-members-management.component.html b/src/app/profile/structure-members-management/structure-members-management.component.html index 8d393238fe9bc97047791250b63e9bb4e556371d..471e74300703f029efb9bb4f22a06d02b2566dce 100644 --- a/src/app/profile/structure-members-management/structure-members-management.component.html +++ b/src/app/profile/structure-members-management/structure-members-management.component.html @@ -17,7 +17,7 @@ </div> </div> <div *ngIf="structureWithOwners && tempUsers"> - <div fxLayout="column" fxLayoutGap="8px" fxLayoutAlign="baseline baseline"> + <div fxLayout="column" fxLayoutGap="16px" fxLayoutAlign="baseline baseline"> <div *ngFor="let member of structureWithOwners.owners" class="member-card"> <div fxLayout="row" fxLayoutAlign="space-between center" fxFill> <div fxLayout="row" fxLayoutAlign="start center" class="user">