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

5 years ago · 34b0a701d2
parent 79ac680a70 2b307f969f
commit 34b0a701d2
7 changed files with 62 additions and 27 deletions
--- a/static/archive.css
+++ b/static/archive.css
@ -139,13 +139,14 @@ vertical-align:middle;
 h1 {
 	position: fixed;
 	right:0%;
-	top:5%;
+	bottom: 83%;
 	text-align: right;
 	background-color: rgba(11,239,235,0.7);
  color: #371F10;
 	padding: 3px 35px 3px 10px;
 	z-index: 10;
 	font-size: 28px;
+  max-width: 93%;
 }

 a, a:visited{
--- a/static/orgs.css
+++ b/static/orgs.css
@ -1,17 +1,17 @@

 #top {
-	padding-top: 20px;
+	padding-top: 25px;
 	padding-left: 50px;
 }

 body {
 	background-color: #F4EBE8;
 	font-family: Roboto Mono;
-	font-size:14px;
 }

 /* Organizations list */
 .collapsible{
+	font-size:14px;
 	padding-left: 70px;
    line-height: 1;
 	color: #371F10;
@ -104,3 +104,4 @@ button.bottom span, button.top span {
 .scbt {
 	visibility: hidden;
 }
+
--- 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/title.css
+++ b/static/title.css
@ -14,6 +14,7 @@ body {
    left: 7%;
    text-align: : center;
    z-index: 5;
+    padding-bottom: 5%;

 }

@ -21,19 +22,21 @@ body {
  position: relative;
  text-align: center;
  z-index: 5;
+
 }

 .thumbborder {
  position: relative;
  max-width: 100%;
  max-height: 100%;
+
 }


 /*links*/

 a:link {
-  text-decoration: none;
+  text-decoration: ;
  color: #371F10;
 }

@ -51,14 +54,14 @@ a:hover {
 h1 {
 /*  position: fixed;
  right:0%;
-  top:5%;
+  bottom:83%;
  text-align: right;
  background-color: rgba(11,239,235,0.7);
  padding: 3px 35px 3px 10px;
-  z-index: 10;
-  font-size: 27px;
-  color: #371F10;*/
-  max-width: 90%;
+  z-index: 10;*/
+/*  font-size: ;*/
+/*  color: #371F10;
+  max-width: 90%;*/
 }

 h2{
@ -123,7 +126,7 @@ h2{
    position: fixed;
   /* text-align: center;*/
    bottom: 0%;
-    right: 0%;
+    right: 1%;
    z-index: 9;
    width: 110px;
    height: 50px;
@ -141,7 +144,7 @@ p {
 .btnov {
  position: fixed;
  display: inline;
-  right: 0px;
+  right: 20px;
  bottom:0px;
  border: none;
  width: 50px;
@ -159,7 +162,7 @@ p {
 .btn {
  position: fixed;
  display: inline;
-  right: 60px;
+  right: 70px;
  bottom:0px;
  border: none;
  width: 50px;
@ -241,15 +244,14 @@ p {
  text-align: left;
  opacity: 0.7;
  right:0%;
-
 }

 a.content:link {
  color:white;
 }

-.metadata_organization {
-  /*font-size: 14px;*/
+.metadata_topic, .metadata_format, .metadata_creator, .metadata_organization {
+  max-width: 95%;
 }

 .fbtn {
--- a/static/topicformat.css
+++ b/static/topicformat.css
@ -3,7 +3,7 @@ body {
    font-size: 18px;
 }

-.grid-container {
+/*.grid-container {
  	display: inline-grid;
  	grid-template-columns: repeat(3, 1fr);
  	grid-column-gap: 5px;
@ -15,7 +15,7 @@ body {
 	  height: auto;
    margin-left: 120px;
    margin-right: 120px;
-  	text-align: : center;
+  	text-align: center;
  	z-index: 5;

 }
@ -24,17 +24,47 @@ body {
 	position: relative;
 	text-align: left;
 	z-index: 5;
+}*/
+
+.grid-container {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-column-gap: 50px;
+    grid-row-gap: 100px;
+   /* grid-auto-flow: dense;*/
+    position: absolute;
+    top: 25%;
+    width: 90%;
+    height: auto;
+    left: 5%;
+    margin-left: 10px;
+    margin-right: 10px;
+    text-align: : center;
+    z-index: 5;
+    padding-bottom: 5%;
+
 }

+.grid-container > div {
+  position: relative;
+  text-align: center;
+  z-index: 5;
+}
+
+.thumbborder {
+    max-height: 100%;
+  position:relative;
+  display: inline-block;
+  max-width: 300px;
+}
+
+
 .img {
  display: inline-block;
  border-style:  hidden  hidden solid hidden;
  border-color: #0BEFEB;
  height: 500px;
 }
-.image {
-  width: 300px;
-}

 .title {
  display:block;
@ -50,5 +80,6 @@ body {
  width: 300px;
  overflow-wrap: break-word;
  border-style: hidden;
+  text-align: left;
 }

--- a/templates/timeline.html
+++ b/templates/timeline.html
@ -3,12 +3,13 @@
 <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>
 </head>
 <body>
-    <div class="pagetitle">Timeline</div>
+	<h1>Timeline</h1>    
 	<div id="body">{{ body|safe }}</div>

 </body>
--- a/templates/title.html
+++ b/templates/title.html
@ -41,6 +41,8 @@ for (i = 0; i < coll.length; i++) {
  });
 }

+var links = document.querySelectorAll("*[title]");
+for (var i=0; i<links.length; i++) {   links[i].setAttribute("title", "");  }

 </script>
 </body>