artwork @ bddc8d35

-Subproject commit 2cbfc7bfdee0a2ec768eb208c22c1c56d5db18d5
+Subproject commit bddc8d35bc58a4902bacaa77ca400886c964bb3d

static/css/style.css

@@ -7,7 +7,8 @@ a {
 }
 
 .navbar {
-	border-bottom: var(--teckids-primary-dark) 3px solid;
+        border-bottom: var(--teckids-primary-dark) 3px solid;
+        background-color: var(--teckids-primary-light);
         padding-top: 0;
         padding-bottom: 0;
 }
@@ -27,31 +28,23 @@ img#logo {
 	margin-bottom: 0;
 }
 
-.navbar-nav li:hover .dropdown-menu {
-	display: block;
-	margin-top: 0px;
-}
-
-li.active > a {
-	background: var(--teckids-primary-light);
-	background: linear-gradient(var(--teckids-primary-dark), var(--teckids-primary-light), var(--teckids-primary-dark));
-	color: #f8f8f8;
+.navbar li > a {
+	color: var(--teckds-primary-dark);
 }
 
-a.active {
-	background: var(--teckids-primary-light);
-	background: linear-gradient(var(--teckids-primary-dark), var(--teckids-primary-light), var(--teckids-primary-dark));
-	color: #f8f8f8;
+.navbar li.active > a {
+        font-weight: bold;
+        color: #eeeeee;
 }
 
-
-ul.dropdown-menu > li.active > a {
-	background: var(--teckids-primary-dark);
-	color: #f8f8f8;
+.licence {
+        text-align: right;
+        font-style: italic;
+	font-size: 75%;
 }
 
 footer#main-footer {
-	background: var(--teckids-secondary-light);
+	background: var(--teckids-secondary-dark);
 	color: #ffffff;
 	margin-top: 20px;
 	padding-top: 30px;

templates/article.html

@@ -84,13 +84,8 @@
           </div>
       </div>
 </section>
-
 {% endblock content %}
 
-{% block sponsorstext %}
-{{ SPONSORSTEXTS[article.lang] }}
-{% endblock %}
-
 {% block languagefooter %}
 {% import 'translations.html' as translations with context %}
 {{ translations.translations_for(article) }}

templates/base.html

@@ -19,10 +19,22 @@
     <meta name="author" content="Teckids e.V." />
     <style>
         :root {
-            --teckids-primary-light: {{ PRIMARY_LIGHT }};
-            --teckids-primary-dark: {{ PRIMARY_DARK }};
-            --teckids-secondary-light: {{ SECONDARY_LIGHT }};
-            --teckids-secondary-dark: {{ SECONDARY_DARK }};
+            --teckids-primary-light: {{ PRIMARY_LIGHT }}ff;
+            --teckids-primary-dark: {{ PRIMARY_DARK }}ff;
+            --teckids-secondary-light: {{ SECONDARY_LIGHT }}ff;
+            --teckids-secondary-dark: {{ SECONDARY_DARK }}ff;
+            --teckids-primary-light-10: {{ PRIMARY_LIGHT }}20;
+            --teckids-primary-dark-10: {{ PRIMARY_DARK }}20;
+            --teckids-secondary-light-10: {{ SECONDARY_LIGHT }}20;
+            --teckids-secondary-dark-10: {{ SECONDARY_DARK }}20;
+            --teckids-primary-light-25: {{ PRIMARY_LIGHT }}40;
+            --teckids-primary-dark-25: {{ PRIMARY_DARK }}40;
+            --teckids-secondary-light-25: {{ SECONDARY_LIGHT }}40;
+            --teckids-secondary-dark-25: {{ SECONDARY_DARK }}40;
+            --teckids-primary-light-50: {{ PRIMARY_LIGHT }}80;
+            --teckids-primary-dark-50: {{ PRIMARY_DARK }}80;
+            --teckids-secondary-light-50: {{ SECONDARY_LIGHT }}80;
+            --teckids-secondary-dark-50: {{ SECONDARY_DARK }}80;
         }
     </style>
     <link rel="stylesheet" type="text/css" href="/{{ THEME_STATIC_DIR }}/css/bootstrap.min.css" />
@@ -85,6 +97,13 @@
     <main role="main">
     <!-- Main Content -->
 	{% block content %}{% endblock %}
+	<p class="licence">
+	    {% if article is defined %}
+	        {{ LICENCETEXTS[article.lang|default(DEFAULT_LANG)] }} {{ article.metadata.licence|default(LICENCE_DEFAULT) }}
+	    {% elif page is defined %}
+	        {{ LICENCETEXTS[DEFAULT_LANG] }} {{ page.metadata.licence|default(LICENCE_DEFAULT) }}
+	    {% endif %}
+	</p>
     </main>
 
     <!-- Sponsoren-Footer -->
@@ -95,7 +114,13 @@
             <div class="row">
                 <div class="col s12">
                     <h3 id='sponsorheading' class="black-text">Sponsoren</h3>
-		    <p id="sponsortext" class="black-text">{% block sponsorstext %}{{ SPONSORSTEXTS["de"] }}{% endblock %}</p>
+		    <p id="sponsortext" class="black-text">
+			{% if article is defined %}
+			    {{ SPONSORSTEXTS[article.lang|default(DEFAULT_LANG)] }}
+			{% elif page is defined %}
+			    {{ SPONSORSTEXTS[DEFAULT_LANG] }}
+			{% endif %}
+		    </p>
                     {% for image, url in SPONSOR_LOGOS %}
                         <a href="{{ url }}"><img src="{{ image }}" href="{{ url }}" alt="{{ url }}" class="sponsorslogo" /></a>
                     {% endfor %}