From 00b146f98ddfbc3d9a4946ac92bf784249466fa5 Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Mon, 10 Aug 2020 14:29:06 +0200
Subject: [PATCH] =?UTF-8?q?objectif=20et=20r=C3=A9sultat=20align=C3=A9s=20?=
 =?UTF-8?q?et=20centr=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/game.css   | 29 +++++++++++++++++++++++++++++
 code/game.html  | 22 +++++++++++++++-------
 code/vitraux.js |  4 ++++
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/code/game.css b/code/game.css
index ff0a560..a5cb9d7 100644
--- a/code/game.css
+++ b/code/game.css
@@ -82,4 +82,33 @@
   .back {
     position: absolute;
     bottom: 5px;
+  }
+
+  .bd {
+  
+    border-style: solid;
+    border-width: 5px;
+  }
+  .bd2 {
+    border-color: mediumblue;
+    border-style: solid;
+    border-width: 5px;
+  }
+
+  .child {
+    position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  }
+
+  .parent {
+    position: relative;
+  }
+
+  h1 {
+    margin-block-start: 0px;
+    margin-block-end: 0px;
+    margin-inline-start: 0px;
+    margin-inline-end: 0px;
   }
\ No newline at end of file
diff --git a/code/game.html b/code/game.html
index a4f6231..edf2d5d 100644
--- a/code/game.html
+++ b/code/game.html
@@ -10,20 +10,28 @@
     <img src="ress/light" id="light" class="lightButton" onClick="switchLight()"/>
     <ul id="all-container" class="all-container"> 
         
-        <ul class="stats">
-            <p id="temps"></p>
-            <span id="chronotime" class="stats">0:00:00</span>
-            <span id="timer" class="stats">0:00:00</span>
-            <p id="stats" class="stats"></p>
+        <ul class="vitraux stats">
+            <div id="obj_box" class="parent">
+                <h1 class="child" id="obj_text" >Objectif</h1>
+            </div>
+            
+            <div id="res_box" class="parent">
+                <h1 class="child" id="res_text" >R&eacute;sultat</h1>
+            </div>
+
+            
             
-            <h1>Objectif</h1>
             
-            <h1>R&eacute;sultat</h1>
         </ul>
 
         <ul id="obj-container" class="vitraux">
             <canvas id="canvasObj" class="vitrail-plein"></canvas>
             <canvas id="canvasTotal" class="vitrail-plein"></canvas>
+
+            <p id="temps"></p>
+            <span id="chronotime" class="stats">0:00:00</span>
+            <span id="timer" class="stats">0:00:00</span>
+            <p id="stats" class="stats"></p>
         </ul>
         <ul id="vitraux" class="vitraux">
             <canvas id="canvas1" class="vitrail-plein"></canvas>
diff --git a/code/vitraux.js b/code/vitraux.js
index d8a0b55..484c0c1 100644
--- a/code/vitraux.js
+++ b/code/vitraux.js
@@ -67,6 +67,10 @@ canvasT.height=size;
 canvasO.height=size;
 
 document.getElementById("btn_back").width=size;
+document.getElementById("obj_box").style.width=size+"px";
+document.getElementById("obj_box").style.height=size+"px";
+document.getElementById("res_box").style.width=size+"px";
+document.getElementById("res_box").style.height=size+"px";
 
 for(var a=1;a<5;a++)
 {