From 0d1d4385f9128f701d760b0f4ff4708782732cec Mon Sep 17 00:00:00 2001
From: "elliass.chelloug" <elliass.chelloug@sio211-08.sio.lan>
Date: Fri, 22 Oct 2021 12:38:08 +0200
Subject: [PATCH] Merge origin/master

Conflicts:
	src/java/bdd/PompierMysql.java
---
 web/WEB-INF/ModifProfilJSP.jsp | 3 +--
 web/css/newcss.css             | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/WEB-INF/ModifProfilJSP.jsp b/web/WEB-INF/ModifProfilJSP.jsp
index f97042b..4d2a0a0 100644
--- a/web/WEB-INF/ModifProfilJSP.jsp
+++ b/web/WEB-INF/ModifProfilJSP.jsp
@@ -32,6 +32,5 @@
                     <tr><th>Mail employeur : </th><td><input type="text" name="ztMailEmp"  size="20" maxlength="30"></td></tr>
                 </table>
             </fieldset>
-             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">
-             
+             <input type="button" name="button" onclick="window.location='http://localhost:8080/AP31-Projet1/Profil'" value="Valider les modification">           
 </html>
diff --git a/web/css/newcss.css b/web/css/newcss.css
index 40185a2..727fe88 100644
--- a/web/css/newcss.css
+++ b/web/css/newcss.css
@@ -9,7 +9,7 @@ and open the template in the editor.
 */
 body
 {
-    background-color: #e2e7e9;
+    background-color: #596b6e;
     background-repeat: repeat-x;
     margin:0% 0%;
     padding : 0.9em;