From b421f52902c3d98ef34a54a1b361b045fff0420e Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Wed, 28 Feb 2024 10:42:22 +0100
Subject: [PATCH 01/11] fix(edit-password): stop new password field from being
bigger when nothing is entered
---
src/app/profile/edit/edit.component.scss | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index ef12dc1a7..d02c2fb70 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -166,8 +166,14 @@ p {
display: flex;
flex-direction: column;
align-items: center;
+ width: 100%;
app-input {
width: 300px;
}
+ .modal-form-group {
+ gap: 1rem;
+ width: 100%;
+ max-width: 300px;
+ }
}
--
GitLab
From b47b734773c6df636f018afeca7e0c7f6726c8cd Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Wed, 28 Feb 2024 13:50:18 +0100
Subject: [PATCH 02/11] fix: password edit modal gap like in the figma
---
src/app/profile/edit/edit.component.html | 3 +++
src/app/profile/edit/edit.component.scss | 11 ++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index 48dcb3f8c..a7b5e7454 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -244,6 +244,7 @@
[statusText]="getOldPasswordStatusText(getPasswordStatus(oldPassword))"
[type]="'password'"
[(value)]="oldPassword"
+ [wide]="true"
/>
</div>
<div class="modal-form-group">
@@ -254,6 +255,7 @@
[statusText]="getPasswordStatusText(getPasswordStatus(newPassword))"
[type]="'password'"
[(value)]="newPassword"
+ [wide]="true"
/>
</div>
<div class="modal-form-group">
@@ -265,6 +267,7 @@
[statusText]="getNewPasswordStatusText(getPasswordStatus(newPasswordConfirm, newPassword))"
[type]="'password'"
[(value)]="newPasswordConfirm"
+ [wide]="true"
/>
</div>
</div>
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index d02c2fb70..fa64056bf 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -168,12 +168,13 @@ p {
align-items: center;
width: 100%;
- app-input {
- width: 300px;
- }
.modal-form-group {
- gap: 1rem;
+ gap: 16px;
width: 100%;
- max-width: 300px;
+ margin-bottom: 20px;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
}
}
--
GitLab
From c6d0b1711836ae400b5ad3a91be1258faedd0ee9 Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Fri, 1 Mar 2024 09:17:43 +0100
Subject: [PATCH 03/11] fix: visual bug with odd number of checkboxes for
labels
---
.../structure-labels/structure-labels.component.scss | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss
index 899cd5963..9db23fe51 100644
--- a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss
+++ b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss
@@ -2,9 +2,10 @@
gap: 16px;
display: flex;
flex-wrap: wrap;
+ justify-content: flex-start;
app-checkbox-form {
- flex-grow: 1;
- flex-basis: 0;
+ flex-grow: 0;
+ flex-basis: calc(50% - 8px);
}
}
--
GitLab
From bedef48461be69211fed65f3a9963ed0da539001 Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Mon, 4 Mar 2024 09:59:03 +0100
Subject: [PATCH 04/11] fix: order of property and two-way bindings
---
src/app/profile/edit/edit.component.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index a7b5e7454..fc7aeaacb 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -243,8 +243,8 @@
[status]="getPasswordStatus(oldPassword)"
[statusText]="getOldPasswordStatusText(getPasswordStatus(oldPassword))"
[type]="'password'"
- [(value)]="oldPassword"
[wide]="true"
+ [(value)]="oldPassword"
/>
</div>
<div class="modal-form-group">
@@ -254,8 +254,8 @@
[status]="getPasswordStatus(newPassword)"
[statusText]="getPasswordStatusText(getPasswordStatus(newPassword))"
[type]="'password'"
- [(value)]="newPassword"
[wide]="true"
+ [(value)]="newPassword"
/>
</div>
<div class="modal-form-group">
@@ -266,8 +266,8 @@
[status]="getPasswordStatus(newPasswordConfirm, newPassword)"
[statusText]="getNewPasswordStatusText(getPasswordStatus(newPasswordConfirm, newPassword))"
[type]="'password'"
- [(value)]="newPasswordConfirm"
[wide]="true"
+ [(value)]="newPasswordConfirm"
/>
</div>
</div>
--
GitLab
From 4d84805494b87c6733598be7361ea14f1afd39bc Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Mon, 4 Mar 2024 10:31:13 +0100
Subject: [PATCH 05/11] fix(styles): modified modal width to be 400px including
padding (to match the figma)
---
src/app/shared/components/modal/modal.component.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/shared/components/modal/modal.component.scss b/src/app/shared/components/modal/modal.component.scss
index 4f00e6cdc..bae1cdb00 100644
--- a/src/app/shared/components/modal/modal.component.scss
+++ b/src/app/shared/components/modal/modal.component.scss
@@ -13,7 +13,7 @@
background-color: $modal-background;
.modal {
display: flex;
- width: 400px;
+ width: 360px;
max-height: 90%;
padding: 20px;
flex-direction: column;
--
GitLab
From 398853cf75dfd6912109d6f00b160c5bfae1847f Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Mon, 4 Mar 2024 10:58:31 +0100
Subject: [PATCH 06/11] fix(styles): use of gap instead of margin bottom on the
last element
---
src/app/profile/edit/edit.component.html | 9 ++++++++-
src/app/profile/edit/edit.component.scss | 7 +------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index fc7aeaacb..028ea84ca 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -216,12 +216,19 @@
(closed)="$event ? confirm() : closeModal()"
>
<div class="modal-content">
- <app-input [label]="'Nouvel email'" [size]="'large'" [status]="getEmailStatus(newEmail)" [(value)]="newEmail" />
+ <app-input
+ [label]="'Nouvel email'"
+ [size]="'large'"
+ [status]="getEmailStatus(newEmail)"
+ [wide]="true"
+ [(value)]="newEmail"
+ />
<app-input
[label]="'Confirmer le nouvel email'"
[size]="'large'"
[status]="getEmailStatus(newEmailConfirm)"
[statusText]="getEmailStatusText()"
+ [wide]="true"
[(value)]="newEmailConfirm"
/>
</div>
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index fa64056bf..6f9e987ee 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -167,14 +167,9 @@ p {
flex-direction: column;
align-items: center;
width: 100%;
+ gap: 16px;
.modal-form-group {
- gap: 16px;
width: 100%;
- margin-bottom: 20px;
-
- &:last-child {
- margin-bottom: 0;
- }
}
}
--
GitLab
From 2fe0338d450b948803af976e5b3d3e3f5a0e463a Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Mon, 4 Mar 2024 11:41:08 +0100
Subject: [PATCH 07/11] fix(styles): width of inputs in the edit email modal
---
src/app/profile/edit/edit.component.scss | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index 6f9e987ee..98199c1ea 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -165,7 +165,6 @@ p {
.modal-content {
display: flex;
flex-direction: column;
- align-items: center;
width: 100%;
gap: 16px;
--
GitLab
From 28f93ac6d682b76db159ab1ca487901c2a2a4978 Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Mon, 4 Mar 2024 13:26:37 +0100
Subject: [PATCH 08/11] fix(styles): made input for password in account
deletion modal wide.
---
src/app/profile/edit/edit.component.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index 028ea84ca..bfd248d3e 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -299,6 +299,7 @@
[label]="'Mot de passe'"
[type]="'password'"
[size]="'large'"
+ [wide]="true"
[(value)]="oldPassword"
/>
</div>
--
GitLab
From 960630a8fcd083ecd0684202fda3d861b1abc8cc Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Thu, 7 Mar 2024 10:21:40 +0100
Subject: [PATCH 09/11] fix(styles): remove useless styles from modal-content
css class
---
src/app/profile/edit/edit.component.scss | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/app/profile/edit/edit.component.scss b/src/app/profile/edit/edit.component.scss
index 98199c1ea..a3c1bd35e 100644
--- a/src/app/profile/edit/edit.component.scss
+++ b/src/app/profile/edit/edit.component.scss
@@ -165,10 +165,5 @@ p {
.modal-content {
display: flex;
flex-direction: column;
- width: 100%;
gap: 16px;
-
- .modal-form-group {
- width: 100%;
- }
}
--
GitLab
From 372e1151fef9f459daafb26b23559824cd545662 Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Thu, 7 Mar 2024 10:56:44 +0100
Subject: [PATCH 10/11] fix: remove modal-form-group class from html
---
src/app/profile/edit/edit.component.html | 64 +++++++++++-------------
1 file changed, 29 insertions(+), 35 deletions(-)
diff --git a/src/app/profile/edit/edit.component.html b/src/app/profile/edit/edit.component.html
index bfd248d3e..84e666e86 100644
--- a/src/app/profile/edit/edit.component.html
+++ b/src/app/profile/edit/edit.component.html
@@ -242,41 +242,35 @@
(closed)="$event ? confirm() : closeModal()"
>
<div class="modal-content">
- <div class="modal-form-group">
- <app-input
- [label]="'Ancien mot de passe'"
- [size]="'large'"
- [autocomplete]="'on'"
- [status]="getPasswordStatus(oldPassword)"
- [statusText]="getOldPasswordStatusText(getPasswordStatus(oldPassword))"
- [type]="'password'"
- [wide]="true"
- [(value)]="oldPassword"
- />
- </div>
- <div class="modal-form-group">
- <app-input
- [label]="'Nouveau mot de passe'"
- [size]="'large'"
- [status]="getPasswordStatus(newPassword)"
- [statusText]="getPasswordStatusText(getPasswordStatus(newPassword))"
- [type]="'password'"
- [wide]="true"
- [(value)]="newPassword"
- />
- </div>
- <div class="modal-form-group">
- <app-input
- [label]="'Confirmer le nouveau mot de passe'"
- [size]="'large'"
- [autocomplete]="'on'"
- [status]="getPasswordStatus(newPasswordConfirm, newPassword)"
- [statusText]="getNewPasswordStatusText(getPasswordStatus(newPasswordConfirm, newPassword))"
- [type]="'password'"
- [wide]="true"
- [(value)]="newPasswordConfirm"
- />
- </div>
+ <app-input
+ [label]="'Ancien mot de passe'"
+ [size]="'large'"
+ [autocomplete]="'on'"
+ [status]="getPasswordStatus(oldPassword)"
+ [statusText]="getOldPasswordStatusText(getPasswordStatus(oldPassword))"
+ [type]="'password'"
+ [wide]="true"
+ [(value)]="oldPassword"
+ />
+ <app-input
+ [label]="'Nouveau mot de passe'"
+ [size]="'large'"
+ [status]="getPasswordStatus(newPassword)"
+ [statusText]="getPasswordStatusText(getPasswordStatus(newPassword))"
+ [type]="'password'"
+ [wide]="true"
+ [(value)]="newPassword"
+ />
+ <app-input
+ [label]="'Confirmer le nouveau mot de passe'"
+ [size]="'large'"
+ [autocomplete]="'on'"
+ [status]="getPasswordStatus(newPasswordConfirm, newPassword)"
+ [statusText]="getNewPasswordStatusText(getPasswordStatus(newPasswordConfirm, newPassword))"
+ [type]="'password'"
+ [wide]="true"
+ [(value)]="newPasswordConfirm"
+ />
</div>
</app-modal>
--
GitLab
From f43f5d18749c8537496991cb35076262bc862202 Mon Sep 17 00:00:00 2001
From: mponton <mponton@grandlyon.com>
Date: Thu, 7 Mar 2024 11:35:54 +0100
Subject: [PATCH 11/11] fix: revert label history back
---
.../structure-labels/structure-labels.component.scss | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss
index 9db23fe51..899cd5963 100644
--- a/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss
+++ b/src/app/form/form-view/structure-form/structure-labels/structure-labels.component.scss
@@ -2,10 +2,9 @@
gap: 16px;
display: flex;
flex-wrap: wrap;
- justify-content: flex-start;
app-checkbox-form {
- flex-grow: 0;
- flex-basis: calc(50% - 8px);
+ flex-grow: 1;
+ flex-basis: 0;
}
}
--
GitLab