From cbbcc4ec37aca3092e49fb5034c5a32161ae8c39 Mon Sep 17 00:00:00 2001 From: MDevoldere <10086604+mdevoldere@users.noreply.github.com> Date: Tue, 14 Apr 2026 11:42:19 +0200 Subject: [PATCH 1/3] Traduction formulaire achat (#22) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * issue damien * Traduction Détails Traduction du champ Détails de l'article en anglais * traduction de la partie demandeur C'est fait patron 👍 * Changements des couleurs * changement fait * modification * traduction du footer * suppression de setting.json * correction done * Update purchases.css * Traduction du titre * Update purchases.css * Update index.html * Update legend text for request justification --------- Co-authored-by: D-Barbier <83605905+D-Barbier@users.noreply.github.com> Co-authored-by: Thibaud Clairet <166002489+Moutonmalpoli@users.noreply.github.com> Co-authored-by: Caroline BIEHLER <70326049+Caroline1609@users.noreply.github.com> Co-authored-by: darkb Co-authored-by: Bruno51-G <185206289+Bruno51-G@users.noreply.github.com> Co-authored-by: AresChris <148880863+AresChris@users.noreply.github.com> Co-authored-by: darkb1967 <106076147+darkb1967@users.noreply.github.com> --- docs/css/purchases.css | 8 +++--- docs/index.html | 56 +++++++++++++++++++++--------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/docs/css/purchases.css b/docs/css/purchases.css index 8e18537..b7753e5 100644 --- a/docs/css/purchases.css +++ b/docs/css/purchases.css @@ -10,12 +10,12 @@ PURCHASES CSS :root { --light: white; --dark: black; - --crm-primary: #1b296a; /* Obligatoire */ - --crm-secondary: #ed6840; /* Obligatoire */ - --crm-ofp: #7db9da; + --crm-primary: #777777; /* #1b296a; /* Obligatoire */ + --crm-secondary: #ecd0ea; /* #ed6840; /* Obligatoire */ + --crm-ofp: #8dc5ca; --crm-alert: #cf2d4f; --crm-warning: #f6af2e; - --crm-success: #488287; + --crm-success: #8dc5ca;/* #488287; /* */ --border-radius: .5rem; } diff --git a/docs/index.html b/docs/index.html index 2275667..9c70467 100644 --- a/docs/index.html +++ b/docs/index.html @@ -9,7 +9,7 @@
-

Page de Demande de matériel

+

Material request page

Logo de l'entreprise
@@ -18,66 +18,66 @@

Page de Demande de matériel

- Demandeur + Requester
- - + +
- - + +
- - + +
- Détails de l'article + Item details
- - + +
- - + +
- +
- +
- +
- Justification de la demande + Request justification
- - + +
Validation - - + +
@@ -87,9 +87,9 @@

Page de Demande de matériel

From 72b32abaf905c2a7e28c24dae842ab2843ed7baf Mon Sep 17 00:00:00 2001 From: Hulya03 <185206443+Hulya03@users.noreply.github.com> Date: Tue, 14 Apr 2026 14:44:29 +0200 Subject: [PATCH 2/3] modifications des couleurs passage a des tons pastels --- .vscode/settings.json | 3 +++ docs/css/purchases.css | 16 ++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..6f3a291 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "liveServer.settings.port": 5501 +} \ No newline at end of file diff --git a/docs/css/purchases.css b/docs/css/purchases.css index b7753e5..eefd142 100644 --- a/docs/css/purchases.css +++ b/docs/css/purchases.css @@ -9,13 +9,13 @@ PURCHASES CSS :root { --light: white; - --dark: black; - --crm-primary: #777777; /* #1b296a; /* Obligatoire */ - --crm-secondary: #ecd0ea; /* #ed6840; /* Obligatoire */ - --crm-ofp: #8dc5ca; - --crm-alert: #cf2d4f; - --crm-warning: #f6af2e; - --crm-success: #8dc5ca;/* #488287; /* */ + --dark: #2d3436; + --crm-primary: #3d576e; + --crm-secondary:#FFC8DD; + --crm-ofp:#BDE0FE; + --crm-alert: #FFADAD; + --crm-warning: #FFD6A5; + --crm-success: #CAFFBF; --border-radius: .5rem; } @@ -119,7 +119,7 @@ button:hover { .info h2 { background-color: var(--crm-ofp); - color: var(--crm-secondary); + color: var(--crm-primary); padding: 1rem; text-align: center; border-radius: var(--border-radius); From d007ff6890e6b985ba30a006a2b3e2596033462c Mon Sep 17 00:00:00 2001 From: Hulya03 <185206443+Hulya03@users.noreply.github.com> Date: Wed, 15 Apr 2026 16:09:47 +0200 Subject: [PATCH 3/3] ajout settings.json dans .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index dfcfd56..17fd170 100644 --- a/.gitignore +++ b/.gitignore @@ -348,3 +348,6 @@ MigrationBackup/ # Ionide (cross platform F# VS Code tools) working folder .ionide/ + +# settings.json can contain sensitive information, so it is recommended to ignore it +settings.json \ No newline at end of file