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

5 years ago · 7c7f2ca52b
parent 3ee99858f7 92622ad9ab
commit 7c7f2ca52b
2 changed files with 68 additions and 102 deletions
--- a/static/orgs.css
+++ b/static/orgs.css
@ -1,151 +1,115 @@
+
+#top {
+	padding-top: 20px;
+	padding-left: 50px;
+}
+
 body {
 	background-color: #F4EBE8;
 	font-family: Roboto Mono;
-	font-size:11.5px;
-
+	font-size:14px;
 }

+/* Page title */
 h1 {
 	position: fixed;
 	right:0%;
-	top:3%;
+	top:5%;
 	text-align: right;
 	background-color: #0BEFEB;
-	padding: 15px 85px 15px 30px;
-	z-index: 10;
-	color: #371F10;
-	font-size: 28px;
-	opacity: 0.7;
-}
-
-/*
-h1 {
-	position: fixed;
-	right:0%;
-	top:3%;
-	text-align: right;
-	background-color: transparent;
-	padding: 10px 30px 30px 20px;
+	padding: 3px 35px 3px 10px;
 	z-index: 10;
 	color: black;
 	font-size: 28px;
-	border: 1px solid blue;
-	border-right: none;
+	opacity: 0.7;
+	color: #371F10;
 }
-*/

+/* Organizations list */
 .collapsible{
 	padding-left: 70px;
-	line-height: 0%;
+    line-height: 1;
 	color: #371F10;
 }

 .active, .collapsible:hover {
-	color: red;
+	color: blue;
 	cursor: pointer;
 }

 .active, .collapsible:after {
 	padding-top: 10px;
-	color: #054646;
 	padding-left: 85px;
+	color: #371F10;
+	font-weight: bold;
 }

+/* Droped-down publication links */
 .content {
 	max-height: 0;
   	overflow: hidden;
    transition: max-height 0.2s ease-out;
    padding-left: 50px;
-    background-color: #86a2a2;
+    background-color: #371F10;
    position: relative;
    line-height: 30px;
    margin-left: 85px;
+    color: white;
+    font-size: 14px;
 }

-.up {
-	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 15.1%; 
-	background-color: blue;
-	z-index: 10;
-	padding: 10px;
-	border: none; 
-}
-
-.down {
-	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 12.8%; 
-	background-color: blue;
-	z-index: 10;
-	padding: 10px;
-	border: none; 
-}
-
-.top {
-	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 17.3%;
-	background-color: blue;
-	z-index: 10;
-	padding: 10px;
-	border: none; 
+.content a {
+	color:white;
+	text-decoration: none;
 }

-.bottom {
-	position: fixed;
-	font-weight: bolder;
-	bottom: 0%;
-	right: 10%;
-	background-color: blue;
-	z-index: 10;
-	padding: 10px;
-	border: none; 
+.content a:hover {
+	color: blue;
+	cursor: pointer;
 }

-.indexlink {
+/* Scroll column */
+.scrollcolumn {
 	position: fixed;
-	text-decoration: none;
-	font-size: 40px;
-	bottom: 0%;
+	display: inline;
+	top:35%;
 	right:0%;
-	background-color: transparent;
-	border: none;
-	border-right-color: transparent;
+	width: 60px;
+	outline: none;
 	z-index: 10;
-	padding: 0px 20px 10px 10px;
-	border: none;
+	text-align: center;
 }

-.timeline {
-	position: fixed;
-    font-size: 20px;
-	bottom: 0%;
-	right: 3%;
-	background-color: transparent;
-	border: none;
-	border-right-color: transparent;
-	z-index: 10;
-	padding: 0px 30px 20px 10px;
+/* Scroll buttons */
+.scrl {
+	background-color: white;
+	cursor: pointer;
 	border:none;
+	font-size: 15px;
+	margin-top: 10px;
+	height: 60px;
+	width: 60px;
 }

-.timeline a {
-	text-decoration: none;
-}
-
-.indexlink a {
-	text-decoration: none;
+.scrl:hover {
+	background-color: #0BEFEB;
 }

-#top {
-	padding-top: 42px;
+/* 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: 50px;
+	z-index: 10;
+	position: absolute;
 }

-.up:hover, .down:hover, .top:hover, .bottom:hover {
-	cursor: pointer;
-	color: white;
+.scrl:hover > .scbt {
+	visibility: visible;
 }
--- a/templates/orgs.html
+++ b/templates/orgs.html
@ -10,12 +10,14 @@
    <title>{{ page.name }}</title>
 </head>
 <body>
-    <h1>&#9636; &nbsp; {{ page.name }}</h1>
-
-    <button onclick="scrollWin(0,5000)" class="down" title="Down">&#8991;</button>
-    <button onclick="scrollWin(0,-5000)" class="up" title="Up">&#8988;</button>
-    <button onclick="scrollToTop()" class="top" title="Top">&#9140;</button>
-    <button onclick="scrollToBottom()" class="bottom" title="Bottom">&#9141;</button>
+    <h1>&#9636; {{ page.name }}</h1>
+
+    <div class="scrollcolumn">
+      <button onclick="scrollWin(0,-5000)" class="up scrl">&#8988;<span class="scbt">Up</span></button>
+      <button onclick="scrollWin(0,5000)" class="down scrl">&#8991;<span class="scbt">Down</span></button>
+      <button onclick="scrollToTop()" class="top scrl">&#9140;<span class="scbt">Top</span></button>
+      <button onclick="scrollToBottom()" class="bottom scrl">&#9141;<span class="scbt">Bottom</span></button>
+    </div>
    
    <div id="body">{{ body|safe }}</div>