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

5 years ago · dc636acba8
parent 377c27a529 bf07f294de
commit dc636acba8
3 changed files with 28 additions and 17 deletions
--- a/static/timeline.css
+++ b/static/timeline.css
@ -5,6 +5,21 @@ body{

 h1 {
 	font-family: Roboto Mono;
+	font-size: 40px;
+	margin-top: 1%;
+}
+
+.pagetitle {
+	position: fixed;
+	right:0%;
+	top:5%;
+	text-align: right;
+	background-color: #0BEFEB;
+	padding: 3px 35px 3px 10px;
+	z-index: 10;
+	color: black;
+	font-size: 28px;
+	opacity: 0.7;
 }

 div#body{ width: max-content;}
@ -20,6 +35,11 @@ div#body{ width: max-content;}
 display: inline-block;
 }

+.content {
+	display: flex;
+	margin-right: 5vw;
+}
+
 .indexlink {
 	position: fixed;
 	font-size: 20px;
@ -37,16 +57,8 @@ display: inline-block;
 	text-decoration: none;
 }

-.horizontal-scroll-wrapper {
-	display: inline-table;
-	margin-top: 10vw;
-	width: 20vw;
-	height: 80vw;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
 .event {
+	margin-top: 3%;
 	text-align-last: auto;
 	font-family: Roboto Mono;
 	font-size: 10px;
@ -59,23 +71,22 @@ display: inline-block;
 .pubpageinfo {

 	padding-top: 10px;
-	font-size: 10px;
+	font-size: 15px;
 }

 .pubpageinfo:hover {
 	background-color: #0BEFEB;
 	padding: 10px;	
-	font-size: 15px;	
 }

 .thumbborder {
-	box-shadow: 8px 8px 8px #C4BCB9;
-	width: 30%;
+	box-shadow: 10px 10px 15px #C4BCB9;
+	width: 40%;
 	height: auto;
 }

 .thumbborder:hover {
-	box-shadow: 8px 8px 8px #0BEFEB;
+	box-shadow: 10px 10px 15px #0BEFEB;
 	width:100%; 
 	transition:0.5s;
 	height: auto;
--- a/templates/orgs.html
+++ b/templates/orgs.html
@ -10,7 +10,7 @@
    <title>{{ page.name }}</title>
 </head>
 <body>
-    <h1>&#9636; {{ page.name }}</h1>
+    <h1>{{ page.name }}</h1>

    <div class="scrollcolumn">
      <button onclick="scrollWin(0,-5000)" class="up scrl">&#8988;<span class="scbt">Up</span></button>
--- a/templates/timeline.html
+++ b/templates/timeline.html
@ -8,7 +8,7 @@
    <title>Timeline</title>
 </head>
 <body>
-    <h1>Timeline</h1>
+    <div class="pagetitle">&#9481;Timeline</div>
    <div id="body">{{ body|safe }}</div>

 </body>