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

4 years ago · 46b8728eaa
parent 796987aeae 3ab051345d
commit 46b8728eaa
5 changed files with 151 additions and 131 deletions
--- a/static/archive.css
+++ b/static/archive.css
@ -47,7 +47,7 @@ body {

 .linkscont{
  margin-top: 10%;
-  height: auto;
+  height: 100vh;
  width: auto;
  position: fixed;
  left:0%;
@ -55,21 +55,20 @@ body {
 }

 .pagelink{
-/*  display:table-cell;
  text-align:center;
-  vertical-align:middle;*/
-  display: inline-flex;
-  justify-content: center;
+  vertical-align:middle;
+  display: block;
+  /*justify-content: center;*/
  align-items: center;
  position: fixed;
+  /*text-align: left;*/
  /*display: block;*/
  left:0px;
-  width:25px;
-  height:25px;
-  padding:10px;
+  width:36px;
+  height:36px;
+  padding-top: 2px;
  background-color: white;
  z-index: 2; 
-  font-size: 24px;
  /*text-align: justify;*/
  border-top-style: solid;
  border-right-style: solid;
@ -80,7 +79,19 @@ body {
  
 }

-.pagelink:hover{
+.icon{
+  text-align:center;
+  vertical-align:middle;
+ /* display: block;*/
+  /*justify-content: center;*/
+  align-items: center; 
+font-size: 24px;
+width: 40%;
+height: 40%;
+vertical-align:middle;
+}
+
+.active, .pagelink:hover{
  background-color: #0BEFEB;
 }

@ -100,18 +111,13 @@ body {
  background-color: #0BEFEB;
 }*/

-.pagename{
-align-items: center;
-width:auto;
-text-align: left;
-}

 .pagelink .pagename{
-  display: inline;
-  position: absolute;
+  display: inline-block;
+  position: relative;
  width: auto;
  padding: 5px;
-  margin-left: 160px;
+  margin-left: 20px;
  font-size: 12px;
  background-color: white;
  visibility: hidden;
--- a/static/index.css
+++ b/static/index.css
@ -1,11 +1,6 @@
 body {
    background: white;
-    max-width: 100%;
-    height:100%;
-    display: inline-table;
-    font-family: Roboto Mono;
-    bottom: 20px;
-    scrollbar-width: thin;
+    height: 100vh;
 }

 /*.img {
@ -38,6 +33,9 @@ display: inline-block;
    line-height: 1.3;
 }
    
+.linkscont{
+position-top:0px;
+}

 /*.pagelink{
  position: fixed;
--- a/static/orgs.css
+++ b/static/orgs.css
@ -27,6 +27,7 @@ body {
 	padding-left: 85px;
 	color: #371F10;
 	font-weight: bold;
+	background-color: transparent;
 }

 /* Droped-down publication links */
@ -60,6 +61,7 @@ body {
 	color:#371F10;
 	cursor: pointer;
 	border:none;
+	border-right:1px solid #D1C8C8;
 	font-size: 25px;
 	width: 50px;
 	height: 50px;
@ -78,7 +80,7 @@ button.down span, button.up span {
 }

 .up {
-	right: 51px; 
+	right: 53px; 
 }

 .down {
@ -91,11 +93,11 @@ button.bottom span, button.top span {
 }

 .top {
-	right: 153px; 
+	right: 159px; 
 }

 .bottom {
-	right: 102px;
+	right: 106px;
 }

 /* Scroll button title */
--- a/static/timeline.css
+++ b/static/timeline.css
@ -4,13 +4,27 @@ body{
 }

 h1 {
+	position: fixed;
+	right:0%;
+	top:5%;
+	text-align: right;
+	background-color: rgba(11,239,235,0.7);
+    color: #371F10;
+	padding: 3px 35px 3px 10px;
+	z-index: 10;
+	font-size: 28px;
+}
+
+.eventdate {
 	font-family: Roboto Mono;
 	font-size: 40px;
+	color: #371F10;
 	margin-top: 1%;
 }

 h2 {
 	font-size: 17px;
+	color: #371F10;
 	background-color: #0BEFEB;
 	padding: 5px;
 }
@ -56,6 +70,7 @@ display: inline-block;
 	text-align-last: auto;
 	font-family: Roboto Mono;
 	font-size: 10px;
+	color: #371F10;
 	padding-left: 5vw;
 	display: inline-block;
 	width:200px;
@ -68,6 +83,7 @@ display: inline-block;

 .pubpageinfo {
 	font-size: 15px;
+	color: #371F10;
 }

 .thumbborder {
@ -82,4 +98,3 @@ display: inline-block;
 	transition:0.5s;
 	height: auto;
 }
-
--- a/templates/timeline.html
+++ b/templates/timeline.html
@ -8,9 +8,8 @@
    <title>Timeline</title>
 </head>
 <body>
-    <div class="pagelink">Timeline</div>
+    <h1>Timeline</h1>
    <div id="body">{{ body|safe }}</div>

 </body>
 </html>
-