Merge branch 'main' of https://github.com/geekcrea/BOOKI

geekcrea · Mar 27, 2024 · 3c512a4 · 3c512a4
2 parents e88a007 + 743ad03
commit 3c512a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/css/style.css b/css/style.css
@@ -751,7 +751,11 @@ footer{
     }
 
     .section-recherche {
+<<<<<<< HEAD
         padding: 20px 25px;
+=======
+        padding: 20px 35px;
+>>>>>>> 743ad030d837f526cc3767422dadb7a452dcc072
     }
 
     .btn-form-mobile {
@@ -829,7 +833,11 @@ footer{
         align-items: center; 
         width: 100%; 
         gap: 0;
+<<<<<<< HEAD
         height: 420px;
+=======
+        height: 450px;
+>>>>>>> 743ad030d837f526cc3767422dadb7a452dcc072
     }
 
     .carte-populaire {

diff --git a/index.html b/index.html
@@ -279,7 +279,11 @@ <h2>Activités à Marseille</h2>
                         <a href="" class="grande-carte">
                             <figure class="carte-activite">
                                 <img src="./images/activites/notre dame de la garde.jpg" alt="Îles du Frioul">
+<<<<<<< HEAD
                                 <figcaption>Notre Dame de la Garde</figcaption>
+=======
+                                <figcaption>Notre-Dame-de-la-Garde</figcaption>
+>>>>>>> 743ad030d837f526cc3767422dadb7a452dcc072
                             </figure>
                         </a>