alaa

2015-03-05 19:27:08 +01:00
parent 3613ef325f
commit f7b99d84c9
5 changed files with 33 additions and 13 deletions
--- a/SRC/public/css/game.css
+++ b/SRC/public/css/game.css
@ -5,14 +5,9 @@ body
  background-repeat:no-repeat;
  background-position:100% 100%;
  background-size:cover;
-<<<<<<< HEAD
 }
-=======
-}
-
 .iconGame
 {
-	width: 13%;
-	height: 23%;
+	width: 10%;
+	height: 20%;
 }
->>>>>>> 407a955444da6207f59c5f05d283275510b2169c