pascal.lafourcade
/
hyper-set-reda
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

correction de certains bugs

Browse Source
master
readhame 5 years ago
parent 2dc6edea79
commit 792ffc89a0
3 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File

5
HyperSet/.idea/workspace.xml
Unescape View File

@ -152,6 +152,7 @@
<workItem from="1596633214872" duration="5306000" /> <workItem from="1596633214872" duration="5306000" />
<workItem from="1596716243223" duration="10884000" /> <workItem from="1596716243223" duration="10884000" />
<workItem from="1596803111498" duration="11459000" /> <workItem from="1596803111498" duration="11459000" />
<workItem from="1597254981060" duration="1629000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -195,10 +196,10 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state width="623" height="498" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1595243925469" /> <state width="623" height="498" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1595243925469" />
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1596718186926"> <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1597255003757">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1596718186925" /> <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1597255003757" />
<state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720"> <state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>

27
HyperSet/vues/css/style.css
Unescape View File

@ -53,8 +53,7 @@ h1 {
height: auto; height: auto;
width: auto; width: auto;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-board3 { .game-board3 {
@ -62,6 +61,7 @@ h1 {
margin-left: -15%; margin-left: -15%;
height: 1000px; height: 1000px;
width: 1700px; width: 1700px;
position: center;
} }
@ -72,6 +72,7 @@ h1 {
margin-left: -25%; margin-left: -25%;
height: 1000px; height: 1000px;
width: 1700px; width: 1700px;
position: center;
} }
@ -84,8 +85,7 @@ h1 {
height: 800px; height: 800px;
width: 780px; width: 780px;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-board { .game-board {
margin-top: -3%; margin-top: -3%;
@ -93,8 +93,7 @@ h1 {
height: 700px; height: 700px;
width: 600px; width: 600px;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-board0 { .game-board0 {
margin-top: 5%; margin-top: 5%;
@ -102,7 +101,8 @@ h1 {
height: 595px; height: 595px;
width: 600px; width: 600px;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-board1 { .game-board1 {
@ -111,7 +111,7 @@ h1 {
width: 700px; width: 700px;
margin-left: 25%; margin-left: 25%;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-boardHS0 { .game-boardHS0 {
@ -120,7 +120,8 @@ h1 {
height: auto; height: auto;
width: auto; width: auto;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-boardHS { .game-boardHS {
@ -128,7 +129,7 @@ h1 {
height: 800px; height: 800px;
width: 800px; width: 800px;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-boardHS1 { .game-boardHS1 {
margin-top: -0.5%; margin-top: -0.5%;
@ -136,7 +137,7 @@ h1 {
height: 800px; height: 800px;
width: 800px; width: 800px;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.game-boardHS2 { .game-boardHS2 {
@ -145,7 +146,7 @@ h1 {
height: 800px; height: 800px;
width: 800px; width: 800px;
transform: rotate(90deg); transform: rotate(90deg);
position: fixed; position: center;
} }
.shape { .shape {
@ -897,4 +898,4 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
/*solution pour avoir l'image en rainure ou vide a voir dans le css*/

24
HyperSet/vues/homePage.html
Unescape View File

@ -210,7 +210,7 @@
<div id='game0' class="wrapper" style="display: none;"> <div id='game0' class="wrapper " style="display: none;">
<h1>Set 3x3 </h1> <h1>Set 3x3 </h1>
<div class=" back-btn small-btn"> <div class=" back-btn small-btn">
@ -221,7 +221,7 @@
<div id="progressBar0"> <div id="progressBar0">
<div></div> <div></div>
</div> </div>
<p class = 'text-color'>Trouvez 3 cartes pour lesquelles chacun des critères est différent ou identique.</p> <p class = 'text-color'>Trouve 3 cartes pour lesquelles chacun des critères est différent ou identique.</p>
<p class = 'text-color'>Sets trouvés: <span data-display="score0" class="score">0</span></p> <p class = 'text-color'>Sets trouvés: <span data-display="score0" class="score">0</span></p>
<p class = 'text-color'>Nombres de Sets: <span data-display="nbSets0" class="nbSets"></span></p> <p class = 'text-color'>Nombres de Sets: <span data-display="nbSets0" class="nbSets"></span></p>
<div id="nbsc0"> <div id="nbsc0">
@ -235,6 +235,9 @@
</div> </div>
<div id='game' class="wrapper" style="display: none;"> <div id='game' class="wrapper" style="display: none;">
<h1>Set 3x4 </h1> <h1>Set 3x4 </h1>
<div class=" back-btn small-btn"> <div class=" back-btn small-btn">
@ -453,18 +456,9 @@
<hr class="hr-settings-header"> <hr class="hr-settings-header">
</div> </div>
<div class="custom-select">
<h2 class="text-settings text disable-select dys-font" id="langTitle" style="font-family: Arial; line-height: normal;">LANGUE</h2>
<select id="lang-selector">
<option value="fr">Français</option>
<option value="en">English</option>
</select>
</div>
<hr class="hr-settings">
<div class="div-settings"> <div class="div-settings">
<h2 class="text-dalt-settings text disable-select dys-font" id="daltoSettings" style="font-family: Arial; line-height: normal;">RÉGLAGES COULEURS</h2> <h2 class="text-dalt-settings text disable-select dys-font" id="daltoSettings" style="font-family: Arial; line-height: normal;">RÉGLAGES COULEURS</h2>
<p>Choisit la couleur de tes formes</p> <p>Choisis la couleur de tes formes</p>
<div> <div>
Couleur 1 : Couleur 1 :
<input type="color" <input type="color"
@ -512,7 +506,7 @@
<div class="popup-content"> <div class="popup-content">
<div class="popup-header"> <div class="popup-header">
<span class="close" onclick="closeGame();">×</span> <span class="close" onclick="closeGame();">×</span>
<h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">YOU WON! </h1> <h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">GAGNE! </h1>
</div> </div>
</div> </div>
</div> </div>
@ -522,7 +516,7 @@
<div class="popup-content"> <div class="popup-content">
<div class="popup-header"> <div class="popup-header">
<span class="close" onclick="closeGame();">×</span> <span class="close" onclick="closeGame();">×</span>
<h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">GAME OVER !</h1> <h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">PERDU !</h1>
</div> </div>
</div> </div>
@ -532,7 +526,7 @@
<div class="popup-content"> <div class="popup-content">
<div class="popup-header"> <div class="popup-header">
<span class="close" onclick="closeGame();">×</span> <span class="close" onclick="closeGame();">×</span>
<h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">GAME OVER! Il n'y a plus de SET possible</h1> <h1 class="settings-title text dys-font" style="font-family: Arial; line-height: normal;">PERDU! Il n'y a plus de SET possible</h1>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save