QRouland/ModuleWeb
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/matthieupenchenat81/ModuleWeb

Browse Source 
Conflicts:
	SRC/app/Http/Controllers/ReferentController.php
	SRC/public/css/game.css
	SRC/public/css/home.css
	SRC/resources/views/referent.blade.php
	SRC/resources/views/referent_games.blade.php
This commit is contained in:
www
2015-02-24 11:35:26 +01:00
parent 4f8e9f9a38 407a955444
commit 2fbbc8fe77
10 changed files with 246 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SRC/public/css/game.css
View File

@ -5,4 +5,14 @@ body
background-repeat:no-repeat;
background-position:100% 100%;
background-size:cover;
}
<<<<<<< HEAD
}
=======
}
.iconGame
{
width: 13%;
height: 23%;
}
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c

4
SRC/public/css/home.css
View File

@ -46,6 +46,10 @@ body {
width : 40%;
box-shadow: 0 0 6px black inset;
border: 1px solid dimgrey;
<<<<<<< HEAD
=======
font-size: 1.5em;
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
}
.carousel-indicators