compteur 4x4 plus factorisation de certaines fonctions

5 years ago · 83e51ab07f
parent 76034be507
commit 83e51ab07f
4 changed files with 1796 additions and 6719 deletions
--- a/HyperSet/.idea/workspace.xml
+++ b/HyperSet/.idea/workspace.xml
@ -113,7 +113,10 @@
      <workItem from="1594028438581" duration="7116000" />
      <workItem from="1594119719356" duration="4593000" />
      <workItem from="1594203137801" duration="9246000" />
-      <workItem from="1594293015930" duration="6434000" />
+      <workItem from="1594293015930" duration="6902000" />
+      <workItem from="1594380519697" duration="13036000" />
+      <workItem from="1594636024584" duration="12177000" />
+      <workItem from="1594657007348" duration="996000" />
    </task>
    <servers />
  </component>
--- a/HyperSet/vues/css/style.css
+++ b/HyperSet/vues/css/style.css
@ -32,9 +32,8 @@ h1 {

 .card {
 	display: table-cell;
-	width: 200px;
-
-	height: 140px;
+	width: 170px;
+	height: 120px;
 	border: 2px solid #ccc;
 	background: #F5F5F5;
 }
@ -54,10 +53,17 @@ h1 {
 	transform: rotate(90deg);

 }
+.game-board2 {
+	margin-top: -2%;
+	margin-left: 30%;
+	height: 800px;
+	width: 780px;
+	transform: rotate(90deg);

+}
 .game-board {
 	margin-top: -5%;
-	margin-left: 22%;
+	margin-left: 19%;
 	height: 700px;
 	width: 600px;
 	transform: rotate(90deg);
@ -74,21 +80,27 @@ h1 {
 	margin-top: -4%;
 	height: 800px;
 	width: 700px;
-	margin-left: 40%;
+	margin-left: 30%;
 	transform: rotate(90deg);
 }

+.game-boardHS0 {
+	margin-top: 20.1%;
+	height: auto;
+	width: auto;
+	transform: rotate(90deg);
+}

 .game-boardHS {
-	margin-top: -5%;
-	margin-left: 40%;
+	margin-top: -1%;
+	margin-left: 35%;
 	height: 800px;
 	width: 800px;
 	transform: rotate(90deg);
 }
 .game-boardHS1 {
 	margin-top: -4.5%;
-	margin-left: 50%;
+	margin-left: 41%;
 	height: 800px;
 	width: 800px;
 	transform: rotate(90deg);
--- a/HyperSet/vues/homePage.html
+++ b/HyperSet/vues/homePage.html
@ -11,16 +11,20 @@

 <body>

-<H1 class="colortext" >HyperSet</H1>


-
-<div class="play-btn" id="home">
-    <img class="playsmall-btn" id="playBtn" src="vues/images/play.png" onclick=" showModeGames()" style="display: block;">
+<div id="home">
+    <H1 class="colortext" >HyperSet</H1>
+    <div class="play-btn" >
+        <img class="playsmall-btn" id="playBtn" src="vues/images/play.png" onclick=" showModeGames()" style="display: block;">
+    </div>
 </div>


+
+
 <div id="selectMode" class="select-mode-div divs" style="display: none;">
+    <H1 class="colortext" >HyperSet</H1>
    <h2 class="mode-title disable-select text" id="selectGames">Modes de jeu </h2>
    <div class=" back-btn small-btn">
        <img class="small-btn" id="previousBtns" onclick="goHome()" src="vues/images/previous.png">
@ -35,6 +39,7 @@


 <div id="selectModeSet" class="select-mode-div divs" style="display: none;">
+    <H1 class="colortext" >HyperSet</H1>
    <h2 class="mode-title disable-select text" id="selectGame">Modes de jeu </h2>
    <div class=" back-btn small-btn">
        <img class="small-btn" id="previousBtn" onclick="goSelect()" src="vues/images/previous.png">
@ -118,7 +123,7 @@
    <p>Sets found:  <span data-display="score2" class="score">0</span></p>
    <p>Number of Sets:  <span data-display="nbSets2" class="nbSets"></span></p>

-    <div class="game-board1" data-display="game-board2"></div>
+    <div class="game-board2" data-display="game-board2"></div>
 </div>
 <div id='game3' class="wrapper" style="display: none;">
    <h1>Set 4x5</h1>
@ -174,7 +179,7 @@
    <p>HyperSets found:  <span data-display="scoreHS0" class="score">0</span></p>
    <p>Number of HyperSets:  <span data-display="nbSetsHS0" class="nbSets"></span></p>

-    <div class="game-board" data-display="game-boardHS0"></div>
+    <div class="game-boardHS0" data-display="game-boardHS0"></div>
 </div>
 <div id='gameHS1' class="wrapper" style="display: none;">
    <h1>HyperSet 3x5 </h1>
--- a/HyperSet/vues/js/set.js
+++ b/HyperSet/vues/js/set.js