From 623728d3e394d80c280d1a38f4bf0fe64c87e7ed Mon Sep 17 00:00:00 2001 From: "clementine.desrucques" Date: Wed, 15 Dec 2021 11:54:20 +0100 Subject: [PATCH] Merge origin/master Conflicts: web/WEB-INF/feuilleGardes.jsp web/css/mycss.css --- web/WEB-INF/feuilleGardes.jsp | 4 ++-- web/css/mycss.css | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/web/WEB-INF/feuilleGardes.jsp b/web/WEB-INF/feuilleGardes.jsp index 5d8da88..16b7dcb 100644 --- a/web/WEB-INF/feuilleGardes.jsp +++ b/web/WEB-INF/feuilleGardes.jsp @@ -8,7 +8,7 @@ <%@include file= "jspf/header.jspf" %>
-
+
@@ -68,7 +68,7 @@ Dispo Indispo Au travail - De garde : X + De garde : ☑
diff --git a/web/css/mycss.css b/web/css/mycss.css index f42e963..d1b8650 100644 --- a/web/css/mycss.css +++ b/web/css/mycss.css @@ -103,8 +103,9 @@ select[readonly] { } .ztVentil { - width : 15px; - border-color: black; + height: 20px; + width : 18px; + border-color: black; }