bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix merge with master

Browse Source
This commit is contained in:
Patrick Mayr
2022-03-06 12:38:50 +00:00
committed by Patrick Mayr
parent bf9429ace7
commit 34abb3acf3
4 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fet2020/templates/base.html
View File

@@ -40,6 +40,8 @@
<link rel="stylesheet" href="{% static 'fonts/Besley-2.0/besley.css' %}">
<link rel="stylesheet" href="{% static 'fonts/Fira_Code-6.2/fira_code.css' %}">
{% block galleryheader %}
{% endblock %}
{% block extraheader %}
{% endblock %}
</head>
@@ -67,8 +69,8 @@
x-transition:leave-end="transform opacity-0 scale-90"
>
<li><a href="{% url 'posts:posts.index' %}">News</a></li>
<li><a href="{% url 'members_view' 'A' %}">Fachschaft</a></li>
<li><a href="/fotos/">Fotos</a></li>
<li><a href="{% url 'members_view' 'active' %}">Fachschaft</a></li>
<li><a href="{% url 'gallery' %}">Galerie</a></li>
<li><a href="{% url 'blackboard' %}">Blackboard</a></li>
<li><a href="{% url 'contact' %}">Kontakt</a></li>
@@ -120,16 +122,16 @@
<footer>
<ul class="icon-list">
<li>
<a href="https://facebook.fet.at/"><i class="fab fa-facebook"></i></a>
<a href="{% url 'facebook' %}"><i class="fab fa-facebook"></i></a>
</li>
<li>
<a href="https://instagram.fet.at/"><i class="fab fa-instagram"></i></a>
<a href="{% url 'instagram' %}"><i class="fab fa-instagram"></i></a>
</li>
<li>
<a href="https://discord.fet.at/"><i class="fab fa-discord"></i></a>
<a href="{% url 'discord' %}"><i class="fab fa-discord"></i></a>
</li>
<li>
<a href="https://telegram.fet.at/"><i class="fab fa-telegram"></i></a>
<a href="{% url 'telegram' %}"><i class="fab fa-telegram"></i></a>
</li>
<li>
<a href="mailto:service@fet.at"><i class="fas fa-envelope"></i></a>

4
fet2020/templates/home.html
View File

@@ -22,7 +22,9 @@
{% endwith %}
{% endif %}
{% for post in featured_meeting %}
{% include 'posts/partials/_meeting_row.html' %}
{% if post %}
{% include 'posts/partials/_meeting_row.html' %}
{% endif %}
{% endfor %}
</div>

4
fet2020/templates/layout.html
View File

@@ -25,7 +25,7 @@
<div class="title-bar">
<div class="title-bar-left">
<a href="{% url 'home' %}">
<img class="logo" src="{% static 'img/logo2014_64.png' %}"/>
<img class="logo" src="{% static 'img/fet_logo_white.png' %}"/>
</a>
</div>
@@ -38,7 +38,7 @@
<div class="top-bar" id="example-menu">
<div class="top-bar-left show-for-large">
<a href="{% url 'home' %}">
<img class="logo" src="{% static 'img/logo2014_64.png' %}"/>
<img class="logo" src="{% static 'img/fet_logo_white.png' %}"/>
</a>
</div>