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

5 years ago · fbe4bd8258
parent 5fc6231bee 2180fdaa09
commit fbe4bd8258
3 changed files with 131 additions and 150 deletions
--- a/static/orgs.css
+++ b/static/orgs.css
@ -53,64 +53,52 @@ body {
 	cursor: pointer;
 }

-/* Scroll column */
-.scrollcolumn {
-	position: fixed;
-	display: inline;
-	top:35%;
-	right:0%;
-	width: 60px;
-	outline: none;
-	z-index: 10;
-	text-align: center;
-}
-
 /* Scroll buttons */
 .scrl {
+	position: fixed;
 	background-color: white;
+	color:#371F10;
 	cursor: pointer;
 	border:none;
-	font-size: 15px;
-	margin-top: 10px;
-	height: 60px;
-	width: 60px;
- 	padding-bottom: 15px;
+	font-size: 25px;
+	width: 50px;
+    height: 50px;
 	font-weight: bold;
- 	font-size: 17px;
+	z-index: 10;
+	bottom: 0%;
 }

 .scrl:hover {
-	background-color: #0BEFEB;
+	color: #0BEFEB;
 }

-/* Scroll button title */
-.scbt {
-	visibility: hidden;
-	width: 120px;
-	background-color: black;
-	color: #fff;
-	text-align: center;
-	border-radius: 6px;
-	padding: 5px 0;
-	font-size: 15px;
-	right: 65px;
-	z-index: 10;
-	position: absolute;
+button.down span, button.up span { 
+	position:relative; left: 30%;
+	position:relative; bottom: 65%;
+}
+
+.up {
+	right: 51px; 
+}
+
+.down {
+	right: 0%; 
 }

-.scrl:hover > .scbt {
-	visibility: visible;
+button.bottom span, button.top span { 
+	position:relative; left: 15%;
+	position:relative; bottom: 65%;
 }

-button.up span { 
-	position:relative; bottom: 20%; 
+.top {
+	right: 153px; 
 }

-button.down span { 
-	position:relative; left: 60%;
+.bottom {
+	right: 102px;
 }

-button.bottom span { 
-	position:relative; bottom: 27%;
-	position:relative; left: 27%;
+/* Scroll button title */
+.scbt {
+	visibility: hidden;
 }
--- a/static/timeline.css
+++ b/static/timeline.css
@ -9,17 +9,10 @@ h1 {
 	margin-top: 1%;
 }

-.pagetitle {
-	position: fixed;
-	right:0%;
-	top:5%;
-	text-align: right;
+h2 {
+	font-size: 17px;
 	background-color: #0BEFEB;
-	padding: 3px 35px 3px 10px;
-	z-index: 10;
-	color: black;
-	font-size: 28px;
-	opacity: 0.7;
+	padding: 5px;
 }

 div#body{ width: max-content;}
@ -37,7 +30,8 @@ display: inline-block;

 .content {
 	display: flex;
-	margin-right: 5vw;
+	margin-right: 10vw;
+	margin-left: 5vw;
 }

 .indexlink {
@ -68,15 +62,12 @@ display: inline-block;
 	vertical-align: top;
 }

-.pubpageinfo {
-
-	padding-top: 10px;
-	font-size: 15px;
+.eventfirstpages {
+	padding-bottom: 5vh;
 }

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

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

 </body>
 </html>
+