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

4
SRC/resources/views/referent_games.blade.php
View File

@ -1,9 +1,13 @@
@extends('app')
<<<<<<< HEAD
<link href="css/referent.css" rel="stylesheet" type="text/css"/>
<br>
<center><h1>Games</h1></center>
<br>
<br>
=======
<center><img src="/pictures/pic/game.png" alt="Game" class="iconGame"/></center>
>>>>>>> 407a955444da6207f59c5f05d283275510b2169c
<div class="container">
<div class="col-sm-6 col-md-4">
<div class="thumbnail">