From e98534cd42b52556799ae0cc0c25c78bd762ab8a Mon Sep 17 00:00:00 2001
From: adplantade <adrien.plantade@etu.uca.fr>
Date: Fri, 7 Aug 2020 17:03:19 +0200
Subject: [PATCH] =?UTF-8?q?r=C3=A9-alignement=20des=20=C3=A9l=C3=A9ments?=
 =?UTF-8?q?=20de=20l'accueil=20+=20highscores?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/highscores.css   | 11 +++++++++++
 code/highscores.php   | 22 ++++++++++++----------
 code/index.css        | 18 ++++++++++++------
 code/index.php        | 40 +++++++++++++++++++++-------------------
 code/themeSwitcher.js |  7 ++++++-
 5 files changed, 62 insertions(+), 36 deletions(-)

diff --git a/code/highscores.css b/code/highscores.css
index a38e9dd..ded7e89 100644
--- a/code/highscores.css
+++ b/code/highscores.css
@@ -124,4 +124,15 @@ margin-right: auto;
 
 .slot {
   display: inline-block;
+}
+
+.texte {
+  font-size: medium;
+  font-family: 'Segoe print';
+}
+
+.texteG {
+  font-size: xx-large;
+  font-weight: bold;
+  font-family: 'Segoe print';
 }
\ No newline at end of file
diff --git a/code/highscores.php b/code/highscores.php
index 585a879..bfd717d 100644
--- a/code/highscores.php
+++ b/code/highscores.php
@@ -69,14 +69,14 @@
         
             <ul>
                 <div class="slot">
-                    <p>Mode pause activé : </p>
+                    <p class="texte">Mode pause activé : </p>
                     <input type="radio" id="pause1" value="1" name="pause">
-                    <label for="pause1">Oui</label>
+                    <label for="pause1" class="texte">Oui</label>
                     <input type="radio" id="pause0" value="0" name="pause">
-                    <label for="pause0">Non</label>         
+                    <label for="pause0" class="texte">Non</label>         
                 </div>
                 <div class="slot">   
-                    <p>Changer le nombre de points</p>
+                    <p class="texte">Changer le nombre de points</p>
                     <img src="ress/-" onClick="less()" id="-"/>
                     <span id="dotsNumber" class="texte"></span>
                     <img src="ress/+" onClick="more()" id="+"/>
@@ -89,11 +89,13 @@
         </div>
     </form>
 
-    <div>
-        Pseudo : <br/>
-            <input type="text" id="field_pseudo" /><br/>
-        <img id="btn_play" src="ress/button_play.png" onClick="play()"/>
-        <img id="btn_play_des" src="ress/button_play_desac.png"/>
+    <div class="mode-container">
+        <div class="texte">
+            Pseudo : 
+                <input type="text" id="field_pseudo" /><br/>
+            <img id="btn_play" src="ress/button_play.png" onClick="play()"/>
+            <img id="btn_play_des" src="ress/button_play_desac.png"/>
+        </div>
     </div>
     <img id="btn_back" src="ress/button_back.png" class="back" onClick="index()"/>
     <script src="bakery.js"></script>
@@ -131,7 +133,7 @@
 
     }
 
-        echo "<h1 id='aya'>".$phrase."</h1>";
+        echo "<h1 id='aya' class='texte' >".$phrase."</h1>";
     }
     ?>
     <script src="bakery.js"></script>
diff --git a/code/index.css b/code/index.css
index cbbc4d8..f553090 100644
--- a/code/index.css
+++ b/code/index.css
@@ -11,15 +11,17 @@
 }
 
 .bd {
-  /*
+  
   border-style: solid;
-  border-width: 5px;*/
+  border-width: 5px;
 }
-
-.ad { /*
+.bd2 {
+  border-color: mediumblue;
   border-style: solid;
   border-width: 5px;
-  border-color: red; */
+}
+
+.ad {
   width: min-content;
   margin-left: auto;
   margin-right: auto;
@@ -147,10 +149,14 @@
 
   .slot {
     display: inline-block;
-    border: 1px solid white;
   }
 
   .texte {
+    font-size: medium;
+    font-family: 'Segoe print';
+  }
+
+  .texteG {
     font-size: xx-large;
     font-weight: bold;
     font-family: 'Segoe print';
diff --git a/code/index.php b/code/index.php
index 0b7f1c9..25097ef 100644
--- a/code/index.php
+++ b/code/index.php
@@ -18,12 +18,12 @@
 
 
 <div id="modeSelection" class="mode-container">
-    <ul id="diff" class="all-container bd">
+    <ul id="diff" class="all-container">
         <img id="btn_easy" class="button" src="./ress/button_diff_easy.png"/>
         <img id="btn_med" class="button" src="./ress/button_diff_normal.png"/>
         <img id="btn_hard" class="button" src="./ress/button_diff_hard.png"/>
     </ul>
-    <ul id="modes" class="all-container bd">
+    <ul id="modes" class="all-container">
         <img id="btn_points" class="button" src="./ress/button_mode_points.png"/>
         <img id="btn_temps" class="button" src="./ress/button_mode_temps.png"/>
         <img id="btn_survie" class="button" src="./ress/button_mode_survie.png"/>
@@ -44,16 +44,17 @@
         <img id="45s" class="button z" src="./ress/button_survie_45.png"/> 
     </ul>
 </div>
-    
-<div class="ad">
-    Pseudo :
-    <input type="text" id="field_pseudo" />
+<div class="mode-container">
+    <div class="texte">
+        Pseudo :
+        <input type="text" id="field_pseudo" />
+    </div>
+    <ul id="btns_play">
+        <img id="btn_play" src="ress/button_play.png" onClick="play()"/>
+        <img id="btn_play_des" src="ress/button_play_desac.png"/>
+        <img id="btn_high" src="ress/button_highscores.png" onClick="goHigh()"/>
+    </ul>
 </div>
-<ul class="ad">
-    <img id="btn_play" src="ress/button_play.png" onClick="play()"/>
-    <img id="btn_play_des" src="ress/button_play_desac.png"/>
-    <img id="btn_high" src="ress/button_highscores.png" onClick="goHigh()"/>
-</ul>
 
 <!-- The Modal -->
 <div id="optionsModal" class="modal">
@@ -61,13 +62,13 @@
 <!-- Modal content -->
 <div class="modal-content" id="modal">
     <span class="close">&times;</span>
-    <p>Options :</p>
+    <p class="texte">Options :</p>
     <div class="slidecontainer">
-        <p>Changer le nombre de points</p>
+        <p class="texte">Changer le nombre de points</p>
         <img src="ress/-" onClick="less()" id="-"/>
-        <span id="dotsNumber" class="texte"></span>
+        <span id="dotsNumber" class="texteG"></span>
         <img src="ress/+" onClick="more()" id="+"/>
-        <p>
+        <p class="texte">
             Mode d'affichage :
         </p>
         <div id="displays">
@@ -75,17 +76,17 @@
             <img id="gems_di" src="ress/green.png" onClick="selectDisplay('gems')"/>
             <span id="both_di" class="dot both" onClick="selectDisplay('both')"></span>
         </div>
-        <p> 
+        <p class="texte"> 
             Mettre le jeu en pause après avoir gagné un point
         </p>
         <input type="radio" id="yes_pause" value="1" name="pause">
-        <label for="no_pause">Oui</label>
+        <label for="no_pause" class="texte">Oui</label>
         <input type="radio" id="no_pause" value="0" name="pause">
-        <label for="no_pause">Non</label>
+        <label for="no_pause" class="texte">Non</label>
 
         
         <div id="color_pickers" class="color-pickers">
-            <div> Choisir les couleurs des points<br/>
+            <div class="texte"> Choisir les couleurs des points<br/>
                 <span id="col1" class="dot col1 pickr"></span>
                 <span id="col2" class="dot col2 pickr"></span>
                 <span id="col3" class="dot col3 pickr"></span>
@@ -97,6 +98,7 @@
             </div>
         </div>
         <div id="gems_picker">
+            <div class="texte">Choisir les gemmes à afficher<br/></div>
             <img id="gem1" draggable="true" ondragstart="drag(event)"/>
             <img id="gem2" draggable="true" ondragstart="drag(event)"/>
             <img id="gem3" draggable="true" ondragstart="drag(event)"/>
diff --git a/code/themeSwitcher.js b/code/themeSwitcher.js
index 12f432d..33cc3e3 100644
--- a/code/themeSwitcher.js
+++ b/code/themeSwitcher.js
@@ -1,7 +1,12 @@
 var light= (getCookie("light")=="" ? true : getCookie("light"));
 
 document.getElementById("light").width=size/4;
-document.getElementById("logo").width=size*2;
+
+if(document.getElementById("logo")!=null)
+{
+    document.getElementById("logo").width=size*2;
+}
+
 
 function switchLight() {
     light=(light=="true" ? "false" : "true");