diff --git a/config.toml b/config.toml index 19c777d5..c3729df8 100644 --- a/config.toml +++ b/config.toml @@ -11,25 +11,30 @@ baseURL = 'https://cedille.etsmtl.ca' url = "/" weight = 1 [[menu.main]] - identifier = "equipe" + identifier = "a-propos" name = "À propos" - url = "/equipe/" + url = "/a-propos/" weight = 2 + [[menu.main]] + identifier = "equipe" + name = "Équipe" + url = "/equipe/" + weight = 3 [[menu.main]] identifier = "projets" name = "Projets" url = "/projets/" - weight = 3 - [[menu.main]] + weight = 4 + [[menu.main]] identifier = "partenaires" name = "Partenaires" url = "/partenaires/" - weight = 4 + weight = 5 [[menu.main]] identifier = "contact" name = "Joignez l'équipe" url = "/contact/" - weight = 5 + weight = 6 [params] titleFollowUs = "Suivez-nous" diff --git a/content/a-propos/a-propos.md b/content/a-propos/a-propos.md new file mode 100644 index 00000000..c37ca865 --- /dev/null +++ b/content/a-propos/a-propos.md @@ -0,0 +1,6 @@ +--- +title: "À Propos" +date: 2024-05-11T08:20:10-04:00 +draft: false +--- + diff --git a/data/description.yml b/data/description.yml index 03c7a156..cbc828cf 100644 --- a/data/description.yml +++ b/data/description.yml @@ -13,10 +13,10 @@ network: subtitle: "Le pouvoir du réseautage" summary: "Chez Cédille, nos membres bénéficient d'une expérience de réseautage enrichissante et fluide grâce à notre variété d'événements sociaux captivants, tels que des ateliers, conférences et rencontres de réseautage animés par des experts chevronnés de l'industrie. Ils élargissent leur réseau professionnel, découvrent des perspectives uniques et restent à jour avec les tendances du secteur. Parfois, il arrive même que nous facilitions des opportunités de carrière exceptionnelles pour un développement professionnel optimal." members: - # - name: "Thomas Cardin" - # image: "images/membres/tcardin.jpg" - # text: "L'expérience que j'ai acquise en intégrant le Club CEDILLE a eu un impact significatif sur ma trajectoire professionnelle. Grâce à leur expertise en DevOps et à une panoplie d'activités pratiques, j'ai pu décrocher un stage en tant qu'ingénieur de fiabilité du site (SRE). Je recommande fortement le Club pour toute personne désireuse de transformer son apprentissage en opportunités concrètes." - # - name: "Simon Boyer" - # image: "images/membres/simon-boyer.jpg" - # text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla, ut commodo diam libero." + - name: "Thomas Cardin" + image: "images/membres/tcardin.jpg" + text: "L'expérience que j'ai acquise en intégrant le Club CEDILLE a eu un impact significatif sur ma trajectoire professionnelle. Grâce à leur expertise en DevOps et à une panoplie d'activités pratiques, j'ai pu décrocher un stage en tant qu'ingénieur de fiabilité du site (SRE). Je recommande fortement le Club pour toute personne désireuse de transformer son apprentissage en opportunités concrètes." + - name: "Simon Boyer" + image: "images/membres/simon-boyer.jpg" + text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse varius enim in eros elementum tristique. Duis cursus, mi quis viverra ornare, eros dolor interdum nulla, ut commodo diam libero." --- \ No newline at end of file diff --git a/data/membres.yml b/data/equipe.yml similarity index 70% rename from data/membres.yml rename to data/equipe.yml index 4cb75fbc..2441d5da 100644 --- a/data/membres.yml +++ b/data/equipe.yml @@ -1,6 +1,9 @@ --- enable: true -title: "nos membres" +title: "Équipe" +button: + becomingMember: "Devenir membre" + url: "/contact" membres: - name: "Jonathan Lopez" post: "Capitaine" @@ -14,28 +17,28 @@ membres: - name: "Thomas Cardin" post: "Co-Capitaine" social: - - title: linkedin - url: "https://ca.linkedin.com/in/thomas-cardin-349056185" - - title: github - url: "https://github.com/ThomasCardin" + - title: github + url: "https://github.com/ThomasCardin" + - title: linkedin + url: "https://ca.linkedin.com/in/thomas-cardin-349056185" image: "images/membres/tcardin.jpg" - name: "Simon Boyer" post: "Trésorier" social: - - title: linkedin - url: "https://www.linkedin.com/in/simon-boyer" - - title: github - url: "https://github.com/Simon-Boyer" + - title: github + url: "https://github.com/Simon-Boyer" + - title: linkedin + url: "https://www.linkedin.com/in/simon-boyer" image: "images/membres/simon-boyer.jpg" - name: "Roch D'amour" post: "Membre" social: - - title: linkedin - url: "https://www.linkedin.com/in/notarock/" - title: github url: "https://github.com/notarock" + - title: linkedin + url: "https://www.linkedin.com/in/notarock/" image: "images/membres/Roch.jpg" - name: "guyllaume" @@ -48,18 +51,18 @@ membres: - name: "Edvin Honda" post: "Membre" social: + - title: github + url: "https://github.com/EdvinHonda" - title: linkedin url: "https://www.linkedin.com/in/edvin-honda-00b941220/" - - title: github - url: "https://github.com/EdvinHonda " - name: "Bayes Diarra" post: "Membre" social: + - title: github + url: "https://github.com/bayes-diarra" - title: linkedin url: "https://www.linkedin.com/in/bayes-diarra-b67537177" - - title: github - url: "https://github.com/bayes-diarra " - name: "Bryan Ndjeutcha" post: "Membre" diff --git a/themes/cedille/layouts/_default/baseof.html b/themes/cedille/layouts/_default/baseof.html index 1d0120b4..402fc358 100644 --- a/themes/cedille/layouts/_default/baseof.html +++ b/themes/cedille/layouts/_default/baseof.html @@ -3,9 +3,6 @@ {{- partial "head.html" . -}}
- {{ if in .Name "Accueil" }} - {{ partial "notification.html" . }} - {{ end }} {{- partial "header.html" . -}}
{{- block "main" . }}{{- end }} diff --git a/themes/cedille/layouts/a-propos/list.html b/themes/cedille/layouts/a-propos/list.html new file mode 100644 index 00000000..d58a6cc9 --- /dev/null +++ b/themes/cedille/layouts/a-propos/list.html @@ -0,0 +1,7 @@ +{{ define "main"}} +
+
+ {{ partial "aboutUs.html" . }} +
+
+{{end}} \ No newline at end of file diff --git a/themes/cedille/layouts/equipe/list.html b/themes/cedille/layouts/equipe/list.html index c849c529..a9d7dbbb 100644 --- a/themes/cedille/layouts/equipe/list.html +++ b/themes/cedille/layouts/equipe/list.html @@ -1,36 +1,7 @@ -{{ define "main"}} -
-
- {{ partial "aboutUs.html" . }} -
-
-{{/*
- - {{ partial "membres.html" . }} -
*/}} +{{ define "main"}} +
+
+ {{ partial "equipe.html" . }} +
+
{{end}} \ No newline at end of file diff --git a/themes/cedille/layouts/partials/description.html b/themes/cedille/layouts/partials/description.html index 580d6e13..23e0ecfd 100644 --- a/themes/cedille/layouts/partials/description.html +++ b/themes/cedille/layouts/partials/description.html @@ -54,7 +54,7 @@

{{ .network.title }}

-
+
{{ range .network.members }}
diff --git a/themes/cedille/layouts/partials/equipe.html b/themes/cedille/layouts/partials/equipe.html new file mode 100644 index 00000000..61f8f967 --- /dev/null +++ b/themes/cedille/layouts/partials/equipe.html @@ -0,0 +1,54 @@ +{{ with .Site.Data.equipe}} +{{ if .enable}} +
+

{{ .title }}

+
+ + +
+
+
+ {{ range .membres}} +
+
+
+ {{ if .image }} + {{.name}} + {{ else }} + {{.name}} + {{ end }} +
+
+

{{.name}}

+
{{.post}}
+
+ {{ if .social }} +
+ +
+ {{ end }} +
+
+ {{end}} +
+
+
+ + +
+
+
+
+
+ {{ .button.becomingMember }} +
+
+
+
+
+{{end}} +{{end}} diff --git a/themes/cedille/layouts/partials/header.html b/themes/cedille/layouts/partials/header.html index 747199e8..e97cf2c0 100644 --- a/themes/cedille/layouts/partials/header.html +++ b/themes/cedille/layouts/partials/header.html @@ -22,7 +22,8 @@ {{ range .Site.Menus.main }} {{ $active := or ($current.IsMenuCurrent "main" .) ($current.HasMenuCurrent "main" .) }} {{ $active = or $active (eq .Name $current.Title) }} - {{ $active = or $active (and (eq .Name "Équipe") (eq $current.Section "equipe")) }} + {{ $active = or $active (and (eq .Name "À propos") (eq $current.Section "a-propos")) }} + {{ $active = or $active (and (eq .Name "Équipe") (eq $current.Section "equipe")) }} {{ $active = or $active (and (eq .Name "Projets") ( eq $current.Section "projets")) }} {{ $active = or $active (and (eq .Name "Partenaires") (eq $current.Section "partenaires")) }} {{ $active = or $active (and (eq .Name "Joignez l'équipe") (eq $current.Section "contact")) }} diff --git a/themes/cedille/layouts/partials/hero.html b/themes/cedille/layouts/partials/hero.html index 3feef8b0..bc0f3bac 100644 --- a/themes/cedille/layouts/partials/hero.html +++ b/themes/cedille/layouts/partials/hero.html @@ -5,7 +5,7 @@
- logo-cedille + logo-cedille
diff --git a/themes/cedille/layouts/partials/introduction.html b/themes/cedille/layouts/partials/introduction.html index 4e328486..b00da92f 100644 --- a/themes/cedille/layouts/partials/introduction.html +++ b/themes/cedille/layouts/partials/introduction.html @@ -2,8 +2,8 @@ {{ if .enable }}
-
-
+
+

{{ .practice.subtitle | upper }}

{{ .practice.title }}

@@ -14,7 +14,7 @@

{{ .practice.title }}

-
+
{{ range .practice.content }}
diff --git a/themes/cedille/layouts/partials/membres.html b/themes/cedille/layouts/partials/membres.html deleted file mode 100644 index 74b299da..00000000 --- a/themes/cedille/layouts/partials/membres.html +++ /dev/null @@ -1,50 +0,0 @@ -{{ with .Site.Data.membres}} -{{ if .enable}} -
-
-

{{ .title }}

-
- {{ range .membres}} -
-
-
- {{ if .image }} - {{.name}} - {{ else }} - {{.name}} - {{ end }} - {{ if .social }} -
- -
- {{ end }} -
-
-

{{.name}}

-
{{.post}}
-
-
-
- {{end}} -
-
-
-
-
-
-
-
-

Devenir membre

 -
-
-
-
-
-{{end}} -{{end}} diff --git a/themes/cedille/layouts/partials/motivation.html b/themes/cedille/layouts/partials/motivation.html index 9f71627a..e75d718f 100644 --- a/themes/cedille/layouts/partials/motivation.html +++ b/themes/cedille/layouts/partials/motivation.html @@ -3,7 +3,7 @@
-
+

{{ .subtitle | upper }}

{{ .title }}

diff --git a/themes/cedille/static/css/styles.css b/themes/cedille/static/css/styles.css index 659bfda6..e7c0c857 100644 --- a/themes/cedille/static/css/styles.css +++ b/themes/cedille/static/css/styles.css @@ -552,186 +552,6 @@ header{ /*---------- Fin partenaires ----------*/ - - - -/*--------------------------------- Début équipe ---------------------------------------*/ -.equipe{ - min-height: 100vh; -} - -.equipe .members{ - margin-top: 30px; - margin-bottom: 40px; -} - -.equipe .members h3{ - margin-top: 10px; - margin-bottom: 40px; - display: flex; - border-bottom: solid 2px grey; -} - -.equipe .img-container{ - position: relative; - border-radius: 100%; - margin: 0px 100px; -} -.equipe .img-container img{ - width: 13.5rem; - height: 13.5rem; - border-radius: 100%; - opacity: 1; - transition: .5s ease; - backface-visibility: hidden; - -} - -.equipe .img-container .middle{ - opacity: 0; - position: absolute; - transition: .5s ease; - top: 50%; - left: 52%; - transform: translate(-50%, -50%); - -ms-transform: translate(-50%, -50%); -} - -.equipe .img-container:hover img{ - opacity: 0.3; -} - -.equipe .img-container:hover .middle{ - opacity: 1; -} - -.equipe .img-container .middle .social-links a{ - background-color: rgba(255, 166, 0, 0.748); - transition: transform ease 0.5s; - border-radius: 100%; - padding: 0.6rem; - color: rgba(242, 238, 238, 0.941); -} - -.equipe .img-container .middle .social-links a:hover{ - color: rgba(255, 166, 0, 0.748); - background-color: rgb(221, 207, 207); -} - -.equipe .becoming-member{ - padding: 20px 0px; -} - -.equipe .becoming-member .panel { - display: flex; - justify-content: center; -} - -.equipe .becoming-member .panel a { - border-radius: 15px; - background-color: rgb(191, 189, 189); - padding: 25px 30px; - text-decoration: none; - color: black; - transition: box-shadow .2s; -} - -.equipe .becoming-member .panel a:hover { - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.285); -} - -@media screen and (max-width:1399.5px){ - .equipe .img-container{ - margin: 0px 70px; - } -} - -@media screen and (max-width:1199.5px){ - .equipe .img-container{ - margin: 0px 40px; - } -} - -@media screen and (max-width:991.5px){ - .equipe .img-container{ - margin: 0px 0px; - } -} - -@media screen and (max-width:767.5px){ - .equipe .img-container{ - margin: 0px 15px; - } -} - -@media screen and (max-width:575.5px){ - .equipe .img-container{ - margin: 0px 167px; - } - - .equipe .img-container .middle{ - left: 56%; - } - - .equipe .img-container .middle .social-links a{ - margin: 0px 5px; - } -} - -@media screen and (max-width:541px){ - .equipe .img-container{ - margin: 0px 150px; - } -} - -@media screen and (max-width:426px){ - .equipe .img-container{ - margin: 0px 94px; - } -} - -@media screen and (max-width:414.5px){ - .equipe .img-container{ - margin: 0px 88px; - } -} - -@media screen and (max-width:394px){ - .equipe .img-container{ - margin: 0px 76.5px; - } -} - -@media screen and (max-width:390.5px){ - .equipe .img-container{ - margin: 0px 75px; - } -} - -@media screen and (max-width:375.5px){ - .equipe .img-container{ - margin: 0px 67px; - } -} - -@media screen and (max-width:360.5px){ - .equipe .img-container{ - margin: 0px 60px; - } -} - -@media screen and (max-width:320.5px){ - .equipe .img-container{ - margin: 0px 40px; - } -} - -@media screen and (max-width:281px){ - .equipe .img-container{ - margin: 0px 20px; - } -} - /*------------- CONTACT PAGE ------------*/ .contact{ min-height: 100vh; @@ -1026,32 +846,23 @@ header{ background-color: black; } /*---------------- TEAM PAGE ---------------- */ -.equipe .carousel-indicators button{ - width: 10px; - height: 10px; - border-radius: 100%; -} - -.equipe .becoming-member{ - padding: 50px 0px; +.team-section .social-links a{ + color: black; } -.equipe .panel { - display: flex; - justify-content: center; +.team-section .social-links a:hover{ + color: rgb(89, 89, 89); } -.equipe .panel a { - border-radius: 15px; - background-color: rgb(191, 189, 189); - padding: 35px 30px; - text-decoration: none; - color: black; - transition: box-shadow .2s; +.team-section .becoming-member .btn { + border: 1px solid black !important; + border-radius: 0 !important; + transition: all 0.4s ease-in-out; } -.equipe .panel a:hover { - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.285); +.team-section .becoming-member .btn:hover{ + color: rgba(255, 166, 0, 0.748); + background-color: black; } /*---------------------- PARTNERSHIP PAGE -----------------*/