Skip to content

Commit

Permalink
Merge pull request #110 from Edirom/update-ess2024
Browse files Browse the repository at this point in the history
Update Website for ESS2024
  • Loading branch information
peterstadler authored Nov 8, 2023
2 parents 6557941 + fcf1601 commit 90a3571
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 9 deletions.
Binary file added _archiv/2024/img/ViFE-ESS-logo.png
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 _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
alt="ViFE Logo"/></a>
<a class="m-1" href="https://www.uni-paderborn.de"
target="_blank"><img
src="{{ '/assets/img/UPB_Logo_CMYK_D_2012.png' | relative_url }}"
src="{{ '/assets/img/UPB_Logo_DE_vierfarbig_CMYK.png' | relative_url }}"
alt="Universität Paderborn Logo"/></a>
<a class="m-1" href="https://www.zenmem.de"
target="_blank"><img
Expand Down
13 changes: 13 additions & 0 deletions _posts/2023-10-24-save-the-date-2024.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
layout: post
title: "Save the date!"
excerpt: "Edirom-Summer-School 2024"
authors: Dennis Ried
---

**Save the date!** Vom 23.–27. September 2024 findet die **15. Edirom-Summer-School** im Heinz-Nixdorf-Institut Paderborn statt.

In Kooperation mit:
- [Text+](https://www.text-plus.org)
- [ZenMEM](https://zenmem.de)
- [Virtuellen Forschungsverbundes Edirom, ViFE](https://edirom.de)
8 changes: 8 additions & 0 deletions _posts/2023-11-06-twitter-feature-deleted.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
layout: post
title: "Twitter-Feed"
excerpt: "Twitter-Feed von Startseite entfernt"
authors: Dennis Ried
---

Bislang war es üblich, dass wir in der rechten Sidebar unserer Webseite einen Twitter-Feed angeboten haben, der über aktuelle Aktivitäten des Virtuellen Forschungsverbund Edirom (ViFE) informierte. Dieses Feature ist für X (vormals Twitter) nicht mehr verfügbar und wurde daher von unserer Seite entfernt. Wir bitten um Verständnis.
Binary file removed assets/img/UPB_Logo_CMYK_D_2012.png
Binary file not shown.
Binary file added assets/img/UPB_Logo_DE_vierfarbig_CMYK.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 4 additions & 8 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,14 @@ <h3>{{post.title}}</h3>
</div>
<div class="col-md-4">
<div class="card bg-light">
<img class="card-img-top" src=" {{ "2023/img/ViFE-ESS-logo-2023.png" | relative_url }}" alt="ESS-2023-Logo"/>
<img class="card-img-top" src=" {{ "2024/img/ViFE-ESS-logo.png" | relative_url }}" alt="ESS-Logo"/>
<div class="card-body">
<p class="text-center">
<!-- <b>Edirom-Summer-School</b>-->
<br/> <b>31. Mai bis 2. Juni 2023</b>
&rarr; <b>15 Jahre ESS</b> &larr;
<br/><b>23. bis 27. September 2024</b>
<br/>Heinz-Nixdorf-Institut
<br />Universität Paderborn
<br/>Universität Paderborn
</p>

<a class="twitter-timeline" href="https://twitter.com/edirom" data-widget-id="352403975489859585">Tweets von @edirom</a>
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>

</div>
</div>
</div>
Expand Down

0 comments on commit 90a3571

Please sign in to comment.