Skip to content
GitLab
Commit bbe07067 authored by Jochen Bauer's avatar Jochen Bauer
Browse files

Merge branch 'mathew' into 'master' 

Modified Logos for Haxogreen

See merge request !2
parents 776d852f 63c986e5
Hide whitespace changes
Inline Side-by-side
core/templates/core/base.html
View file @ bbe07067
......@@ -4,7 +4,7 @@
<head>
<meta charset="UTF-8">
{% block title %}
<title>Schlangenprogrammiernacht 2018</title>
<title>Haxosnake 2018</title>
{% endblock %}
{% block earlycss %}
......@@ -55,8 +55,8 @@
{% block footer %}
<div class="footer">
<img id="snake" src="{% static "core/snake200.png" %}">
(c) 2018 <a href="https://www.bytewerk.org/">bytewerk.org</a>
<img id="snake" src="{% static "core/haxogreen_logo_small.png" %}">
(c) 2018 <a href="https://www.bytewerk.org/">bytewerk.org</a> modified by <a href= https://www.hacksaar.de/>hacksaar</a> for <a href= https://wiki.haxogreen.lu/2018/wiki/Main_Page>haxogreen 2018</a>
</div>
{% endblock %}
......
core/templates/core/index.html
View file @ bbe07067
......@@ -3,9 +3,9 @@
{% block content %}
<h1>Schlangenprogrammiernacht 2018</h1>
<h1>Haxosnake 2018</h1>
<p>
Welcome to the 'Schlangenprogrammiernacht', a game for <a href="https://entropia.de/GPN18">GPN18</a>.
Welcome to the 'Haxosnake 2018', a game for <a href="https://wiki.haxogreen.lu/2018/wiki/Main_Page">haxogreen 2018</a>.
</p>
<p>
......@@ -16,7 +16,7 @@
Define your own snake in Lua, eat as much as you can and try not to die.
</p>
<p>Start with your own server and get the code <a href="https://git.bingo-ev.de/GPN18Programmierspiel">here</a>.</p>
<p>Start with your own server and get the code <a href="https://git.hacksaar.de/darkmattercoder/spn-hacksaar">here</a>.</p>
<p style="color:red; font-weight:bold; background-color:yellow;width:70%;border:5px solid red; border-radius:2em;padding:2em;">
Warning!<br>
......
ide/static/ide/ide.css
View file @ bbe07067
......@@ -60,8 +60,8 @@
}
button {
background-color:#321700;
border:2px solid #613600;
background-color:#38ce35;
border:2px solid #0c7f1a;
margin:5px 5px;
padding:3px 10px;
font-size:14pt;
......
visualization/templates/visualization/tv.html
View file @ bbe07067
......@@ -12,7 +12,7 @@
text-align:center;
}
#url span {
font-size:36pt;
font-size:12pt;
background-color:rgba(0,0,0,0.7);
border-radius: 0.5em 0.5em 0 0;
padding: 0.1em 0.5em;
......@@ -37,10 +37,10 @@
{% block content %}
<div id="stage"></div>
<img id="tvlogo" src="{% static "visualization/assets/bytewerk_tv_150w_2.png" %}">
<img id="tvlogo" src="{% static "visualization/assets/haxogreen_tv_small.png" %}">
<div id="url">
<span>https://schlangen.bytewerk.org/</span><br>
<span>https://git.bingo-ev.de/GPN18Programmierspiel</span>
<span>original by https://bytewerk.org/</span><br>
<span>modified by https://hacksaar.de/</span><br>
</div>
<div id="gameEvents"></div>
{% endblock %}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment