This commit is contained in:
www 2015-03-05 19:27:08 +01:00
parent 3613ef325f
commit f7b99d84c9
5 changed files with 33 additions and 13 deletions

View File

@ -385,3 +385,31 @@ git pull
exit exit
git pull git pull
exit exit
ls
cd ..
ls
nano loadCSVAugustin2014.py
python loadCSVAugustin2014.py
cd ModuleWeb/
ls
nano SRC/init/loadCSVAugust2014.py
git commit -a
git pull
git push
nano SRC/public/js/ListeOeuvre.js
git pull
git pull
gir pull
git pull
git pull
git pull
exit
git pull
exit
git pull
git pull
exit
git pull
exit
git pull
exit

View File

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

View File

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