readhame 5 years ago
parent 65fa6f9e23
commit ce38eb9d35

@ -106,6 +106,7 @@
<workItem from="1593450224651" duration="111000" /> <workItem from="1593450224651" duration="111000" />
<workItem from="1593512353865" duration="16143000" /> <workItem from="1593512353865" duration="16143000" />
<workItem from="1593594963138" duration="15031000" /> <workItem from="1593594963138" duration="15031000" />
<workItem from="1593683259701" duration="5974000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -149,10 +150,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="1593600080207" /> <state width="623" height="498" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1593600080207" />
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1593594973198"> <state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1593683265579">
<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="1593594973198" /> <state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1593683265579" />
<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>

@ -44,7 +44,7 @@ h1 {
} }
.selected { .selected {
background: #eee; background: lightgrey;
} }
.game-board { .game-board {
@ -62,9 +62,10 @@ h1 {
} }
.game-board1 { .game-board1 {
margin-top: -15%; margin-top: -5%;
height: auto; height: 800px;
width: auto; width: 800px;
margin-left: 38%;
transform: rotate(90deg); transform: rotate(90deg);
} }
@ -121,6 +122,128 @@ h1 {
.diamond.red.stripped.rond{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, red, red 7px, white 8px, white 15px);
border: 7px dotted black;
}
.diamond.lightblue.stripped.rond{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, lightblue, lightblue 6px, white 7px, white 14px);
border: 7px dotted black;
}
.diamond.yellow.stripped.rond{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, saddlebrown, saddlebrown 6px, white 7px, white 14px);
border: 7px dotted black;
}
.diamond.green.stripped.rond {
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, green, green 6px, white 8px, white 14px);
border: 7px dotted black;
}
.diamond.purple.stripped.rond {
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, purple, purple 6px, white 8px, white 14px);
border: 7px dotted black;
}
.diamond.red.stripped.point{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, red, red 6px, white 7px, white 14px);
border: 4px dashed black;
}
.diamond.lightblue.stripped.point{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, lightblue, lightblue 6px, white 7px, white 14px);
border: 4px dashed black;
}
.diamond.yellow.stripped.point{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, saddlebrown, saddlebrown 6px, white 7px, white 14px);
border: 4px dashed black;
}
.diamond.green.stripped.point {
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, green, green 6px, white 7px, white 14px);
border: 4px dashed black;
}
.diamond.purple.stripped.point {
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
background: repeating-linear-gradient(25deg, purple, purple 6px, white 7px, white 14px);
border: 4px dashed black;
}
.diamond.solid.purple.point{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px;
border-style: dashed;
border-color: purple;
border-width: 4px;
}
.diamond.solid.green.point{
border-style: dashed;
border-color: green;
}
.diamond.solid.red.point{
border-style: dashed;
border-color: red;
}
.diamond.solid.lightblue.point{
border-style: dashed;
border-color: lightblue;
}
.diamond.solid.purple.point{
border-style: dashed;
border-color: purple;
}
.diamond.solid.yellow.point{
border-style: dashed;
border-color: saddlebrown;
}
.diamond.green.quadrillage{ .diamond.green.quadrillage{
background-color: green; background-color: green;
background-image: background-image:
@ -455,7 +578,6 @@ radial-gradient(#fafafa 10%, transparent 10%);
.solid.plein { .solid.plein {
border: 2px solid black; border: 2px solid black;
background: lightblue;
} }
.solid.rond { .solid.rond {
border-style: dotted; border-style: dotted;
@ -471,7 +593,6 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.quadrillage.plein{ .quadrillage.plein{
border: 2px solid black; border: 2px solid black;
background: lightblue;
} }
@ -482,34 +603,28 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.pointille.plein{ .pointille.plein{
border: 2px solid black; border: 2px solid black;
background: lightblue;
} }
.pointille.point{ .pointille.point{
border-style: dashed; border-style: dashed;
border-color: black; border-color: black;
border-width: 4px; border-width: 2px;
} }
.solid.point{ .solid.point{
border-style: dashed; border-style: dashed;
border-color: black; border-color: black;
border-width: 2px;
} }
.quadrillage.point{ .quadrillage.point{
border-style: dashed; border-style: dashed;
border-color: black; border-color: black;
border-width: 4px; border-width: 2px;
} }
.zigzag{
border-image-source : url('../images/zigzag.png');
border-color: black;
background: white;
}
@ -624,31 +739,31 @@ radial-gradient(#fafafa 10%, transparent 10%);
.red.stripped.point{ .red.stripped.point{
background: repeating-linear-gradient(-45deg, red, red 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, red, red 5px, white 5px, white 10px);
border: 4px dashed black; border: 2px dashed black;
} }
.lightblue.stripped.point{ .lightblue.stripped.point{
background: repeating-linear-gradient(-45deg, lightblue, lightblue 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, lightblue, lightblue 5px, white 5px, white 10px);
border: 4px dashed black; border: 2px dashed black;
} }
.yellow.stripped.point{ .yellow.stripped.point{
background: repeating-linear-gradient(-45deg, saddlebrown, saddlebrown 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, saddlebrown, saddlebrown 5px, white 5px, white 10px);
border: 4px dashed black; border: 2px dashed black;
} }
.green.stripped.point { .green.stripped.point {
background: repeating-linear-gradient(-45deg, green, green 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, green, green 5px, white 5px, white 10px);
border: 4px dashed black; border: 2px dashed black;
} }
.purple.stripped.point { .purple.stripped.point {
background: repeating-linear-gradient(-45deg, purple, purple 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, purple, purple 5px, white 5px, white 10px);
border: 4px dashed black; border: 2px dashed black;
} }

@ -976,61 +976,59 @@ var Game = {
selectCard0: function(card) { selectCard0: function(card) {
if (this.selected0.length < 3) {
$(card).addClass('selected'); $(card).addClass('selected');
this.selected0.push(card); this.selected0.push(card);
if (this.selected0.length > 3) {
this.clearSelections0.call(this);
} }
}, },
selectCard: function(card) { selectCard: function(card) {
console.log(this.selected.length);
if (this.selected.length < 3) {
$(card).addClass('selected'); $(card).addClass('selected');
this.selected.push(card); this.selected.push(card);
if (this.selected.length > 3) {
this.clearSelections.call(this);
} }
}, },
selectCard1: function(card) { selectCard1: function(card) {
if (this.selected1.length < 3) {
$(card).addClass('selected'); $(card).addClass('selected');
this.selected1.push(card); this.selected1.push(card);
if (this.selected1.length > 3) {
this.clearSelections1.call(this);
} }
}, },
selectCard2: function(card) { selectCard2: function(card) {
if (this.selected2.length < 4) {
$(card).addClass('selected'); $(card).addClass('selected');
this.selected2.push(card); this.selected2.push(card);
if (this.selected2.length > 4) {
this.clearSelections2.call(this);
} }
}, },
selectCard3: function(card) { selectCard3: function(card) {
if (this.selected3.length < 4) {
$(card).addClass('selected'); $(card).addClass('selected');
this.selected3.push(card); this.selected3.push(card);
if (this.selected3.length > 4) {
this.clearSelections3.call(this);
} }
}, },
selectCard4: function(card) { selectCard4: function(card) {
if (this.selected4.length < 5) {
$(card).addClass('selected'); $(card).addClass('selected');
this.selected4.push(card); this.selected4.push(card);
if (this.selected4.length > 5) {
this.clearSelections4.call(this);
} }
}, },

Loading…
Cancel
Save