From 7acd92b6bb027f63bc957d9127aaa20d405a2b10 Mon Sep 17 00:00:00 2001
From: Sofiane Lasri <alasri250@gmail.com>
Date: Mon, 17 Apr 2023 15:32:38 +0200
Subject: [PATCH] Merge des modifs d'Enolha.
---
pages/accueil.php | 51 +++++++++++++++++++----------------------------
1 file changed, 20 insertions(+), 31 deletions(-)
diff --git a/pages/accueil.php b/pages/accueil.php
index a9ce2e1..65da5bd 100644
--- a/pages/accueil.php
+++ b/pages/accueil.php
@@ -8,48 +8,37 @@
<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
- pour vous, sans lever le petit doigt ! </h1>
-
- <div class="v1_163">
- <div class="v1_164"><span class="v1_165" input type="text" placeholder="Search.."> </span></div>
- <button type="submit"><i class="fa fa-search"></i></button>
- <div class="v1_166">
- <div class="v1_167">
- <div class="v1_168"></div>
- </div>
- </div>
- </div><span class="v1_169">OU</span>
- <div class="v1_170">
- <div class="v1_171">
- <div class="v1_172"></div>
+ <h1>Crist'o </h1>
+ <h1> Trouvez les recettes parfaites
+ pour vous, sans lever le petit doigt ! </h1>
+
+ <div class="v1_163">
+ <div class="v1_164"><span class="v1_165" input type="text" placeholder="Search.."> </span></div>
+ <button type="submit"><i class="fa fa-search"></i></button>
+ <div class="v1_166">
+ <div class="v1_167">
+ <div class="v1_168"></div>
</div>
- <i class="fa-solid fa-microphone"></i>
- <span class="v1_173">Demandez à Crist'o</span>
-
+ </div>
+ </div>
+ <span class="v1_169">OU</span>
+ <div class="v1_170">
+ <div class="v1_171">
+ <div class="v1_172"></div>
+ </div>
+ <i class="fa-solid fa-microphone"></i>
+ <span class="v1_173">Demandez à Crist'o</span>
+
</div>
</div>
</div>
<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
--
GitLab