Merge branch 'develop' into 'master'

Develop to Master

See merge request sahkoinsinoorikilta/vtmk/web2.0-backend!90
This commit is contained in:
Ilari Ojakorpi
2023-02-07 14:58:52 +00:00
5 changed files with 6 additions and 5 deletions
+1
View File
@@ -4,6 +4,7 @@
.navbar-border {
border-bottom: 2px solid #282b3b;
border-radius: 0px 0px 8px 8px;
}
.navbar-light .navbar-nav .nav-link {
Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

Generated
+3 -3
View File
@@ -94,14 +94,14 @@ files = [
[[package]]
name = "certifi"
version = "2022.6.15"
version = "2022.12.7"
description = "Python package for providing Mozilla's CA Bundle."
category = "main"
optional = false
python-versions = ">=3.6"
files = [
{file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"},
{file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"},
{file = "certifi-2022.12.7-py3-none-any.whl", hash = "sha256:4ad3232f5e926d6718ec31cfc1fcadfde020920e278684144551c91769c7bc18"},
{file = "certifi-2022.12.7.tar.gz", hash = "sha256:35824b4c3a97115964b408844d64aa14db1cc518f6562e8d7261699d1350a9e3"},
]
[[package]]
+1 -1
View File
@@ -5,6 +5,6 @@
{{ challenge.message }}
{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 26.5" %}.
{% trans "Muistattehan vahvistaa haasteen paikan päällä Smökissä torstaina 16.2" %}.
{% trans "Käy kurkkaamassa muutkin haasteet osoitteessa" %} {{ url }}
+1 -1
View File
@@ -3,6 +3,6 @@
<div class="ohlhafv-header-content">
<div class="ohlhafv-banner logo">
<a href="/ohlhafv"><img class="ohlhafv-banner-image" src="{% static "ohlhafv/img/heevit.jpg" %}" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
<a href="/ohlhafv"><img class="ohlhafv-banner-image" src="{% static "ohlhafv/img/heevi_banner.svg" %}" alt="Aalto-yliopiston Sähköinsinöörikilta ry"></a>
</div>
</div>