From 107127e0fc2f50857aa2e52cec21f5614b5919e8 Mon Sep 17 00:00:00 2001 From: Antonin Coquet <ext.sopra.acoquet@grandlyon.com> Date: Wed, 7 Apr 2021 15:08:41 +0200 Subject: [PATCH] some changes after MR review --- .../text-input-modal/text-input-modal.component.html | 2 +- .../text-input-modal/text-input-modal.component.scss | 7 ++++++- .../structure-details/structure-details.component.html | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/app/shared/components/text-input-modal/text-input-modal.component.html b/src/app/shared/components/text-input-modal/text-input-modal.component.html index 15f690ba6..1ba0fc04d 100644 --- a/src/app/shared/components/text-input-modal/text-input-modal.component.html +++ b/src/app/shared/components/text-input-modal/text-input-modal.component.html @@ -3,7 +3,7 @@ <div class="contentModal" fxLayout="column" fxLayoutAlign="space-around center"> <h3>ATTENTION</h3> <p>{{ content }}</p> - <textarea #myText id="story" class="textarea" name="story" rows="6">{{ placeholder }}</textarea> + <textarea #myText id="story" class="textarea" name="story" rows="6" placeholder="{{ placeholder }}"></textarea> <div class="footerModal" fxLayout="row" fxLayoutAlign="space-around center"> <button class="btn-primary small leave" (click)="closeModal(true, myText.value)">Confirmer</button> <button class="btn-primary small" (click)="closeModal(false, myText.value)">Annuler</button> diff --git a/src/app/shared/components/text-input-modal/text-input-modal.component.scss b/src/app/shared/components/text-input-modal/text-input-modal.component.scss index c1dd63805..91c7bbe39 100644 --- a/src/app/shared/components/text-input-modal/text-input-modal.component.scss +++ b/src/app/shared/components/text-input-modal/text-input-modal.component.scss @@ -47,6 +47,11 @@ } .textarea { + padding: 13px 8px; + background: $grey-6; + border: 1px solid $grey-4; + border-radius: 1px; + resize: none; width: 100%; - background-color: #f8f8f8; + @include cn-regular-16; } diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html index a4e2d0c4f..4f1daeeda 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.html +++ b/src/app/structure-list/components/structure-details/structure-details.component.html @@ -380,9 +380,9 @@ <app-text-input-modal [openned]="structureErrorModalOpenned" - [placeholder]="'Décrivez l\'erreur ici'" + [placeholder]="'Décrivez l\'erreur ici. Ex: Horaires faux...'" [content]=" - 'Voulez-vous notifier res\'in d\'une erreur sur la fiche de cet acteur ? Votre commentaire sera envoyé aux administrateurs.' + 'Voulez-vous notifier res\'in d\'une erreur sur la fiche de cet acteur ? Votre commentaire sera envoyé à l\'acteur en question ainsi qu\'aux administrateurs.' " (closed)="sendErrorEmail($event)" (newContent)="sendErrorEmail($event)" -- GitLab