From 199c999d5d60cd939f1d4252eb577d5590ad6dc8 Mon Sep 17 00:00:00 2001
From: Jorge Robles <jorgejoanrobles@gmail.com>
Date: Thu, 23 Nov 2023 14:35:30 +0100
Subject: [PATCH 1/4] jorge's header

---
 agile-dev/correction/index.html |  4 ++--
 agile-dev/css/custom.css        | 32 ++++++++++++++++++++++++++++++++
 agile-dev/index.html            | 21 +++++++++++++++++++--
 3 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/agile-dev/correction/index.html b/agile-dev/correction/index.html
index 0c3c5cd..413835d 100644
--- a/agile-dev/correction/index.html
+++ b/agile-dev/correction/index.html
@@ -4,9 +4,9 @@
     <!--Import Google Icon Font-->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <!--Import materialize.css-->
-    <link type="text/css" rel="stylesheet" href="css/materialize.css"/>
+    <link type="text/css" rel="stylesheet" href="./custom.js"/>
     <!--Import your custom.css-->
-    <link type="text/css" rel="stylesheet" href="css/custom.css"/>
+    <link type="text/css" rel="stylesheet" href="./custom.css"/>
     <!--Let browser know website is optimized for mobile-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>🤙 Yo! application 🤙 | Simplon</title>
diff --git a/agile-dev/css/custom.css b/agile-dev/css/custom.css
index e69de29..f0ab460 100644
--- a/agile-dev/css/custom.css
+++ b/agile-dev/css/custom.css
@@ -0,0 +1,32 @@
+header {
+    display:flex; 
+    background-color: black;
+    height: 200px;
+    justify-content: space-between;
+
+}
+
+.logo {
+display: flex;
+justify-content: center;
+
+}
+
+.logo img {
+height: 150px;
+
+}
+
+.toplinks a {
+margin: 20px;
+color:white;
+text-decoration: none;
+background-color: palevioletred;
+padding: 4px 10px;
+border-radius: 30px;
+font-size: 15px;
+
+}
+
+
+}
\ No newline at end of file
diff --git a/agile-dev/index.html b/agile-dev/index.html
index 2fb0a11..877fda3 100644
--- a/agile-dev/index.html
+++ b/agile-dev/index.html
@@ -4,9 +4,9 @@
     <!--Import Google Icon Font-->
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <!--Import materialize.css-->
-    <link type="text/css" rel="stylesheet" href=""/>
+    <link type="text/css" rel="stylesheet" href="./css/materialize.css"/>
     <!--Import your custom.css-->
-    <link type="text/css" rel="stylesheet" href=""/>
+    <link type="text/css" rel="stylesheet" href="./css/custom.css"/>
     <!--Let browser know website is optimized for mobile-->
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>🤙 Yo! application 🤙 | Simplon</title>
@@ -15,6 +15,23 @@
    
     <!-- Start code here -->
     
+      <!-- Jorge start here -->
+    
+      <header>
+            <div class="logo">
+              <img src="./img/logo_application.png" alt="yo logo">
+            </div>
+
+        <div class="toplinks">
+          <a href="" class="nav-link">Get started</a>
+          <a href="" class="nav-link">About us</a>
+          <a href="" class="nav-link">Contact</a>
+          </div>      
+
+      </header>
+    
+       <!-- Jorge ends here -->
+
     <!-- finish code here -->
 
     <!--Import materialize.js - JavaScript at end of body for optimized loading-->

From 7f698aee8bc0a659f193943e5536f99baa6c0d06 Mon Sep 17 00:00:00 2001
From: lucas dechavanne <lucasdechavanne22@gmail.com>
Date: Thu, 23 Nov 2023 15:47:19 +0100
Subject: [PATCH 2/4] fusion Lucas Jorge

---
 agile-dev/css/custom.css |  70 ++++++++++++++++++++++++-
 agile-dev/index.html     | 108 ++++++++++++++++++++++++---------------
 2 files changed, 137 insertions(+), 41 deletions(-)

diff --git a/agile-dev/css/custom.css b/agile-dev/css/custom.css
index f0ab460..442e043 100644
--- a/agile-dev/css/custom.css
+++ b/agile-dev/css/custom.css
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 header {
     display:flex; 
     background-color: black;
@@ -25,8 +26,75 @@ background-color: palevioletred;
 padding: 4px 10px;
 border-radius: 30px;
 font-size: 15px;
+=======
+
+/* css de la premiere section avec le texte */
+
+#section1 {
+
+    height: 300px;
+    width:100%;
+    display: flex;
+    justify-content: space-around;
+    background-color: rgb(214, 65, 19);
+    color:rgb(255, 255, 255);
+    font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+    align-items: center;
+
+}
+
+/* je sépare la section en 2 avec les 2 div*/
+
+.div1 {
+    margin:center;
+    font-weight: bold;
+}
+
+.div2 {
+
+    align-self: flex-end;    
 
 }
 
+/* mise en liens et en ligne de mon texte */
+
+#section1 .links {
+
+    
+    display: flex;
+    justify-content: space-evenly;
+    color: rgb(255, 255, 255);
+>>>>>>> 8205f7e (ajout de la section 1 de lucas)
+
+}
+
+
+<<<<<<< HEAD
+}
+=======
+
+#section1 .links a{
+    background-color: rgb(70, 64, 64);
+    color: rgb(189, 189, 189);
+    margin: 10px;
+    border-radius: 30px;
+    padding: 15px;
+    
+}
+
+h1 {
+
+font-size: 50px;
+text-decoration: underline;
+
+}
+
+.div1 img {
+
+margin-left: 28%;
+margin-right: -10%;
+margin-top: 40px;
+
+}
 
-}
\ No newline at end of file
+>>>>>>> 8205f7e (ajout de la section 1 de lucas)
diff --git a/agile-dev/index.html b/agile-dev/index.html
index 877fda3..3113147 100644
--- a/agile-dev/index.html
+++ b/agile-dev/index.html
@@ -1,42 +1,70 @@
 <!DOCTYPE html>
 <html>
-  <head>
-    <!--Import Google Icon Font-->
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-    <!--Import materialize.css-->
-    <link type="text/css" rel="stylesheet" href="./css/materialize.css"/>
-    <!--Import your custom.css-->
-    <link type="text/css" rel="stylesheet" href="./css/custom.css"/>
-    <!--Let browser know website is optimized for mobile-->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>🤙 Yo! application 🤙 | Simplon</title>
-  </head>
-  <body>
-   
-    <!-- Start code here -->
-    
-      <!-- Jorge start here -->
-    
-      <header>
-            <div class="logo">
-              <img src="./img/logo_application.png" alt="yo logo">
-            </div>
-
-        <div class="toplinks">
-          <a href="" class="nav-link">Get started</a>
-          <a href="" class="nav-link">About us</a>
-          <a href="" class="nav-link">Contact</a>
-          </div>      
-
-      </header>
-    
-       <!-- Jorge ends here -->
-
-    <!-- finish code here -->
-
-    <!--Import materialize.js - JavaScript at end of body for optimized loading-->
-    <script type="text/javascript" src=""></script>
-    <!--Import your custom.js-->
-    <script type="text/javascript" src=""></script>
-  </body>
-</html>
+
+<head>
+  <!--Import Google Icon Font-->
+  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+  <!--Import materialize.css-->
+  <link type="text/css" rel="stylesheet" href="./css/materialize.css" />
+  <!--Import your custom.css-->
+  <link type="text/css" rel="stylesheet" href="./css/custom.css" />
+  <!--Let browser know website is optimized for mobile-->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>🤙 Yo! application 🤙 | Simplon</title>
+</head>
+
+<body>
+
+  <!-- Start code here -->
+  <!-- Jorge start here -->
+
+  <header>
+    <div class="logo">
+      <img src="./img/logo_application.png" alt="yo logo">
+    </div>
+
+    <div class="toplinks">
+      <a href="" class="nav-link">Get started</a>
+      <a href="" class="nav-link">About us</a>
+      <a href="" class="nav-link">Contact</a>
+    </div>
+
+  </header>
+
+  <!-- Jorge ends here -->
+  <!-- Début Code Lucas pour la partie 1-->
+
+  <section id="section1">
+
+    <div class="div1">
+      <h1>Yo! Le nouveau moyen de partager !</h1>
+
+      <div class="links">
+        <p><a href="">A quoi ça sert ?</a></p>
+        <p><a href="">Fonctionnalitées</a></p>
+        <p><a href="">S'inscire ?</a></p>
+      </div>
+
+      <img src="./img/download_android.png" alt="liens de téléchargement vers android" height="30px">
+      <img src="./img/download_ios.png" alt="liens de téléchargement vers ios" height="30px">
+
+    </div>
+
+    <div class="div2">
+
+      <img src="./img/iphone_ipad_light.png" alt="iphone et ipad utilisant l'application" width="350px">
+
+    </div>
+
+  </section>
+
+  <!-- Fin Code Lucas pour la partie 1-->
+  <!-- finish code here -->
+
+  <!--Import materialize.js - JavaScript at end of body for optimized loading-->
+  <script type="text/javascript" src=""></script>
+  <!--Import your custom.js-->
+  <script type="text/javascript" src=""></script>
+</body>
+
+</html>
\ No newline at end of file

From 155bf9770e122b0c9fc9462a3b6a3897ad4ec597 Mon Sep 17 00:00:00 2001
From: lucas dechavanne <lucasdechavanne22@gmail.com>
Date: Thu, 23 Nov 2023 15:49:03 +0100
Subject: [PATCH 3/4] fusion Lucas Jorge

---
 agile-dev/css/custom.css | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/agile-dev/css/custom.css b/agile-dev/css/custom.css
index 442e043..066b293 100644
--- a/agile-dev/css/custom.css
+++ b/agile-dev/css/custom.css
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 header {
     display:flex; 
     background-color: black;
@@ -26,7 +25,8 @@ background-color: palevioletred;
 padding: 4px 10px;
 border-radius: 30px;
 font-size: 15px;
-=======
+
+}
 
 /* css de la premiere section avec le texte */
 
@@ -64,14 +64,7 @@ font-size: 15px;
     display: flex;
     justify-content: space-evenly;
     color: rgb(255, 255, 255);
->>>>>>> 8205f7e (ajout de la section 1 de lucas)
-
-}
-
-
-<<<<<<< HEAD
 }
-=======
 
 #section1 .links a{
     background-color: rgb(70, 64, 64);
@@ -97,4 +90,3 @@ margin-top: 40px;
 
 }
 
->>>>>>> 8205f7e (ajout de la section 1 de lucas)

From d790049147f40fce3746b5166583c104e969fe22 Mon Sep 17 00:00:00 2001
From: lucas dechavanne <lucasdechavanne22@gmail.com>
Date: Thu, 23 Nov 2023 16:54:15 +0100
Subject: [PATCH 4/4] lucas final

---
 agile-dev/css/custom.css | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/agile-dev/css/custom.css b/agile-dev/css/custom.css
index 066b293..358bb19 100644
--- a/agile-dev/css/custom.css
+++ b/agile-dev/css/custom.css
@@ -1,3 +1,7 @@
+
+/* début CSS jorge*/
+
+
 header {
     display:flex; 
     background-color: black;
@@ -18,16 +22,23 @@ height: 150px;
 }
 
 .toplinks a {
+
+    display: flex;
+    justify-content: space-evenly;
 margin: 20px;
 color:white;
 text-decoration: none;
-background-color: palevioletred;
+background-color: rgb(214, 65, 19);
 padding: 4px 10px;
 border-radius: 30px;
 font-size: 15px;
 
 }
 
+/* fin CSS jorge*/
+
+/* debut CSS lucas*/
+
 /* css de la premiere section avec le texte */
 
 #section1 {
@@ -90,3 +101,5 @@ margin-top: 40px;
 
 }
 
+/* fin CSS lucas */
+