From 5bfb1d2c66924e96cb346a3c2fddc8bf0b53874b Mon Sep 17 00:00:00 2001 From: "louis.fourcade@ensiie.fr" <gofer> Date: Wed, 11 Dec 2019 19:55:13 +0100 Subject: [PATCH] correction de tanguy la tanche --- public/espace_perso.php | 4 ++-- public/leaderboard.php | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/public/espace_perso.php b/public/espace_perso.php index e6e14e7..e983531 100644 --- a/public/espace_perso.php +++ b/public/espace_perso.php @@ -74,7 +74,7 @@ $listeCDCperso = $coupdecoeurRepository->fetchByIdUser($_SESSION["id_user"]); <div class="row"> - <div class="col CoupDeCoeur"> + <div class="col CoupDeCoeur" style="margin: 0px;"> <h3 class="titre">Vos images coup de coeur :</h3> <!-- liste des coups de coeur de l'utilisateur --> <div id="CDCdisplayArea"><div class="spinner-border text-dark"></div></div> @@ -82,7 +82,7 @@ $listeCDCperso = $coupdecoeurRepository->fetchByIdUser($_SESSION["id_user"]); <!-- bibliothèque personnelle des images notées par l'utilisateur --> - <div class="col Reviewed"> + <div class="col Reviewed" style="margin: 0px;"> <h3 class="titre">Les images que vous avez note :</h3> <div id="ReviewdisplayArea"><div class="spinner-border text-dark"></div></div> </div> diff --git a/public/leaderboard.php b/public/leaderboard.php index 4e10495..0deba60 100644 --- a/public/leaderboard.php +++ b/public/leaderboard.php @@ -54,11 +54,7 @@ urlHasArgument(); generateNavBar('leaderboard'); ?> <!-- balises cachées contenant les images par ordre de notation --> -<<<<<<< HEAD <div id="NoteLeaderboard" style="display: none"> <!-- display: none --> -======= - <div id="NoteLeaderboard" style="display:none"> <!-- display: none --> ->>>>>>> fe4f8bc2d8e0b89af8f7b3f8e536301fdd4af310 <?php $test = $orderRepository->fetchAvgNoteOrder(); -- GitLab