Skip to content

Commit 3a15e4f

Browse files
authored
Merge pull request #310 from scala/fix-team-page
change team members
2 parents 65852a5 + bc0b921 commit 3a15e4f

File tree

11 files changed

+39
-16
lines changed

11 files changed

+39
-16
lines changed

_contact/06-dotty.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
label: dotty
3-
name: Dotty
3+
name: Scala 3 Compiler
44
link: http://dotty.epfl.ch/
5-
---
5+
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
label: fundraising
3+
name: Fundraising
4+
link:
5+
---

_data/team-members.yml

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ members:
3333
github: sjrd
3434
twitter: sjrdoeraene
3535
photo: /resources/img/sjrd.png
36-
contact_for: [scalajs, scalaNative]
36+
contact_for: [scalajs]
3737
active: true
3838
- member: vincent
3939
name: Vincent Derouand
@@ -103,7 +103,7 @@ members:
103103
twitter:
104104
photo: /resources/img/sylvie.png
105105
contact_for: [scalaCenterActivities]
106-
active: true
106+
active: false
107107
- member: heather
108108
name: Heather Miller
109109
title: Executive Director
@@ -129,7 +129,7 @@ members:
129129
github: bishabosha
130130
twitter: bishabosha
131131
photo: /resources/img/jamiethompson.png
132-
contact_for: [tastyScala2, enumFinalisation]
132+
contact_for: [tastyScala2, dotty]
133133
active: true
134134
- member: ergys
135135
name: Ergys Dona
@@ -174,7 +174,7 @@ members:
174174
github: anatoliykmetyuk
175175
twitter: akmetiuk
176176
photo: /resources/img/toli.png
177-
contact_for: []
177+
contact_for: [communication]
178178
active: true
179179
- member: wmazur
180180
name: Wojciech Mazur
@@ -233,16 +233,34 @@ members:
233233
github: ckipp01
234234
photo: /resources/img/chris-kipp.webp
235235
contact_for: [bloop,metals]
236-
active: true
236+
active: false
237237
- member: johanna
238238
name: Johanna Reichen
239239
title: Operations Officer & Strategy Advisor
240240
email: johanna.reichen@epfl.ch
241241
github: reichenjohanna
242-
twitter:
242+
twitter:
243243
photo: /resources/img/johanna.jpeg
244244
contact_for: [communication]
245245
active: false
246+
- member: shiv
247+
name: Shiv Verkaran
248+
title: Fundraising Officer
249+
email: shiv.verkaran@epfl.ch
250+
github: null
251+
twitter:
252+
photo: /resources/img/shiv.png
253+
contact_for: [fundraising]
254+
active: true
255+
- member: valerie-m
256+
name: Valerie Meillaud
257+
title: Administrative Specialist
258+
email: valerie.meillaud@epfl.ch
259+
github:
260+
twitter:
261+
photo: /resources/img/valerie-m.png
262+
contact_for: [scalaCenterActivities]
263+
active: true
246264
- member: lucas
247265
name: Lucas Nouguier
248266
title: Intern
@@ -251,13 +269,13 @@ members:
251269
twitter: LucasNouguier
252270
photo: /resources/img/nouguier.jpg
253271
contact_for: [scalacDebugging]
254-
active: true
272+
active: false
255273
- member: aymane
256274
name: Aymane Lamyaghri
257275
title: Intern
258276
email: aymane.lamyaghri@epfl.ch
259277
github: aymanelamyaghri
260-
twitter:
278+
twitter:
261279
photo: /resources/img/aymane.jpeg
262-
contact_for:
263-
active: true
280+
contact_for:
281+
active: false

_projects/25-tasty-scala-2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ web:
55
github: https://github.com/scalacenter/scala/tree/tasty_reader
66
origin:
77
contributors: [jamie]
8-
status: Active
8+
status: Maintenance
99
type: project
1010
active: true
1111
priority: 1

_projects/30-enum-finalisation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ web: http://dotty.epfl.ch/docs/reference/enums/enums.html
55
github:
66
origin:
77
contributors: [jamie]
8-
status: Active
8+
status: Completed
99
type: project
1010
active: true
1111
priority: 2

resources/css/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1197,7 +1197,7 @@ div.search {
11971197
.team {
11981198

11991199
.team-member {
1200-
min-height: 395px;
1200+
min-height: 420px;
12011201
margin-bottom: 30px;
12021202
padding: 40px;
12031203
background-color: #fafafa;

resources/img/shiv.png

40.5 KB
Loading

resources/img/shiv@2x.png

142 KB
Loading

resources/img/valerie-m.png

43.7 KB
Loading

resources/img/valerie-m@2x.png

147 KB
Loading

team.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ <h3>{{ member.name }}</h3>
8383
{% endif %}{% endfor %}
8484

8585
</div>
86-
</div>
86+
</div>

0 commit comments

Comments
 (0)