asauer/gruppenbildungsspiel
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Sauer 2019-04-11 19:55:00 +02:00
commit 59dda27b63
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
static/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
static/images/WIAILogo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 243 KiB

17
templates/base.html
View File

@ -3,20 +3,21 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>{{ title }}</title> <title>{{ title }}</title>
<link rel="stylesheet" href="{{ url_for('static', filename='main.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='main.css') }}">
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
</head> </head>
<body> <body>
<header> <header>
<img src="logo.png" alt="Fachschaft WIAI"/> <img src="WIAIlogo.png" alt="Fachschaft WIAI"/>
<h1>SPIEL des Lebens</h1> <h1>SPIEL des Lebens</h1>
</header> </header>
<nav> <nav>
<ul> <ul>
<li {% if request.path == url_for('index') %} class="active" {% endif %}><a href="{{ url_for('index') }}">Home</a></li> <li {% if request.path == url_for('index') %} class="active" {% endif %}><a href="{{ url_for('index') }}">Home</a></li>
<li {% if request.path == url_for('form') %} class="active" {% endif %}><a href="{{ url_for('form') }}">Formular</a></li> <li {% if request.path == url_for('form') %} class="active" {% endif %}><a href="{{ url_for('form') }}">Formular</a></li>
<li {% if request.path == url_for('answers') %} class="active" {% endif %}><a href="{{ url_for('answers') }}">Meine Antworten</a></li> <li {% if request.path == url_for('answers') %} class="active" {% endif %}><a href="{{ url_for('answers') }}">Meine Antworten</a></li>
</ul> </ul>
</nav> </nav>
{% block content %} {% block content %}
{% endblock %} {% endblock %}
</body> </body>