uap35-d/sdisM2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	web/WEB-INF/feuilleGardes.jsp
	web/css/mycss.css
This commit is contained in:
clementine.desrucques 2021-12-15 11:54:20 +01:00
parent ad612c663c
commit 623728d3e3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/WEB-INF/feuilleGardes.jsp
View File

@ -8,7 +8,7 @@
<body> <body>
<%@include file= "jspf/header.jspf" %> <%@include file= "jspf/header.jspf" %>
<div class="container"> <div class="container">
<section id="contenueAffiche" class="row"> <section id="contenuAffiche" class="row">
@ -68,7 +68,7 @@
<span style="background-color: white">Dispo</span> <span style="background-color: white">Dispo</span>
<span style="background-color: gray">Indispo</span> <span style="background-color: gray">Indispo</span>
<span style="background-color: yellow">Au travail</span> <span style="background-color: yellow">Au travail</span>
<span>De garde : X</span> <span>De garde : ☑</span>
</div> </div>
<div class="text-center"> <div class="text-center">

5
web/css/mycss.css
View File

@ -103,8 +103,9 @@ select[readonly] {
} }
.ztVentil { .ztVentil {
width : 15px; height: 20px;
border-color: black; width : 18px;
border-color: black;
} }