Skip to content

Commit

Permalink
Merge branch 'main' into gsoc2025
Browse files Browse the repository at this point in the history
  • Loading branch information
roewenstrunk authored Feb 11, 2025
2 parents ed3ad79 + eed34c7 commit d8599e1
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 10 deletions.
14 changes: 14 additions & 0 deletions _data/team.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
- name: Martin Albrecht-Hohmaier
sortkey: Albrecht-Hohmaier
orcid: 0000-0002-5279-7408
email: [email protected]
affiliation:
- nfdi
Expand All @@ -16,6 +17,7 @@
- name: Benjamin Wolff Bohl
sortkey: Bohl
email: [email protected]
orcid: 0000-0001-7217-9167
affiliation:
- hoftheater
- edirom
Expand All @@ -27,6 +29,7 @@
- name: Daniel Röwenstrunk
sortkey: Röwenstrunk
email: [email protected]
orcid: 0000-0001-6271-2095
affiliation:
- edirom
- freidi
Expand All @@ -38,6 +41,7 @@
- name: Katharina Bergmann
sortkey: Bergmann
email: [email protected]
orcid: 0000-0002-0758-9917
affiliation:
- nfdi
image: /assets/img/team_katharina.jpg
Expand Down Expand Up @@ -102,6 +106,7 @@
phone: +49 5231 975–669
- name: Kristina Richts-Matthaei
sortkey: Richts
orcid: 0000-0001-8569-1995
email: [email protected]
affiliation:
- mei
Expand All @@ -111,6 +116,7 @@
phone: +49 5231 975–665
- name: Andreas Münzmay
sortkey: Münzmay
orcid: 0000-0002-8373-4055
email: [email protected]
affiliation:
- zenmem
Expand All @@ -121,6 +127,7 @@
phone: +49 5231 975–672
- name: Anastasia Wawilow
sortkey: Wawiliow
orcid: 0000-0003-2840-128X
email: [email protected]
affiliation:
- zenmem
Expand All @@ -145,12 +152,14 @@
image: /assets/img/team_agnes.jpeg
- name: Anne Ferger
sortkey: Ferger
orcid: 0000-0002-1382-2658
email: [email protected]
affiliation:
- nfdi
image: /assets/img/team_anne.jpg
- name: Daniel Jettka
sortkey: Jettka
orcid: 0000-0002-2375-2227
email: [email protected]
affiliation:
- nfdi
Expand Down Expand Up @@ -217,6 +226,7 @@
image: /assets/img/team_dunja.jpg
- name: Tobias Bachmann
sortkey: Bachmann
email: [email protected]
image: /assets/img/team_tobias.jpg
affiliation:
- openedirom
Expand All @@ -240,3 +250,7 @@
image: assets/img/team_lisa.jpg
affiliation:
- tamudi
- name: Silke Reich
sortkey: Reich
affiliation:
- korngold
21 changes: 20 additions & 1 deletion _sass/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,17 @@ a.vife_werkzeuge2 {
height: 30px;
}

.vife_teamMember, .vife_alumni, .vife_project, .tool {
.vife_teamMember, .vife_alumni{
img {
width: 250px;
height: 250px;
filter: grayscale(100%);
object-fit: cover;
border-radius: 300px;
}
}

.vife_project, .tool {
img {
max-height: 250px;
object-fit: contain;
Expand Down Expand Up @@ -168,3 +178,12 @@ figure {
margin-bottom: $spacer;
}
}

.orcid_icon {
background-image: url('/assets/img/ORCID-iD_icon_unauth_BW_vector.svg');
background-size: 16px 16px;
width: 16px;
height: 16px;
margin-bottom: 3px;
vertical-align: middle;
}
5 changes: 5 additions & 0 deletions assets/img/ORCID-iD_icon_unauth_BW_vector.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/img/team_martin.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion projects.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title: Projekte
---

<div class="row row-cols-1 row-cols-md-3">
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3">
{% assign projects = site.data.projects | sort %}
{% for proj in projects %}
{% assign project = proj[1] %}
Expand Down
18 changes: 11 additions & 7 deletions team.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,28 @@
title: Team
---

<div class="row row-cols-1 row-cols-md-3">
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3">
{% assign members = site.data.team | sort: "sortkey" %}
{% for member in members %}
<div class="col my-3">
<div class="card vife_teamMember">
{% if member.image %}
<img src="{{ member.image | relative_url }}" class="card-img-top p-4" alt="{{ member.name }}" />
<img src="{{ member.image | relative_url }}" class="card-img-top mx-auto d-block p-4" alt="{{ member.name }}"/>
{% endif %}
<div class="card-body">
<h3 class="card-title">{{ member.name }}</h3>
<p class="card-text">
{% if member.email %}
<i class="vife_contact_icon fa fa-envelope"></i>
<span>{{ member.email }}</span><br />
{% endif %}
{% if member.phone %}
<i class="vife_contact_icon fa fa-phone"></i>
<a href="tel:{{ member.phone }}">{{ member.phone }}</a><br />
{% endif %}
{% if member.email %}
<i class="vife_contact_icon fa fa-envelope"></i>
<span>{{ member.email }}</span><br />
{% if member.orcid %}
<i class="vife_contact_icon fa orcid_icon"></i>
<a href="https://orcid.org/{{ member.orcid }}">{{ member.orcid }}</a><br />
{% endif %}
{% if member.affiliation %}
<i class="vife_contact_icon fa fa-globe"></i>
Expand Down Expand Up @@ -50,9 +54,9 @@ <h2>Ehemalige "ViFEn"</h2>
{% for member in members %}
<div class="col my-3">
<div class="card vife_alumni">
{% if member.image %}
<!-- {% if member.image %}
<img src="{{ member.image | relative_url }}" class="card-img-top p-4" alt="{{ member.name }}" />
{% endif %}
{% endif %}-->
<div class="card-body">
<h3 class="card-title">{{ member.name }}</h3>
<p class="card-text">
Expand Down
2 changes: 1 addition & 1 deletion werkzeuge.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
title: Werkzeuge
---

<div class="row row-cols-1 row-cols-md-2">
<div class="row row-cols-1 row-cols-md-2 row-cols-lg-3">
<div class="col my-3">
<div class="card tool">
<div class="card-body">
Expand Down

0 comments on commit d8599e1

Please sign in to comment.