develop #149

Merged
samuel-p merged 118 commits from develop into main 2023-01-13 19:19:26 +00:00
3 changed files with 22 additions and 10 deletions
Showing only changes of commit 23c488547a - Show all commits

View file

@ -84,7 +84,9 @@
"institution": "Hochschule Wismar", "institution": "Hochschule Wismar",
"start": "Sept. 2018", "start": "Sept. 2018",
"end": "Juni 2021", "end": "Juni 2021",
"description": "Berufsbegleitendes Fernstudium", "descriptions": [
"Berufsbegleitendes Fernstudium"
],
"city": "Wismar" "city": "Wismar"
}, },
{ {
@ -93,7 +95,7 @@
"institution": "Duale Hochschule Baden-Württemberg", "institution": "Duale Hochschule Baden-Württemberg",
"start": "Okt. 2014", "start": "Okt. 2014",
"end": "Sept. 2017", "end": "Sept. 2017",
"description": "", "descriptions": [],
"city": "Karlsruhe" "city": "Karlsruhe"
}, },
{ {
@ -102,7 +104,9 @@
"institution": "Albert-Einstein-Schule", "institution": "Albert-Einstein-Schule",
"start": "Sept. 2011", "start": "Sept. 2011",
"end": "Juni 2014", "end": "Juni 2014",
"description": "Technisches Gymnasium, Profil Informationstechnik", "descriptions": [
"Technisches Gymnasium, Profil Informationstechnik"
],
"city": "Ettlingen" "city": "Ettlingen"
} }
] ]
@ -120,7 +124,7 @@
{ {
"icon": "samuel.png", "icon": "samuel.png",
"name": "Open Source", "name": "Open Source",
"description": "Wenn ich Zeit finde beteilige ich mich an Open Source Projekten oder schreibe gelegentlich den ein oder anderen Artikel dazu.", "description": "Wenn ich Zeit finde, beteilige ich mich an Open Source Projekten oder schreibe gelegentlich den ein oder anderen Artikel dazu.",
"url": "" "url": ""
}, },
{ {

View file

@ -84,7 +84,9 @@
"institution": "Wismar University", "institution": "Wismar University",
"start": "Sept. 2018", "start": "Sept. 2018",
"end": "June 2021", "end": "June 2021",
"description": "Part-time distance studies", "descriptions": [
"Part-time distance studies"
],
"city": "Wismar" "city": "Wismar"
}, },
{ {
@ -93,7 +95,7 @@
"institution": "Baden-Württemberg Cooperative State University", "institution": "Baden-Württemberg Cooperative State University",
"start": "Oct. 2014", "start": "Oct. 2014",
"end": "Sept. 2017", "end": "Sept. 2017",
"description": "", "descriptions": [],
"city": "Karlsruhe" "city": "Karlsruhe"
}, },
{ {
@ -102,7 +104,9 @@
"institution": "Albert-Einstein School", "institution": "Albert-Einstein School",
"start": "Sept. 2011", "start": "Sept. 2011",
"end": "June 2014", "end": "June 2014",
"description": "Technical high school, profile information technology", "descriptions": [
"Technical high school, profile information technology"
],
"city": "Ettlingen" "city": "Ettlingen"
} }
] ]

View file

@ -154,7 +154,11 @@ title: {{site.title}}
<h3 class="timeline-title">{{item.degree}}</h3> <h3 class="timeline-title">{{item.degree}}</h3>
{% endif %} {% endif %}
<span class="company">{{item.institution}} - {{item.city}}</span> <span class="company">{{item.institution}} - {{item.city}}</span>
<p>{{item.description}}</p> </div>
<div class="timeline-body">
{%- for description in item.descriptions %}
<p>{{description | safe}}</p>
{%- endfor %}
</div> </div>
</div> </div>
</li> </li>
@ -175,7 +179,7 @@ title: {{site.title}}
<div class="row"> <div class="row">
{%- for item in site.strings.projects.list %} {%- for item in site.strings.projects.list %}
<div class="col-md-4 text-center"> <div class="col-md-4 text-center">
<a class="feature-left" href="{{item.url}}" target="_blank"> <a class="feature-left" {% if item.url %}href="{{item.url}}"{% endif %} target="_blank">
<span class="icon"> <span class="icon">
<img src="/img/{{item.icon}}"> <img src="/img/{{item.icon}}">
</span> </span>
@ -239,7 +243,7 @@ title: {{site.title}}
<div class="row"> <div class="row">
{%- for item in site.strings.interests.list %} {%- for item in site.strings.interests.list %}
<div class="col-lg-3 col-md-6 col-12 text-center p-3"> <div class="col-lg-3 col-md-6 col-12 text-center p-3">
<a href="{{item.url}}" target="_blank" class="interest interest-{{item.image}}"> <a {% if item.url %}href="{{item.url}}"{% endif %} target="_blank" class="interest interest-{{item.image}}">
<div class="desc"> <div class="desc">
<h3>{{item.name}}</h3> <h3>{{item.name}}</h3>
</div> </div>