diff --git a/static/img/kaehmy_banner.png b/static/img/kaehmy_banner.png new file mode 100644 index 0000000..7d636bd Binary files /dev/null and b/static/img/kaehmy_banner.png differ diff --git a/webapp/static/css/sik_header.css b/webapp/static/css/sik_header.css index 37685f6..b2c56dc 100644 --- a/webapp/static/css/sik_header.css +++ b/webapp/static/css/sik_header.css @@ -12,3 +12,25 @@ height: auto; margin: auto; } + +.kaehmy-banner { + max-width: 1000px; + margin-left: auto; + margin-right: auto; +} + +@media screen and (min-width: 1000px) { + .header-content { + position: absolute; + left: 0; + top: 0; + background-color: #052f5f; + width: 100%; + } + + .header { + margin-bottom: 331px; + } +} + + diff --git a/webapp/templates/base.html b/webapp/templates/base.html index db2d8ab..c8ce998 100644 --- a/webapp/templates/base.html +++ b/webapp/templates/base.html @@ -9,7 +9,7 @@ - + {% trans "Aalto-yliopiston Sähköinsinöörikilta ry" %} diff --git a/webapp/templates/kaehmy.html b/webapp/templates/kaehmy.html index a758e50..5a73d76 100644 --- a/webapp/templates/kaehmy.html +++ b/webapp/templates/kaehmy.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "kaehmy_base.html" %} {% load bootstrap3 %} {% load i18n %} diff --git a/webapp/templates/kaehmy_base.html b/webapp/templates/kaehmy_base.html new file mode 100644 index 0000000..c772ac8 --- /dev/null +++ b/webapp/templates/kaehmy_base.html @@ -0,0 +1,7 @@ +{% extends "base.html" %} + +{% block header %} +
+ {% include "kaehmy_header.html" %} +
+{% endblock header %} \ No newline at end of file diff --git a/webapp/templates/kaehmy_header.html b/webapp/templates/kaehmy_header.html new file mode 100644 index 0000000..79e3f50 --- /dev/null +++ b/webapp/templates/kaehmy_header.html @@ -0,0 +1,8 @@ +{% load i18n %} + + +
+ +
diff --git a/webapp/templates/kaehmy_list.html b/webapp/templates/kaehmy_list.html index 2c535be..e9b81ca 100644 --- a/webapp/templates/kaehmy_list.html +++ b/webapp/templates/kaehmy_list.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "kaehmy_base.html" %} {% load static %} {% load i18n %} diff --git a/webapp/templates/kaehmy_statistics.html b/webapp/templates/kaehmy_statistics.html index d15d01b..8bceb20 100644 --- a/webapp/templates/kaehmy_statistics.html +++ b/webapp/templates/kaehmy_statistics.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "kaehmy_base.html" %} {% load bootstrap3 %} {% load i18n %} diff --git a/webapp/templates/sik_header.html b/webapp/templates/sik_header.html index 42d5040..b447b3b 100644 --- a/webapp/templates/sik_header.html +++ b/webapp/templates/sik_header.html @@ -3,6 +3,6 @@