Merge remote-tracking branch 'origin/master'

Conflicts:
	SRC/public/css/frontend.css
This commit is contained in:
alexandre-pereira
2015-03-17 12:07:59 +01:00
15 changed files with 318 additions and 18 deletions

View File

@ -2,10 +2,10 @@
@section('content')
@if ($referents != [])
<h1 class="homeTitle"> Jeux Educatifs du musée Augustin </h1>
<nav>
<input name="searchterm" id="searchterm" placeholder="Rechercher un référent" type="text">
</nav>
<input name="searchterm" class="icon-search" id="searchterm" placeholder="&#xe986; Rechercher un référent" type="text">
</nav>
<div id="referents" class="referents">
@foreach ($referents as $referent)
@ -19,8 +19,14 @@
@else
<h1>Aucun référent trouvé</h1>
@endif
<div class="about">
<a href="#"><span class="icon-info" style="font-size: 55px; color:black;"></span></a>
</div>
@endsection
@section('page-css')
<link href="css/fonts/style.css" rel="stylesheet" type="text/css">
@endsection
@section('page-scripts')
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>