Large diffs are not rendered by default.

@@ -112,3 +112,54 @@ h1,h2,h3,h4,h5{
.title--marker{
font-size: 15px;
}

@media (max-width: 1150px){
.title--recap{
font-size: make_em(20,16);
}

.title--sticky{
font-size: make_em(18,16);
padding:make_em(15,18) make_em(25,18);
margin-bottom:make_em(40,18);
}
}

@media (max-width: 900px){
.title--header{
font-size: make_em(30,16);
}
}

@media (max-width: 850px){
.title--step{
max-width: none;
}

.subtitle--section{
font-size: make_em(20,16);
margin-bottom: make_em(20,16);
}
}

@media (max-width: 600px){
.title--header{
font-size: make_em(23,15);
}
.title__lign{
display: inline-block;
}

.title--section{
font-size: make_em(21,15);
margin-bottom: 5px;
}
.subtitle--section{
font-size: make_em(17,15);
margin-bottom: make_em(20,18);
}

.title--sticky{
margin-bottom:make_em(25,18);
}
}
@@ -15,14 +15,10 @@ html, body{

.main--compte{
background: $color-bg-back;
padding:make_em(80,16) 0px make_em(120,16);
padding:calc(80 / 1680 * 100%) 0px calc(120 / 1680 * 100%);
}


@media(max-width:930px){

}

.alert__container{
padding:make_em(10,16) make_em(20,16);
text-align: center;
@@ -76,3 +72,9 @@ html, body{
display: block;
margin-bottom: 1em;
}

@media (max-width: 600px){
html{
font-size: 15px;
}
}
@@ -25,7 +25,6 @@
display: table-cell;
width: 90px;
height: 90px;

border-radius: 50%;
@include background_size("../img/place.jpg",no-repeat,center,center,cover);
}
@@ -77,5 +76,33 @@
left: 55%;
top: 48%;
transform: translate(-50%,-50%);
}

@media (max-width: 1150px){
.compte__acces, .compte__edit{
width:100%;
}
.compte__recap{
width: 100%;
}

.recap__img{
display: table-cell;
width: 60px;
height: 60px;
border-radius: 50%;
@include background_size("../img/avatar.jpg",no-repeat,center,center,cover);
}

.compte__picture-container{
width: 100px;
height: 100px;
margin:0px auto make_em(25,16);
}
}

@media (max-width: 600px){
.compte__form{
padding:0px 5% make_em(30,16);
}
}
@@ -19,14 +19,6 @@
top:2px;
}

.fiche__infos{
width: 600px;
}

.fiche__commentaires{
width: 625px;
}


.fiche__recap{
margin-top:make_em(50,16);
@@ -71,9 +63,6 @@
border-bottom: 1px solid $color-border;
}

.fiche__stats, .user__stats{
width: 500px;
}

.stats__criteria{
margin-top:make_em(30,16);
@@ -104,14 +93,16 @@
margin-top:make_em(40,16);
}

.comment__item{
width: 100%;

.comment__item--full{
&+&{
margin-top: make_em(50,16);
margin-top: make_em(30,16);
}
}

.comment__item{
width: 100%;
}

.comment__item--small{
&+&{
margin-top: make_em(10,16);
@@ -245,3 +236,39 @@
display: block;
margin-bottom: make_em(15,16);
}

@media (max-width: 1350px){
.comment__texts{
width: 86%;
}
}

@media (max-width: 950px){
.comment__texts{
width: 88%;
}

.comment__face{
width: 8%;
height: auto;
padding-top:8%;
}
}

@media (max-width: 600px){
.comment__texts{
font-size: 0.95em;
}
}

@media (max-width: 500px){
.comment__texts{
width: 83%;
}

.comment__face{
width: 12%;
height: auto;
padding-top:12%;
}
}
@@ -105,3 +105,45 @@
.user__comment{
margin-bottom: make_em(35,16);
}



@media (max-width: 1150px){
.trophy__description{
max-width: 250px;
}
}


@media (max-width: 900px){
.user__picture{
width: 110px;
height: 110px;
}

.user__infos{
top:-60px;
}
}


@media (max-width: 650px){
.trophy__description{
max-width: 200%;
}

.user__title{
margin-bottom: make_em(15,16);
}
}

@media (max-width: 450px){
.user__picture{
width: 100px;
height: 100px;
}

.user__infos{
top:-55px;
}
}
@@ -89,3 +89,35 @@
.bouton--danger{
background: #FF4A4A;
}

@media (max-width: 900px){
.bouton--search{
padding:make_em(17.5,18) make_em(25,18);
}
}

@media (max-width: 850px){
.action__container{
margin-top:make_em(60,16);
}
}



@media (max-width: 600px){
.bouton--search{
font-size: make_em(16,16);
padding:make_em(19.5,16) make_em(15,16);
}

.bouton--large{
font-size: make_em(16,16);
padding:make_em(12,18) make_em(20,18);
}
}

@media (max-width: 400px){
.action__container{
margin-top:make_em(45,16);
}
}
@@ -17,3 +17,122 @@
.column--more{
width: 475px;
}

.about__text{
width: 550px;
}
.about__img{
width: 320px;
}

.fiche__infos{
width: 600px;
}

.fiche__commentaires{
width: 625px;
}

.user__infos{
width: 600px;
position: relative;
top:-80px;
}

.fiche__stats, .user__stats{
width: 500px;
}

@media (max-width: 1350px){
div.user__infos, .fiche__infos{
width: percentage(600/1215);
}

.fiche__commentaires{
width: 100%;
}
}

@media (max-width: 1200px){
.about__text{
width: percentage(550/1040);
}
.about__img{
width: percentage(320/1040);
}
}

@media (max-width: 1150px){
.column--basics{
width: 52.5%;
}

.column--more{
width: 42.5%;
}
.fiche__stats, .user__stats{
width: 400px;
}

}

@media (max-width: 950px){
div.user__infos, .fiche__infos{
width: 100%;
display: block;
float: none;
}

div.fiche__stats, div.user__stats{
display: block;
width:70%;
margin-top: 2em;
float: none;
}

div.user__stats{
margin-top: -60px;
}
}

@media (max-width: 850px){
.column--basics, .column--more{
width: 100%;
float: none;
}

.column--basics + .column--more{
margin-top:2.5em;
}
}


@media (max-width: 700px){
.about__text{
width: 100%;
}
.about__img{
width: 170px;
margin: 0px auto 1.5em;
}

.about__img, .about__text{
float: none;
display: block;
text-align: center;
}

div.fiche__stats, div.user__stats{
width:100%;
}

}


@media (max-width: 500px){

.about__img{
width: 140px;
}

}
@@ -19,3 +19,30 @@ footer{
.footer--compte{
margin-top: 0px;
}

@media (max-width: 850px){
footer{
margin-top:make_em(60,14);
}
}


@media (max-width: 750px){
.footer__menu, .footer__infos{
width: 100%;
display: block;
float: none;
text-align: center;
}

.footer__infos{
margin-top:1em;
}

}

@media (max-width: 500px){
footer{
margin-top:make_em(40,14);
}
}
@@ -41,8 +41,9 @@
height: 36px;
@include background_size("../img/icon--search.svg",no-repeat,center,center,contain);
}

}


.search__bar{
color: black;
font-size: make_em(40,16);
@@ -366,3 +367,101 @@ input:disabled{
margin-left:0.15em;
padding: 0px;
}



@media (max-width: 900px){
.header__input{
font-size: make_em(16,16);
}
.header__search{
&:before{
top:make_em(15,16);
left: make_em(25,16);
width:25px;
height: 25px;
}
}

.login__img{
width: 170px;
}
}

@media (max-width: 800px){
.label--sided{
width: 35%;
}
}

@media (max-width: 700px){
.success--label{
width: 35px;
height:35px;
}
}

@media (max-width: 600px){

.form__front{
width: 90%;
}

.login__img{
width: 140px;
}
.input--sided{
display: block;
}
.label--sided{
width: 100%;
display: block;
text-align: left;
margin-bottom: 0.5em;
}

.form__input{
&+&{
margin-top: make_em(10,16);
}
}

.form__part{
&+&{
margin-top:make_em(30,16);
}
}

.part--success{
margin:0px auto make_em(25,16);
}

.input--textarea{
height: 150px;
}
}

@media (max-width: 450px){
.header__input{
padding:make_em(17.5,16) make_em(25,16) make_em(17.5,16) make_em(20,16);
}

.header__search{
&:before{
display: none;
}
}

.input--classic{
padding:make_em(6,15) make_em(13,15);
}

.input--textarea{
height: 100px;
}

.form__submit{
display: block;
width: 100%;
}
}
@@ -41,3 +41,27 @@
.header--user{
position: relative;
}


@media (max-width: 900px){
.inside__content{
div{
width: 90%;
}
}
.background--home{
height: 500px;
}
}

@media (max-width: 600px){
.background--home{
height: 400px;
}
}

@media (max-width: 400px){
.background--home{
height: 300px;
}
}
@@ -27,3 +27,10 @@
.list--trophies{
margin-top:make_em(30,16);
}


@media (max-width: 850px){
.list--steps{
margin-top: make_em(50,16);
}
}
@@ -69,3 +69,28 @@
.marker__star{
width: 13px;
}


@media (max-width: 1000px){
.user__map, .search__map{
height: 400px;
}
}

@media (max-width: 900px){
.user__map--enlarge, .map__enlarge{
display: none;
}
}

@media (max-width: 600px){
.user__map, .search__map{
height: 300px;
}
}

@media (max-width: 400px){
.user__map, .search__map{
height: 250px;
}
}
@@ -11,8 +11,6 @@
&+&, &+.menu__item--user{
margin-left: make_em(45,16);
}


}

.menu__list--front > li{
@@ -93,10 +91,6 @@
.user__item--front{
white-space: nowrap;

&+&{

}

a{
display: block;
padding: make_em(14,16) 0px;
@@ -107,3 +101,38 @@
border-color: darken($color-border-form,15%);
}
}

@media (max-width: 1150px){

.compte__menu{
margin:make_em(25,16) 0px;
}

.compte__menu-link{
padding:make_em(12,16) make_em(20,16);
}
}

@media (max-width: 750px){
.menu__item--front{
&+&, &+.menu__item--user{
margin-left: make_em(30,16);
}
}
}

@media (max-width: 400px){
.menu__item--front{
&+&, &+.menu__item--user{
margin-left: make_em(15,16);
}
}

.compte__menu{
margin:make_em(15,15) 0px;
}

.compte__menu-link{
padding:make_em(10,15) make_em(20,15);
}
}
@@ -104,3 +104,37 @@
.search__places{
margin-top:make_em(40,16);
}

@media (max-width: 1100px){
.place__item--small{
width: 23%;
display: inline-block;
margin:make_em(40,16) 1% 0px;
}
}

@media (max-width: 850px){
.place__item--large{
width: 46.5%;
&+&{
margin-left: 5%;
}

&:nth-child(n+3){
margin-top: make_em(30,16);
margin-left: 0px;
}
}
}

@media (max-width: 750px){
.place__item--small{
width: 45%;
display: inline-block;
margin:make_em(40,16) 2.5% 0px;
}

.star--larger{
height: 15px;
}
}
@@ -1,3 +1,10 @@
.section{
padding:make_em(80,16) 0px;
padding:calc(80 / 1680 * 100%) 0px;
}


@media (max-width: 600px){
.section{
padding:calc(50 / 600 * 100%) 0px;
}
}
@@ -10,3 +10,26 @@
margin-left: percentage(200/1680);
}
}


@media (max-width: 850px){
.step__item{
width: 100%;

&+&{
margin:2.5em 0px 0px;
}
}

.step__img{
height: 155px;
margin-bottom: make_em(20,16);
}
}

@media (max-width: 500px){
.step__img{
height: 115px;
margin-bottom: make_em(10,16);
}
}
@@ -12,14 +12,23 @@
}


.about__text{
width: 550px;
}

.about__paragraph{
margin:make_em(25,16) 0px make_em(50,16);
}

.about__img{
width: 320px;

@media (max-width: 700px){
.intro__text, .about__paragraph{
text-align: justify;
}
}

@media (max-width: 600px){
.intro__container{
&--centered{
max-width: none;
width: 90%;
}
}

}
@@ -38,3 +38,22 @@
.wrapper--modal--large{
width: 600px;
}

@media (max-width: 1350px){
.wrapper--fiche{
width: 90%;
}
}

@media (max-width: 1200px){
.wrapper--smallest{
width:90%;
}
}


@media (max-width: 1150px){
.wrapper--small{
width: 90%;
}
}
@@ -5,14 +5,20 @@ input, textarea, form{
font-size: inherit;
outline: none;
border:transparent;

}

textarea{
resize: vertical;

}


input:not([type=checkbox]):not([type=radio]){
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
}

::-moz-placeholder { /* Mozilla Firefox 19+ */
color: $color-text;
opacity: 1;
@@ -84,17 +84,18 @@
</ul>

<div class="action__container container--centered">
<a href="#" class="bouton bouton--large bouton--action" title="Afficher tout le classement des musées">Afficher tout le classement</a>
<a href="{{route("place.search")}}" class="bouton bouton--large bouton--action" title="Afficher tout le classement des musées">Afficher tous les lieux</a>
</div>
</section>

<section class="section wrapper--smallest wrapper--centered clearfix">
<img class="about__img column--right" src="{{URL::asset("img/about.png")}}" alt="Image a propos"/>
<div class="column--left about__text">
<h3 class="title--section">Museo, c'est quoi ?</h3>
<p class="about__paragraph">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Etiam massa elit, interdum at augue et, tristique fermentum lacus. Integer id condimentum dolor. Nunc at erat id ex placerat molestie eget nec lacus. Nullam tellus ex, suscipit quis augue ut.</p>
<a href="#" class="bouton bouton--large" title="Aller Ă  la page 'Ă  propos'">En savoir plus</a>
</div>

<img class="about__img column--right" src="{{URL::asset("img/about.png")}}" alt="Image a propos"/>

</section>
@endsection
@@ -3,7 +3,7 @@
<footer class="clearfix footer--front @yield("footer__class")">
<h3 class="hide">Pied de page</h2>

<nav class="column--left">
<nav class="column--left footer__menu">
<ul class="footer__list--front footer__list list-inline">
<li class="footer__item--front footer__item">
<a class="footer__link--front footer__link" href="{{route("home")}}" alt="Retourner Ă  l'accueil">Accueil</a>
@@ -22,8 +22,8 @@
@endif
</ul>
</nav>
<div class="column--right">
<p class="">Museo {{date("Y")}} - Développé par <a class="footer__disclaimer" target="_blank" alt="Afficher le site web d'Axel Cardinaels" href="http://www.axel-cardinaels.be">Axel Cardinaels</a></p>
<div class="column--right footer__infos">
<p>Museo {{date("Y")}} - Développé par <a class="footer__disclaimer" target="_blank" alt="Afficher le site web d'Axel Cardinaels" href="http://www.axel-cardinaels.be">Axel Cardinaels</a></p>
</div>
</div>
</footer>
@@ -101,7 +101,7 @@

<ul class="comments__list list--comments list-inline">
@foreach($place->showableRatings as $rating)
<li class="comment__item">
<li class="comment__item comment__item--full">
<article class="comment__article clearfix">
<figure class="column--left comment__face" style="background-image:url('{{URL::asset($rating->user->avatar)}}');">
<figcaption class="hide">Photo de l'utilisateur {{$rating->user->fullName()}}</figcaption>
@@ -32,7 +32,7 @@
</div>

<h2 class="section__title title--section">{{$user->fullName()}}</h2>
<p class="user__title">@if($user->achievement_id){{$user->title->title}}@endif</p>
<p class="user__title">@if($user->achievement_id){{$user->title->title}} @else Novice @endif</p>
</div>

<div class="user__description">
@@ -17,14 +17,14 @@
Route::group(['prefix' => 'lieux'], function () {
Route::get('ajouter', ['as' => 'place.add', 'uses' => 'PlaceController@add'])->middleware('auth');
Route::get('getBack/{id}', ['as' => 'place.back', 'uses' => 'PlaceController@getBack']);
Route::post('create', ['as' => 'place.create', 'uses' => 'PlaceController@create']);
Route::post('create', ['as' => 'place.create', 'uses' => 'PlaceController@create'])->middleware('auth');
Route::get('rechercher/{search?}/{category?}', ['as' => 'place.search', 'uses' => 'PlaceController@search']);
Route::get('/{id}', ['as' => 'place.show', 'uses' => 'PlaceController@show']);
});



Route::group(['prefix' => 'compte'], function () {
Route::group(['prefix' => 'compte', 'middleware' => 'auth'], function () {
Route::get('/', ['as' => 'compte.edit', 'uses' => 'UserController@edit']);
Route::get('/supprimer', ['as' => 'compte.remove', 'uses' => 'UserController@remove']);
});
@@ -39,7 +39,7 @@
Route::get('connexion/facebook/callback',['as' => 'auth.facebook.callback', 'uses' => 'Auth\LoginController@handleProviderCallback']);
});

Route::group(['prefix' => 'membre'], function () {
Route::group(['prefix' => 'membre', 'middleware' => 'auth'], function () {
Route::get('/{id}', ['as' => 'user.show', 'uses' => 'UserController@show']);
Route::post('update', ['as' => 'user.update', 'uses' => 'UserController@update']);
Route::post('delete', ['as' => 'user.delete', 'uses' => 'UserController@delete']);