Merge branch 'master' of https://git.xpub.nl/XPUB/special-issue-11-wiki2html

4 years ago · cdbb3e77fa
parent 64a78e48ee 86177862c8
commit cdbb3e77fa
3 changed files with 6 additions and 11 deletions
--- a/static/timeline.css
+++ b/static/timeline.css
@ -15,10 +15,7 @@ body{
 	font-size: 28px;
 }

-h1 {
-	font-family: Roboto Mono;
-	font-size: 40px;
-	color: #371F10;
+.eventdate {
 	margin-top: 1%;
 }

--- a/static/topicformat.css
+++ b/static/topicformat.css
@ -15,7 +15,7 @@ body {
 	  height: auto;
    margin-left: 120px;
    margin-right: 120px;
-  	text-align: : center;
+  	text-align: center;
  	z-index: 5;

 }
@ -64,9 +64,6 @@ body {
  border-color: #0BEFEB;
  height: 500px;
 }
-.image {
-  width: 300px;
-}

 .title {
  display:block;
--- a/templates/timeline.html
+++ b/templates/timeline.html
@ -3,13 +3,14 @@
 <head>
    <meta charset="utf-8">
    <link rel="stylesheet" href="{{ staticpath }}/static/archive.css" />
+    <script type="text/javascript" src="{{ staticpath }}/static/archive.js"></script>
    <link rel="stylesheet" href="{{ staticpath }}/static/timeline.css" />
    <link href='https://fonts.googleapis.com/css?family=Roboto+Mono' rel='stylesheet' type='text/css'>
-    <title>Timeline</title>
+    <title>{{ page.name }}</title>
 </head>
 <body>
-    <div class="pagetitle">Timeline</div>
-    <div id="body">{{ body|safe }}</div>
+	<h1>{{ page.name }}</h1>    
+	<div id="body">{{ body|safe }}</div>

 </body>
 </html>