diff --git a/assets/profiles/aurelien.jpg b/assets/profiles/aurelien.jpg new file mode 100644 index 0000000..41f591e Binary files /dev/null and b/assets/profiles/aurelien.jpg differ diff --git a/assets/profiles/camille.jpg b/assets/profiles/camille.jpg new file mode 100644 index 0000000..519694a Binary files /dev/null and b/assets/profiles/camille.jpg differ diff --git a/assets/profiles/damien.jpg b/assets/profiles/damien.jpg new file mode 100644 index 0000000..9100f05 Binary files /dev/null and b/assets/profiles/damien.jpg differ diff --git a/assets/profiles/elina.jpg b/assets/profiles/elina.jpg new file mode 100644 index 0000000..0678e99 Binary files /dev/null and b/assets/profiles/elina.jpg differ diff --git a/assets/profiles/franck.jpg b/assets/profiles/franck.jpg new file mode 100644 index 0000000..d8a109f Binary files /dev/null and b/assets/profiles/franck.jpg differ diff --git a/assets/profiles/francois.jpg b/assets/profiles/francois.jpg new file mode 100644 index 0000000..a92920c Binary files /dev/null and b/assets/profiles/francois.jpg differ diff --git a/assets/profiles/getImage.sh b/assets/profiles/getImage.sh new file mode 100644 index 0000000..5141bdd --- /dev/null +++ b/assets/profiles/getImage.sh @@ -0,0 +1 @@ +curl $1 -o "$2.jpg" diff --git a/assets/profiles/hadrien.jpg b/assets/profiles/hadrien.jpg new file mode 100644 index 0000000..d5b4525 Binary files /dev/null and b/assets/profiles/hadrien.jpg differ diff --git a/assets/profiles/houda.jpg b/assets/profiles/houda.jpg new file mode 100644 index 0000000..fa175a9 Binary files /dev/null and b/assets/profiles/houda.jpg differ diff --git a/assets/profiles/katia.jpg b/assets/profiles/katia.jpg new file mode 100644 index 0000000..3a548d5 Binary files /dev/null and b/assets/profiles/katia.jpg differ diff --git a/assets/profiles/louise.jpg b/assets/profiles/louise.jpg new file mode 100644 index 0000000..c73fb4a Binary files /dev/null and b/assets/profiles/louise.jpg differ diff --git a/assets/profiles/lucy.jpg b/assets/profiles/lucy.jpg new file mode 100644 index 0000000..184b38a Binary files /dev/null and b/assets/profiles/lucy.jpg differ diff --git a/assets/profiles/mathieu.jpg b/assets/profiles/mathieu.jpg new file mode 100644 index 0000000..74b0a2d Binary files /dev/null and b/assets/profiles/mathieu.jpg differ diff --git a/assets/profiles/mathis.jpg b/assets/profiles/mathis.jpg new file mode 100644 index 0000000..27a4096 Binary files /dev/null and b/assets/profiles/mathis.jpg differ diff --git a/assets/profiles/matthieu.jpg b/assets/profiles/matthieu.jpg new file mode 100644 index 0000000..e104df4 Binary files /dev/null and b/assets/profiles/matthieu.jpg differ diff --git a/assets/profiles/mohamed.jpg b/assets/profiles/mohamed.jpg new file mode 100644 index 0000000..505b2a4 Binary files /dev/null and b/assets/profiles/mohamed.jpg differ diff --git a/assets/profiles/nadege.jpg b/assets/profiles/nadege.jpg new file mode 100644 index 0000000..181d911 Binary files /dev/null and b/assets/profiles/nadege.jpg differ diff --git a/assets/profiles/pierrick.jpg b/assets/profiles/pierrick.jpg new file mode 100644 index 0000000..a0f13e7 Binary files /dev/null and b/assets/profiles/pierrick.jpg differ diff --git a/assets/profiles/quentin.jpg b/assets/profiles/quentin.jpg new file mode 100644 index 0000000..8455821 Binary files /dev/null and b/assets/profiles/quentin.jpg differ diff --git a/assets/profiles/timothe.jpg b/assets/profiles/timothe.jpg new file mode 100644 index 0000000..19611fc Binary files /dev/null and b/assets/profiles/timothe.jpg differ diff --git a/assets/profiles/unknown.png b/assets/profiles/unknown.png new file mode 100644 index 0000000..8488e03 Binary files /dev/null and b/assets/profiles/unknown.png differ diff --git a/assets/scss/layouts/team.scss b/assets/scss/layouts/team.scss index 08f1653..c9bc7f8 100644 --- a/assets/scss/layouts/team.scss +++ b/assets/scss/layouts/team.scss @@ -22,7 +22,15 @@ overflow: hidden; img { width: auto; + width:100%!important; + object-fit: cover; height: 10em; + border-radius:10px; + &#noncover{ + background:#e1e1e1; + width:auto; + object-fit: contain; + } } } .team-item-description { diff --git a/assets/scss/main.scss b/assets/scss/main.scss index dd2f702..0cc1ef7 100644 --- a/assets/scss/main.scss +++ b/assets/scss/main.scss @@ -29,3 +29,31 @@ $responsive-large: 1500px; @import "layouts/transitions"; @import "layouts/contact-card"; @import "layouts/map"; + +/* ===== Scrollbar CSS ===== */ + /* Firefox */ +// * { +// scrollbar-width: thin; +// scrollbar-color: #2980b9 #c7c7c7; +// } + + /* Chrome, Edge, and Safari */ + *::-webkit-scrollbar { + width: 10px; + z-index: 10; + right:0; + } + + *::-webkit-scrollbar-track { + display: none; + } + *::-webkit-scrollbar-track-piece{ + display: none; + } + *::-webkit-scrollbar-thumb { + background: #3498db; + border-radius: 5px; + } + *::-webkit-scrollbar-thumb:hover{ + background: #2980b9; + } \ No newline at end of file diff --git a/content/about.en.md b/content/about.en.md index d069848..c7fa41b 100644 --- a/content/about.en.md +++ b/content/about.en.md @@ -12,7 +12,7 @@ After three months spent building, training and communicating, we finally met th ### 2017-2018 season
- Our old logo + Our old logo
We participated in two competitions : @@ -51,137 +51,14 @@ This year, the workshop at the community center only occurred sporadically as it ## Our team -
-
-
- avatar -
-

Franck

-

President, Coach

-
- -
-
- avatar -
-

François

-

Treasurer, Coach

-
- -
-
- avatar -
-

Katia

-

Secretary

-
- -
-
- avatar -
-

Matthieu

-

Alumni, Coach

-
- -
-
- avatar -
-

Mohamed

-

Alumni, Coach

-
+{{}}
-## They support us +## [They support us](/partners) -
-
-
- -
-
- Since October 2017, the GIGA supports us. We presented them our organization in their general assembly and have had a great financial support from them for our travels ans purchase of equipment. -
-
- -
- - - -
-
- During the 2018-2019 season , la Papavoine carpentry helped us build most of the game elements for our table. -
-
-
-
- - - -
-
- Since november 2018, the Groupement Interprofessionnel de la Région de Vernon trusts us and allowed us to meet new partners. We were able to present our non-profit during both their trade show and their general assembly in december. They also helped to buy us a 3D printer in february 2019. -
-
-
-
- - - -
- Ariane Group Vernon helped to buy us a 3D printer in february 2019. -
-
- -
- - - -
- At the beginning of the 2017-2018 season, the city hall of Gaillon granted us a small subsidy. - Since april 2019, it lends us a wide venue to host our activities. -
-
-
- - - -
- SKF Vernon helped to buy us a 3D printer in february 2019. -
-
-
- - - -
- Helps us since april 2019. They already gave us 2 Raspberry Pi 3B+ and some computers. -
-
-
+{{}}
@@ -194,5 +71,7 @@ We have premises offered by the city of Gaillon to host our activities. There ar
+{{}}
+ diff --git a/content/about.md b/content/about.md index f9c59fc..2faed3d 100644 --- a/content/about.md +++ b/content/about.md @@ -12,7 +12,7 @@ Après trois mois de préparation et de communication, nous rencontrons les 156 ### Saison 2017-2018
- Notre ancien logo + Notre ancien logo
Nous avons participé à deux compétitions cette année : diff --git a/content/partners.en.md b/content/partners.en.md new file mode 100644 index 0000000..899952b --- /dev/null +++ b/content/partners.en.md @@ -0,0 +1,5 @@ +--- +title: "They support us" +--- +{{}} +{{}} \ No newline at end of file diff --git a/content/partners.md b/content/partners.md index 2c107ce..fbe7865 100644 --- a/content/partners.md +++ b/content/partners.md @@ -2,3 +2,4 @@ title: "Ils nous soutiennent" --- {{}} +{{}} \ No newline at end of file diff --git a/data/members.yaml b/data/members.yaml index d959ebd..d68adf0 100644 --- a/data/members.yaml +++ b/data/members.yaml @@ -1,19 +1,64 @@ members: - - img: "/proxyPhotos?code=profiles/franck.jpg" + - img: "franck" name: "Franck" - post: "Président de l'association, Coach" - - img: "/proxyPhotos?code=profiles/francois.jpg" + post: "Président de l'association, Mentor" + posten: "President, Mentor" + - img: "francois" name: "François" - post: "Trésorier de l'association, Coach" - - img: "/proxyPhotos?code=profiles/katia.jpg" - name: "Katia" - post: "Secrétaire" - - img: "/proxyPhotos?code=profiles/mathis.jpg" - name: "Mathis" - post: "Trophées, Astro-Pi, atelier de robotique" - - img: "/proxyPhotos?code=profiles/matthieu.jpg" + post: "Trésorier de l'association, Mentor" + posten: "Treasurer, Mentor" + # - img: "katia" + # name: "Katia" + # post: "Secrétaire" + # imgnoncover: true + - img: "matthieu" name: "Matthieu" - post: "Trophées, Astro-Pi, Communication" - - img: "/proxyPhotos?code=profiles/mohamed.jpg" + post: "Alumni, Mentor" + - img: "mohamed" name: "Mohamed" - post: "Trophées, Astro-Pi, Communication" + post: "Alumni, Mentor" + - img: "damien" + name: "Damien" + post: "Parent, Mentor" + - img: "nadege" + name: "Nadège" + post: "Parent, Mentor" + - img: "aurelien" + name: "Aurélien" + post: "Programmation" + - img: "elina" + name: "Elina" + post: "Programmation" + - img: "lucy" + name: "Lucy" + post: "Communication" + - img: "timothe" + name: "Timothe" + post: "Communication" + - img: "louise" + name: "Louise" + post: "Communication" + - img: "unknown" + imgpng: true + name: "Léane" + post: "Communication" + - img: "quentin" + name: "Quentin" + post: "Robotique" + posten: "Robotic" + - img: "pierrick" + name: "Pierrick" + post: "Robotique" + posten: "Robotic" + - img: "hadrien" + name: "Hadrien" + post: "Robotique" + posten: "Robotic" + - img: "houda" + name: "Houda" + post: "Robotique" + posten: "Robotic" + - img: "camille" + name: "Camille" + post: "Robotique" + posten: "Robotic" \ No newline at end of file diff --git a/layouts/shortcodes/members.html b/layouts/shortcodes/members.html index 6d858a8..ccebde1 100644 --- a/layouts/shortcodes/members.html +++ b/layouts/shortcodes/members.html @@ -1,9 +1,9 @@
{{ range .Site.Data.members.members }}
-
avatar
+
avatar

{{ .name }}

-

{{ .post }}

+

{{ if (and .descriptionen (eq .Lang "en")) }}{{ .posten }}{{ else }}{{ .post }}{{ end }}

{{ end }}
diff --git a/layouts/shortcodes/partners.html b/layouts/shortcodes/partners.html index ab7853d..123a077 100644 --- a/layouts/shortcodes/partners.html +++ b/layouts/shortcodes/partners.html @@ -5,7 +5,7 @@
- {{ .description | safeHTML }} + {{ if (and .descriptionen (eq .Lang "en")) }}{{ .descriptionen | safeHTML }}{{ else }}{{ .description | safeHTML}}{{ end }}
{{ end }} diff --git a/layouts/shortcodes/slippy-map.html b/layouts/shortcodes/slippy-map.html index 43d015d..7d7d8ef 100644 --- a/layouts/shortcodes/slippy-map.html +++ b/layouts/shortcodes/slippy-map.html @@ -1,4 +1,5 @@ -
+ +