diff --git a/Bobo.html b/Bobo.html
index a651cdecd313f79d0d4c41f98f9b0b4c4952935b..bfee3570ce176d6809e74252eee1c593e12d374a 100644
--- a/Bobo.html
+++ b/Bobo.html
@@ -97,7 +97,12 @@
<img src="images/cirque-bobo-2.jpeg" style="width:100%">
<div class="text">Caption Three</div>
</div>
-
+
+ <div class="mySlides fade">
+ <div class="numbertext">4 / 4</div>
+ <img src="images/2010/2010Promo.png" style="width:100%">
+ <div class="text">Caption Three</div>
+ </div>
<!-- Next and previous buttons -->
<a class="prev" onclick="plusSlides(-1)">❮</a>
<a class="next" onclick="plusSlides(1)">❯</a>
@@ -110,6 +115,7 @@
<span class="dot" onclick="currentSlide(2)"></span>
<span class="dot" onclick="currentSlide(3)"></span>
<span class="dot" onclick="currentSlide(4)"></span>
+ <span class="dot" onclick="currentSlide(5)"></span>
</div>
<!--Footer-->
<div class="footer">
diff --git a/README.md b/README.md
index 7e1ada3fe396fefda2a16a5c1cfc09125d29b036..7af666ced5a4fa649cf13a2d416f98a708793040 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,9 @@
# Africa Website
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.viarezo.fr/2021elkhattou/africa-website.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.viarezo.fr/2021elkhattou/africa-website/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+To do list:
+ -ajouter les logos de réseaux sociaux
+ -linkedin footer + changer mail
+ -changer photo équipe
+ -envoyer le lien nouveau projet vers nouveau projet dans équipe
+ -idem acti int / ext avec un id
+ -finir histoir asso avec pdf pauline et trouver des photos
\ No newline at end of file
diff --git a/actions.html b/actions.html
index 80c6ba375dd1aa934cd13bef77b95a2152c8944f..5fdf1677d6893664dae5fdc2dce8cafc0a35e70b 100644
--- a/actions.html
+++ b/actions.html
@@ -61,7 +61,7 @@
<div class="item">
<div class="card">
<div class="imag">
- <img src="images/logo_africaunite_fondvert.png" alt="Africa ">
+ <img src="images/patisseries-1.jpg" alt="Africa ">
</div>
<h3>Ventes de pâtisseries orientales</h3>
<p>
@@ -91,7 +91,7 @@
<div class="item">
<div class="card">
<div class="imag">
- <img src="images/logo_africaunite_fondvert.png" alt="Africa">
+ <img src="images/2022humavironfin.JPG" alt="Africa">
</div>
<h3>Semaine Huma</h3>
<p>
diff --git a/equipes.html b/equipes.html
index ee0b182e5ccb9a8be081f6769561adfbb0ff7d06..2edb7da01919337a072749d450190f8b51b4ee82 100644
--- a/equipes.html
+++ b/equipes.html
@@ -51,7 +51,7 @@
<a href="equipes/P24.html"><button> Découvrir nos différentes équipes</button></a>
</div>
<div class="column2">
- <img src="images/photoP23.JPG" alt="equipe photoP23" width="100%">
+ <img src="images/ekip.JPG" alt="equipe P23P24" width="100%">
</div>
</div>
</div>
diff --git a/equipes/P24.html b/equipes/P24.html
index 6bd071266748d373422a77e8fe4a93747dbd33f7..54c3adb452caf82c4c435bc728cb5304b26e1ed2 100644
--- a/equipes/P24.html
+++ b/equipes/P24.html
@@ -304,7 +304,7 @@
</div>
</div>
</div>
- <a href="../actions.html"><button> Découvrir le nouveau projet</button></a>
+ <a href="../nvprojet.html"><button> Découvrir le nouveau projet</button></a>
<h4>Le pôle média</h4>
<div class="row">
<div class="column3">
diff --git a/images/.DS_Store b/images/.DS_Store
index 6fb1f1a3cf5fdd5dba03a4f646792d6d22cd4b21..19a9fd15dd928c9f5cb013c2a3d7c14ee7bf7604 100644
Binary files a/images/.DS_Store and b/images/.DS_Store differ
diff --git a/images/2022humavironfin.JPG b/images/2022humavironfin.JPG
new file mode 100644
index 0000000000000000000000000000000000000000..152e3d91b5ea3ced0af7994198d66628df3e7ce3
Binary files /dev/null and b/images/2022humavironfin.JPG differ
diff --git a/images/frise-droite.jpeg b/images/frise-droite.jpeg
deleted file mode 100644
index 2e9eb0d45257e1000b9f6b98634e077f46e8a164..0000000000000000000000000000000000000000
Binary files a/images/frise-droite.jpeg and /dev/null differ
diff --git a/images/frise-gauche.jpeg b/images/frise-gauche.jpeg
deleted file mode 100644
index c266041de1faa0284ce410d227d22b28a5b577f4..0000000000000000000000000000000000000000
Binary files a/images/frise-gauche.jpeg and /dev/null differ
diff --git a/nvprojet.html b/nvprojet.html
index c6fbe14463023a3b1575c73e126b4945999c94de..55436b0580dd2f47df68f863a623b55bd97b3338 100644
--- a/nvprojet.html
+++ b/nvprojet.html
@@ -52,6 +52,8 @@
accéder à de l’eau potable. Nous essaierons de soulager les habitants du village en essayant d’apporter des
solutions d'appoint comme un récupérateur d’eau dans le centre.
</p>
+ <a href="#"><button>En savoir plus sur la mission de repérage au Sénégal</button></a>
+ <a href="#"><button>En savoir plus sur la mission de repérage en Guinée</button></a>
</div>
<div class="footer">
<div class="row">
diff --git a/styles.css b/styles.css
index e2fedc5a7d2646027601f650ed35973d7eaaf934..83b2b51bb53ec5d83b14425f36c052e2364f0df6 100644
--- a/styles.css
+++ b/styles.css
@@ -445,8 +445,36 @@ button:hover{
@keyframes fade {
from {opacity: .4}
to {opacity: 1}
-<<<<<<< HEAD
}
-=======
+.modal{
+ position: fixed;
+ left: 0;
+ top:0;
+ width:100%;
+ height: 100%;
+ background-color: none;
+ opacity: 0;
+ visibility: hidden;
+ transform: scale(1.1);
+ transition: visibility 0s linear 0.25s, opacity 0.25s 0s, transform 0.25s;
+}
+
+.modal-content{
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ background-color: wheat;
+ padding: 1rem 1.5rem;
+ width: 75%;
+ border-radius: 0.5rem;
+}
+.modal-header{
+ background-color: green;
+}
+.modal-body{
+ background-color: none;
+}
+.modal-footer{
+ background-color: green;
}
->>>>>>> ouma