Skip to content

Commit

Permalink
Merge pull request #2 from 42-AI/dev
Browse files Browse the repository at this point in the history
maperez42 authored Sep 28, 2024
2 parents f7f9ec6 + a5224a5 commit db81330
Showing 44 changed files with 24 additions and 336 deletions.
4 changes: 2 additions & 2 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -19,8 +19,8 @@ title: 42 Artificial Intelligence # the main title
tagline: # it will display as the subtitle

description: # used by seo meta and the atom feed
fr: DESCRIPTION EN FR
en: Free learning resources for python, machine learning and deep learning;
fr: Association étudiante dédiée à la découverte, à la promotion et à l'apprentissage de l'Intelligence Artificielle.
en: Free learning resources for python, machine learning and deep learning. 42 Paris student association.


# Fill in the protocol & hostname for your site.
4 changes: 2 additions & 2 deletions _includes/42ai_home.html
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@
<div class="column container" style="border-radius: 0px;">

<!-- TLDR -->
<div class="col" style="margin: 25px 15px 50px 15px">
<div class="col" style="margin: 25px 15px 50px 15px;">
<h3>{{42ai_home.welcome[lang]}}</h3>
<p class="radjani" style="margin: 15px auto 15px auto;">{{42ai_home.asso_description[lang]}}
</p>
@@ -110,7 +110,7 @@ <h3>{{ 42ai_home.quick_access.text[site.active_lang] }}</h3>
<i class="fa-brands fa-github fa-lg"></i>&emsp;{{ 42ai_home.quick_access.gh_link[site.active_lang] }}</a>
</li>
<li class="hoverableLink"><a href="/42students/">
<image src="/assets/img/src/logo_42.png" style="width: 20px;"></image>&emsp;{{ 42ai_home.quick_access.42studs_link[site.active_lang] }}
<image src="/assets/img/partners/logo_42.png" style="width: 20px;"></image>&emsp;{{ 42ai_home.quick_access.42studs_link[site.active_lang] }}
</a>
</li>
<li class="hoverableLink"><a href="/contact">
8 changes: 2 additions & 6 deletions _includes/topbar.html
Original file line number Diff line number Diff line change
@@ -46,13 +46,9 @@
<i class="fas fa-bars fa-fw"></i>
</button>

<!-- <h2 class="d-sm-none radjani" id="topbar-title" style="display: flex;
font-family: roboto; color: red; margin-top: 10px;"> -->
<!-- 42AI modif -->
<h2 class="d-sm-none" style="color: red; margin: 13px 25px 10px auto; width: 90%;">
42 Artificial Intelligence

</h2>
<h2 class="d-xs-block d-sm-none radjani" style="color: rgb(179, 93, 93); margin: 13px auto 10px 15px; font-weight: bold; width: max-content;">
42 Artificial Intelligence</h2>
<!-- {% if page.layout == 'home' %}
{{- site.data.locales[site.active_lang].title | default: site.title -}}
{% elsif page.collection == 'tabs' or page.layout == 'page' %}
23 changes: 12 additions & 11 deletions _includes/update-list.html
Original file line number Diff line number Diff line change
@@ -34,18 +34,19 @@ <h2 class="panel-heading">{{- site.data.locales[site.active_lang].panel.lastmod
<a style="font-size: 14px" href="{{ url }}">{{ post.title }}</a>
</li>
{% endfor %}
<!-- Ajout 42AI -->
<a href="/categories">
<button class="post-tag btn btn-outline-primary" style="background-color: lightgrey; margin-top: 15px;
border-radius: 5px; font-family: roboto;">
{% if site.active_lang == 'fr' %}Voir tous les posts
{% elsif site.active_lang == 'en' %}See all posts
{% endif %}
</button>

</a>
<!-- //Ajout 42AI -->

</ul>
<!-- Ajout 42AI -->
<a href="/categories">
<button class="post-tag btn btn-outline-primary" style="background-color: lightgrey; margin-top: 05px;
border-radius: 5px; font-family: roboto;">
{% if site.active_lang == 'fr' %}Voir tous les posts
{% elsif site.active_lang == 'en' %}See all posts
{% endif %}
</button>

</a>
<!-- //Ajout 42AI -->

</section>
<!-- #access-lastmod -->
2 changes: 1 addition & 1 deletion _layouts/home.html
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
{% assign default = site.posts | where_exp: 'item', 'item.pin != true and item.hidden != true' %}

<div style="height: 128px;" class="d-none d-sm-block">
<img src="/assets/img/banners/banner2.svg" style="height: auto;"></img>
<img src="/assets/img/banners/home_banner.svg" style="height: auto;"></img>
</div>

<body>
2 changes: 1 addition & 1 deletion _posts/2024-06-18-AI-in-Paris.md
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ categories: [Événements,Collaborations,Entrepreneuriat,Conférences]
tags: [Événements,Collaborations,Entrepreneuriat,Conférences] # TAG names should always be lowercase
description: "Startup Pizza Night AI Special"
image:
path: /assets/img/src/events/aiInParis.png
path: /assets/img/events/aiInParis.png
---

Fruit d'une première collaboration entre 42AI, 42Entrepreneurs et la Paris AI Society, la soirée "AI in Paris" a rassemblé plus de 200 personnes, étudiants et externes, venus écouter des témoignages d'entrepreneurs et échanger autour de pizzas !
2 changes: 1 addition & 1 deletion _tabs/42students-en.md
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ description:
{% assign template_variables = site.data.locales["tabs"]['42students']['students'] %}
{% assign lang = page.lang %}

![42AI banniere](/assets/img/banners/banner_black_op60.png){: width="100%";height="auto" }
![42AI banniere](/assets/img/banners/banner_black_00.png){: width="100%";height="auto" }

## {{template_variables.who_adhesion.title[lang] }}

2 changes: 1 addition & 1 deletion _tabs/42students.md
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ description:
{% assign template_variables = site.data.locales["tabs"]['42students']['students'] %}
{% assign lang = page.lang %}

![42AI banniere](/assets/img/banners/banner_black_op60.png){: width="100%";height="auto" }
![42AI banniere](/assets/img/banners/banner_black_00.png){: width="100%";height="auto" }

## {{template_variables.who_adhesion.title[lang] }}

2 changes: 1 addition & 1 deletion _tabs/about-en.md
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ description:

{{ template_variables.intro[lang]}}

![Historique logos 42AI](/assets/img/banners/banner_logos.png){: width="100%" height="auto" }
![Historique logos 42AI](/assets/img/banners/banner_legacy_logos.png){: width="100%" height="auto" }

## {{ template_variables.social_object.title[lang]}}

2 changes: 1 addition & 1 deletion _tabs/about.md
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ description:

{{ template_variables.intro[lang]}}

![Historique logos 42AI](/assets/img/banners/banner_logos.png){: width="100%" height="auto" }
![Historique logos 42AI](/assets/img/banners/banner_legacy_logos.png){: width="100%" height="auto" }

## {{ template_variables.social_object.title[lang]}}

309 changes: 0 additions & 309 deletions assets/img/banners/banner.svg

This file was deleted.

File renamed without changes
File renamed without changes
Binary file removed assets/img/banners/banner_short.png
Binary file not shown.
Binary file removed assets/img/banners/banner_sm.png
Binary file not shown.
File renamed without changes
File renamed without changes
Binary file removed assets/img/logo/logo_rb_lettering.png
Binary file not shown.
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed assets/img/posts/banner_post_blog.png
Binary file not shown.
Binary file removed assets/img/posts/banner_post_code.png
Binary file not shown.
Binary file removed assets/img/posts/banner_post_event.png
Binary file not shown.
Binary file removed assets/img/posts/banner_post_event2.png
Binary file not shown.
Binary file removed assets/img/posts/banner_post_news.png
Binary file not shown.
Binary file removed assets/img/posts/banner_post_news_op2.png
Binary file not shown.
Binary file removed assets/img/src/banner_2.png
Binary file not shown.
Binary file removed assets/img/src/banner_black.png
Binary file not shown.
Binary file removed assets/img/src/banner_clear.png
Binary file not shown.
Binary file removed assets/img/src/banner_clear_2.png
Binary file not shown.
Binary file removed assets/img/src/banner_clear_3.png
Binary file not shown.
Binary file removed assets/img/src/banner_dark_3.png
Binary file not shown.
Binary file removed assets/img/src/black_red_squared.png
Binary file not shown.
Binary file removed assets/img/src/github.png
Binary file not shown.
Binary file removed assets/img/src/maperez42.png
Diff not rendered.
Binary file removed assets/img/src/partners/datacraft.jpeg
Diff not rendered.
Binary file removed assets/img/src/post_banner_news.png
Diff not rendered.
Binary file removed assets/img/src/post_banner_news2.png
Diff not rendered.
Binary file removed assets/img/src/post_banner_news3.png
Diff not rendered.
Binary file removed assets/img/src/post_banner_news4.png
Diff not rendered.
Binary file removed assets/img/src/post_banner_news5.png
Diff not rendered.
Binary file removed assets/img/src/post_banner_news6.png
Diff not rendered.
Binary file removed assets/img/src/test.png
Diff not rendered.

0 comments on commit db81330

Please sign in to comment.