Merge origin/master

Conflicts: src/java/bdd/gardeMySQL.java src/java/servlet/PompierServlet.java web/WEB-INF/feuilleGardes.jsp
2021-12-13 15:42:14 +01:00
parent b4da29af06
commit 80aa3ed6ea
3 changed files with 16 additions and 92 deletions
--- a/web/css/mycss.css
+++ b/web/css/mycss.css
@@ -18,7 +18,7 @@ body {
 }
 fieldset {
    border-radius: 5px;
-    padding: 5px;
+    padding: 2px;
    border: 1px solid #DB0005;
    width: 100%;
 }
@@ -105,7 +105,7 @@ select[readonly] {
 .ztVentil {
    width : 40%;
    border: 3px solid;   
-    
+
 }

 .ztVentil:hover {