Skip to content
Snippets Groups Projects
Commit 7acd92b6 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

Merge des modifs d'Enolha.

parent b41fa0d4
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 20 additions and 31 deletions
pages/accueil.php
+ 20
− 31
View file @ 7acd92b6
......@@ -8,21 +8,11 @@
<link rel="stylesheet" href="/styles/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" href="/styles/dist/styles.css">
</head>
<body>
<header>
<?php include "navbar.php"; ?>
</header>
<<<<<<< HEAD
<head>
<meta charset="utf-8">
<title> Cristo </title>
</head>
<body>
<div class="menubackground">
<div class="v1_158">
<h1>Crist'o </h1> <h1> Trouvez les recettes parfaites
<h1>Crist'o </h1>
<h1> Trouvez les recettes parfaites
pour vous, sans lever le petit doigt ! </h1>
<div class="v1_163">
......@@ -33,7 +23,8 @@
<div class="v1_168"></div>
</div>
</div>
</div><span class="v1_169">OU</span>
</div>
<span class="v1_169">OU</span>
<div class="v1_170">
<div class="v1_171">
<div class="v1_172"></div>
......@@ -47,9 +38,7 @@
<div class="votrerecette">
<p> Vous souhaitez ajouter votre recette ? Cliquez ici</p>
</div>
</body>
<?php include "footer.php"; ?>
</body>
</html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment