From 4570db86fe8d84cafc50f04313bc039cdc4db1a4 Mon Sep 17 00:00:00 2001 From: alexandre-pereira Date: Wed, 18 Mar 2015 19:47:36 +0100 Subject: [PATCH 1/3] You are not my master --- SRC/public/css/frontend.css | 6 ++-- SRC/public/css/memory.css | 14 +++------- SRC/public/imgs/previouspage.png | Bin 0 -> 1707 bytes SRC/public/js/memory.js | 3 +- SRC/resources/views/frontend/games.blade.php | 7 +++++ .../views/frontend/memo_level.blade.php | 13 +++------ SRC/resources/views/frontend/puzzle.blade.php | 26 +++++++++++++----- .../views/frontend/puzzle_level.blade.php | 11 ++++---- 8 files changed, 44 insertions(+), 36 deletions(-) create mode 100644 SRC/public/imgs/previouspage.png diff --git a/SRC/public/css/frontend.css b/SRC/public/css/frontend.css index 19c67ed..9fd3777 100644 --- a/SRC/public/css/frontend.css +++ b/SRC/public/css/frontend.css @@ -105,7 +105,7 @@ nav input { height: 20px; } -button { +button.level { vertical-align:top; cursor: pointer; display: inline-block; @@ -121,10 +121,10 @@ button { outline: 0; transition: all 0.2s; } -button:hover { +button.level:hover { border-bottom-width: 4px; } -button:active { +button.level:active { border-bottom-width: 2px; } diff --git a/SRC/public/css/memory.css b/SRC/public/css/memory.css index 70031c0..1d41e06 100755 --- a/SRC/public/css/memory.css +++ b/SRC/public/css/memory.css @@ -459,24 +459,18 @@ left: 56.3333%%; * * A simple helper class for game buttons. Edit at your will. */ -.mg__button span { - vertical-align:middle; -} + .mg__button { margin: 0; display: inline-block; - padding: 5px; + padding: 15px; color: #fff; - font-family: "Roboto Slab", serif; font-size: 14px; - line-height:18px; - appearance: none; background: #ff3c50; - border: none; - border-radius: 3px; - box-shadow: none; + border-radius: 4px; cursor: pointer; + border: none; } /* ============================================================================= diff --git a/SRC/public/imgs/previouspage.png b/SRC/public/imgs/previouspage.png new file mode 100644 index 0000000000000000000000000000000000000000..e3227577da2e9a1bab984f8ab3554591a73d798c GIT binary patch literal 1707 zcmb7^X;hQf7KTqk7{VaoGV3iwVj@8TUkH~*|xgLR;xapmg$ zL7Vis{@-DEJdiG<-xZO&Tww~Ts(t{@1 z&D5aQ4_G{4aMuDt@wV4`w{IxIGcw6iDw&4Z2uESY&QSWbIujjru-)Q^Wg2%@0 zg%L`bT%c{ZRC&f*u3l8e+!EdXdDY?AB71&T=%X_iM@l#;KVC#iRVm;Fb{DPSs~!1m z%i5#seGcNq&L)nXU_HmKNRu%!XE|Au_rsj;o-$_rTaB}PLP<2^)XL5z1=kO^HrVTD z`7)+5l$(`qz5^@t0b_@ey5h`l0;U}e;7z5E#p%Wl4^Oxk>Xt}Da@JRfTR4-^#Q78M zZ;g>Qm)E2?<;{_2)s63Rl#paNG4pleqSisHa(Qf#_A_iy*st-wSP{Op&2l-GKs8Z0 zd&nXjQJ?ZrEoVz*sqxh%W&S?xcU~@0q;T7Geq`QLoat$qr~l1?|1$mdbI3T;{xn{!?lQuwrq6k zV5)u?EBRH1vP+ZUiYDD?Ta>>K7iB$lCRUTTpHpOEp)rR1OTD@oPj3a06JObxM>Yu= zZdtQE7y9UhYttW5g$>CoYg6kfF`FXp7T1V$pY~!%sezjP!d`gl)sXY+?Po5cp1M|{ zO)=!yqKaILvS!sb&W5nbx|vL^ubg%Cx7>?H$6iD^a`eMMRAz_v*|R%ff}$$U($A4I zqjvNsYcMPEy6#^#t2#GSsE#$a8P?8(nA*P)Ma^s8l}~t`3=ud`j^1JBzWJ(b717*_fCj7LrF z)Sa$!fpoS4-|~tnqvi!Z@3;9GA~mSLqxBcGIS)u$-dkkV`K)=Z)7LJeb+iF2vFVTbHS+ zWQPMo=|0d)A$Ldi=25F~aHY7 ztc7iFtj6uwN4oo;_$0~2V9YASSg__?mbUnL_0Fi}HRKz!Te$Q?&xR%lW8s(q3AA%x zI;}EI%8x13qcQgligHrXbES(5jp)x3mC2u+zzDCe$A#CLrSDbww`czD&wCiZMxkQF~f2|Kq>Y5_8_X&c9O(aTQN6aYrufk2M{sl11J# z?>ujP|HbO5WV0-#r7V&n7T=W&%*Uz6?B^eLqy%y{s<@K4oL*@6H7 literal 0 HcmV?d00001 diff --git a/SRC/public/js/memory.js b/SRC/public/js/memory.js index 3c9463a..b41bd43 100755 --- a/SRC/public/js/memory.js +++ b/SRC/public/js/memory.js @@ -259,7 +259,7 @@ if (self.flippedTiles == self.numTiles) { self._winGame(); } - }, 1500 ); + }, 500 ); // plus one on the move counter this._gameCounterPlusOne(); @@ -364,7 +364,6 @@ Memory.prototype._winGame = function() { firework(); this.gameMessages.innerHTML = '

\ -

Vous avez gagné votre partie en ' + this.numMoves + ' coups !

\ '; //var texteADire = "Bravo, tu as gagné en "+this.numMoves+" coups ! "; diff --git a/SRC/resources/views/frontend/games.blade.php b/SRC/resources/views/frontend/games.blade.php index 8fd52ee..814346d 100755 --- a/SRC/resources/views/frontend/games.blade.php +++ b/SRC/resources/views/frontend/games.blade.php @@ -9,7 +9,14 @@
+ +
1 + + 2 + + 4 +
@endsection diff --git a/SRC/resources/views/frontend/memo_level.blade.php b/SRC/resources/views/frontend/memo_level.blade.php index 919bb89..50a9d6f 100755 --- a/SRC/resources/views/frontend/memo_level.blade.php +++ b/SRC/resources/views/frontend/memo_level.blade.php @@ -10,18 +10,13 @@
- + - + -
+
-
{{ $nbOr }} - - {{ $nbOr }} - - {{ $nbOr }} - + diff --git a/SRC/resources/views/frontend/puzzle.blade.php b/SRC/resources/views/frontend/puzzle.blade.php index 78daa67..833fb2c 100755 --- a/SRC/resources/views/frontend/puzzle.blade.php +++ b/SRC/resources/views/frontend/puzzle.blade.php @@ -1,7 +1,6 @@ @extends('frontend/template') @section('content') -