diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..b25c15b81fae06e1c55946ac6270bfdb293870e8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
diff --git a/static/css/style.css~ b/static/css/style.css
similarity index 98%
rename from static/css/style.css~
rename to static/css/style.css
index e31d0c3be4ab41ca3c60feda32b47b38da235358..aae19bb2a9c96a88466afca40e19a2cb2d696b9e 100644
--- a/static/css/style.css~
+++ b/static/css/style.css
@@ -15,7 +15,7 @@ nav {
}
img#logo {
- height: 100%;
+ height: 60px;
}
nav {
@@ -24,7 +24,7 @@ nav {
color: #777777;
}
-.nav-wrapper > ul > li > a{
+.nav-wrapper > ul > li > a {
color: #777777;
}
diff --git a/static/img/logo_de.png b/static/img/logo_de.png
deleted file mode 100644
index a1b83c22f9fcde9fe29821bd2c7e9063c072967d..0000000000000000000000000000000000000000
Binary files a/static/img/logo_de.png and /dev/null differ
diff --git a/static/img/logo_en.png b/static/img/logo_en.png
deleted file mode 100644
index d0db58a59f2230db355b01b7f5c31ee52c3c1db3..0000000000000000000000000000000000000000
Binary files a/static/img/logo_en.png and /dev/null differ
diff --git a/templates/article.html~ b/templates/article.html~
deleted file mode 100644
index d95065679a385d06baaf764831cded7b1f21045e..0000000000000000000000000000000000000000
--- a/templates/article.html~
+++ /dev/null
@@ -1,96 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}{{ article.title|striptags }} - {{ SITETITLE }}{% endblock %}
-
-{% block head %}
- {{ super() }}
- {% for keyword in article.keywords %}
- <meta name="keywords" content="{{keyword}}" />
- {% endfor %}
-
- {% if article.description %}
- {% for description in article.description %}
- <meta name="description" content="{{description}}" />
- {% endfor %}
- {% elif article.summary %}
- <meta name="description" content="{{ article.summary|striptags }}" />
- {% endif %}
-
-
- {% for tag in article.tags %}
- <meta name="tags" content="{{tag}}" />
- {% endfor %}
-
- <link rel='stylesheet' type='text/css' href="/theme/css/article.css" />
-
- <meta itemprop='url' content='{{ SITEURL }}/{{ article.url }}' />
- <meta itemprop='name' content='{{ SITENAME }} - {{ article.title|striptags }}' />
-
- <meta property='og:url' content='{{ SITEURL }}/{{ article.url }}' />
- <meta property='og:title' content='{{ SITENAME }} - {{ article.title|striptags }}' />
- <meta property='og:image' content='{{ SITELOGO }}' />
-
- {% if article.authors %}
- {% for author in article.authors %}
- <meta itemprop='author' content='{{ author }}' />
- <meta property='og:author' content='{{ author }}' />
- {% endfor %}
- {% endif %}
-
- {% if article.summary %}
- <meta itemprop='description' content="{{ article.summary|striptags }}" />
- <meta property='og:description' content="{{ article.summary|striptags }}" />
- {% else %}
- <meta itemprop='description' content="{{ article.content|striptags|truncate() }}" />
- <meta property='og:description' content="{{ article.content|striptags|truncate() }}" />
- {% endif %}
-
-
-
-{% endblock head %}
-
-{% block content %}
-
-<section id="content" class="body">
- <div class='container'>
- <div class='row clearfix'>
-
- <div class='column full'>
- {# <header> #}
-
- <h2 class="entry-title">
- <a href="/{{ article.url }}" rel="bookmark"
- title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
- {% import 'translations.html' as translations with context %}
- {{ translations.translations_for(article) }}
-
- {# </header> #}
-
- <div class="post-info">
- <abbr class="published" title="{{ article.date.isoformat() }}">
- {{ article.locale_date }}
- </abbr>
- {% if article.modified %}
- <abbr class="modified" title="{{ article.modified.isoformat() }}">
- {{ article.locale_modified }}
- </abbr>
- {% endif %}
- {% if article.authors %}
- <address class="vcard author">
- by {% for author in article.authors %}
- <a class="url fn" href="/{{ author.url }}">{{ author }}</a>{% if not loop.last %}, {% endif %}
- {% endfor %}
- </address>
- {% endif %}
- </div><!-- /.post-info -->
-
- <div class="entry-content">
- {{ article.content }}
- </div><!-- /.entry-content -->
-
- </div>
- </div>
- </div>
-</section>
-
-{% endblock content %}
diff --git a/templates/base.html b/templates/base.html
index 81b2d9b898c1a5d7ebd661ff4ab4e759c974d535..f00c1f643dff7eeb8758d6868ceb9bd733fe8c79 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -8,7 +8,7 @@
<meta name="description" content="{{ DESCRIPTION }}" />
<meta name="author" content="Teckids e.V." />
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/materialize.min.css" />
- <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/static/style.css" />
+ <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/style.css" />
<title>
{{ SITENAME }}
@@ -21,9 +21,9 @@
<div class="nav-wrapper">
<!-- Brand and toggle get grouped for better mobile display -->
<a class="brand-logo" href="{{ SITEURL }}">
- Schul-Frei
+ <img id="logo" src="{{ SITELOGO }}" alt="{{ SITENAME }}">
</a>
-
+ <a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<!-- Collect the nav links, forms, and other content for toggling -->
<ul class="right hide-on-med-and-down">
{% for name, link in LINKS %}
@@ -32,6 +32,13 @@
</li>
{% endfor %}
</ul>
+ <ul class="sidenav" id="mobile-demo">
+ {% for name, link in LINKS %}
+ <li>
+ <a href="{{ link }}">{{ name }}</a>
+ </li>
+ {% endfor %}
+ </ul>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
diff --git a/templates/base.html~ b/templates/base.html~
index 1952d3c9233dcf285b2cb933ca7fd58b4fd45b9e..463a01eef2d8b3f8fec84c80d531337d33fe21f0 100644
--- a/templates/base.html~
+++ b/templates/base.html~
@@ -8,7 +8,7 @@
<meta name="description" content="{{ DESCRIPTION }}" />
<meta name="author" content="Teckids e.V." />
<link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/materialize.min.css" />
- <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ STATIC }}/style.css" />
+ <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/style.css" />
<title>
{{ SITENAME }}
@@ -21,9 +21,9 @@
<div class="nav-wrapper">
<!-- Brand and toggle get grouped for better mobile display -->
<a class="brand-logo" href="{{ SITEURL }}">
- Schul-Frei
+ <img id="logo" src="/{{ SITELOGO }}" alt="{{ SITENAME }}">
</a>
-
+ <a href="#" data-target="mobile-demo" class="sidenav-trigger"><i class="material-icons">menu</i></a>
<!-- Collect the nav links, forms, and other content for toggling -->
<ul class="right hide-on-med-and-down">
{% for name, link in LINKS %}
@@ -32,6 +32,13 @@
</li>
{% endfor %}
</ul>
+ <ul class="sidenav" id="mobile-demo">
+ {% for name, link in LINKS %}
+ <li>
+ <a href="{{ link }}">{{ name }}</a>
+ </li>
+ {% endfor %}
+ </ul>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
diff --git a/templates/index.html~ b/templates/index.html~
deleted file mode 100644
index 48b3558b313d9642a11eca8f6b5da1025d0f6bf5..0000000000000000000000000000000000000000
--- a/templates/index.html~
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends 'base.html' %}
-
-{% block content %}
-<h2>{{ SITETITLE }}</h2>
-{% endblock %}