Merge branch 'master' of git.hornquist.se:git/vimwiki

author: Hugo Hörnquist <hugo@lysator.liu.se> 2019-06-20 09:26:09 +0200
committer: Hugo Hörnquist <hugo@lysator.liu.se> 2019-06-20 09:26:09 +0200
commit: 9c6511ce76e9188235c364c5ba30cc23d1f9a140 (patch)
tree: 9f10e094828bfabfa661e0abf98089ca12319efc
parent: Thu, 20 Jun 2019 09:25:28 +0200 (diff)
parent: Thu, 06 Jun 2019 16:08:44 +0200 (diff)
download: wiki-public-9c6511ce76e9188235c364c5ba30cc23d1f9a140.tar.gz
wiki-public-9c6511ce76e9188235c364c5ba30cc23d1f9a140.tar.xz
5 files changed, 70 insertions, 214 deletions
diff --git a/Media.wiki b/Media.wiki
index e311eca..5d53964 100644
--- a/Media.wiki
+++ b/Media.wiki
@@ -1,3 +1,6 @@
 == Författare ==
 === Gustaf Wingren ===
 Teolog
+
+== Books ==
+- Player Piano
diff --git a/index.wiki b/index.wiki
index d616b4c..7004cc9 100644
--- a/index.wiki
+++ b/index.wiki
@@ -1,40 +1,41 @@
  = Top Heading =
-    * [[Vimwiki]] (my user guide)
-    * [[GitServer]]
-    * [[Aktiva kurser]]
-    * [[Kalenderhantering]]
-    * [[Västgöta/webbsida]]
-    * [[Västgöta/kassa]]
-    * [[KMM]]
-    * [[Media]]
-    * [[Tobbez]]
-    * [[TeliaNet]]
-    * [[TempSMS]] (burner)
-    * [[Mimetypes]]
-    * [[Dator/Hornquist]]
-    * [[Dator/Hjalmar]]
-    * [[luacrypto]]
-    * [[Bluetooth-keypad]]
-    * [[Terminal Driver]]
-    * [[phone]]
-    * [[switch]]
-    * [[televäxel]]
-    * [[Lysator]]
-    * [[Lysator/jukebox]]
-    * [[Lysator/WWW]]
-    * [[nix]]
-    * [[Movies]]
-    * [[Scripts]]
-    * [[VHDL]]
-    * [[Colors]]
-    * [[Operativsystem]]
-    * [[Matlab]]
-    * [[TexServer]]
-    * [[Nginx]]
-    * [[MediawikiFS]]
-    * [[Spel]]
-    * [[Gamejam]]
-    * [[LiTHeKod]]
+ 
+- [[Vimwiki]] (my user guide)
+- [[GitServer]]
+- [[Aktiva kurser]]
+- [[Kalenderhantering]]
+- [[Västgöta/webbsida]]
+- [[Västgöta/kassa]]
+- [[KMM]]
+- [[Media]]
+- [[Tobbez]]
+- [[TeliaNet]]
+- [[TempSMS]] (burner)
+- [[Mimetypes]]
+- [[Dator/Hornquist]]
+- [[Dator/Hjalmar]]
+- [[luacrypto]]
+- [[Bluetooth-keypad]]
+- [[Terminal Driver]]
+- [[phone]]
+- [[switch]]
+- [[televäxel]]
+- [[Lysator]]
+- [[Lysator/jukebox]]
+- [[Lysator/WWW]]
+- [[nix]]
+- [[Movies]]
+- [[Scripts]]
+- [[VHDL]]
+- [[Colors]]
+- [[Operativsystem]]
+- [[Matlab]]
+- [[TexServer]]
+- [[Nginx]]
+- [[MediawikiFS]]
+- [[Spel]]
+- [[Gamejam]]
+- [[LiTHeKod]]
 
     * [[diary/diary|Dagbok]]
 
diff --git a/templates/add.css b/templates/add.css
index 77c7400..a45ba65 100644
--- a/templates/add.css
+++ b/templates/add.css
@@ -1,5 +1,5 @@
 body {
-	margin: 0;
+	margin: 0.5em;
 	font-size: 100%;
 }
 
@@ -40,3 +40,31 @@ div[id='Top Heading'] + ul li {
 .side > * {
 	margin: auto 0 auto 0;
 }
+
+/* ---------------------------------------- */
+
+footer {
+	font-size: 80%;
+	color: gray;
+}
+
+.toc + ul {
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    right: 1em;
+    width: 20%;
+}
+
+.toc {
+	display: none;
+}
+
+.content {
+    width: 75%;
+	margin-top: -3em;
+}
+
+pre.right {
+	float: right;
+}
diff --git a/templates/default.tpl b/templates/default.tpl
index 0910c5b..22015dd 100644
--- a/templates/default.tpl
+++ b/templates/default.tpl
@@ -7,37 +7,10 @@
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<script src='https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML' async></script>
-		<style>
-footer {
-	font-size: 80%;
-	color: gray;
-}
-
-.toc + ul {
-    height: 100vh;
-    position: fixed;
-    top: 0;
-    right: 1em;
-    width: 20%;
-}
-
-.toc {
-	display: none;
-}
-
-.content {
-    width: 75%;
-	margin-top: -3em;
-}
-
-pre.right {
-	float: right;
-}
-		</style>
 	</head>
 	<body>
 		<div class="top">
-		<a href="/">Home</a>
+			<p><a href="/">Home</a></p>
 		</div>
 		<div class="content">
 			%content%
diff --git a/templates/style.css b/templates/style.css
deleted file mode 100644
index eaf6698..0000000
--- a/templates/style.css
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Below taken from default vimwiki style, with changes.
- */
-body {
-	font-family: Tahoma, Geneva, sans-serif;
-}
-
-h1, h2, h3, h4, h5, h6 {
-	font-family: Trebuchet MS, Helvetica, sans-serif;
-	/* font-weight: bold; */
-	line-height: 100%;
-	margin-top: 1.5em;
-	margin-bottom: 0.5em;
-}
-
-h1 {
-	/* font-size: 2.6em; */
-	color: #a54242;
-}
-
-h2 {
-	/* font-size: 2.2em; */
-	color: #8c9440;
-}
-
-h3 {
-	/* font-size: 1.8em; */
-	color: #5f819d;
-}
-
-p {
-	max-width: 60ex;
-	text-align: justify;
-}
-
-.header a {
-	text-decoration: none;
-	color: inherit;
-}
-
-.header a:hover::after {
-	content: url("http://hugo.hornquist.se/link-tiny.png");
-	padding-left: 0.5em;
-}
-
-table {
-	border-collapse: collapse;
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-tr:nth-child(odd) {
-	background-color: #f0f0f0;
-}
-
-div[id='Top Heading'] + ul {
-	width: 120%;
-}
-
-div[id='Top Heading'] + ul li {
-	display: inline-block;
-	width: 10em;
-}
-
-.side {
-	display: flex;
-	justify-content: space-around;
-}
-
-.side > * {
-	margin: auto 0 auto 0;
-}
-
-/*
-p, pre, blockquote, table, ul, ol, dl {margin-top: 1em; margin-bottom: 1em;}
-ul ul, ul ol, ol ol, ol ul {margin-top: 0.5em; margin-bottom: 0.5em;}
-li {margin: 0.3em auto;}
-ul {margin-left: 2em; padding-left: 0.5em;}
-dt {font-weight: bold;}
-*/
-img {border: none;}
-pre {border-left: 1px solid #ccc; margin-left: 2em; padding-left: 0.5em;}
-blockquote {padding: 0.4em; background-color: #f6f5eb;}
-th, td {border: 1px solid #ccc; padding: 0.3em;}
-th {background-color: lightgray;}
-hr {border: none; border-top: 1px solid #ccc; width: 100%;}
-del {text-decoration: line-through; color: #777777;}
-.toc li {list-style-type: none;}
-.todo {font-weight: bold; background-color: #f0ece8; color: #a03020;}
-.justleft {text-align: left;}
-.justright {text-align: right;}
-.justcenter {text-align: center;}
-.center {margin-left: auto; margin-right: auto;}
-.tag {background-color: #eeeeee; font-family: monospace; padding: 2px;}
-
-/* classes for items of todo lists */
-.rejected {
-    /* list-style: none; */
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAMAAAAMCGV4AAAACXBIWXMAAADFAAAAxQEdzbqoAAAAB3RJTUUH4QgEFhAtuWgv9wAAAPZQTFRFmpqam5iYnJaWnJeXnpSUn5OTopCQpoqKpouLp4iIqIiIrYCAt3V1vW1tv2xsmZmZmpeXnpKS/x4e/x8f/yAg/yIi/yQk/yUl/yYm/ygo/ykp/yws/zAw/zIy/zMz/zQ0/zU1/zY2/zw8/0BA/0ZG/0pK/1FR/1JS/1NT/1RU/1VV/1ZW/1dX/1pa/15e/19f/2Zm/2lp/21t/25u/3R0/3p6/4CA/4GB/4SE/4iI/46O/4+P/52d/6am/6ur/66u/7Oz/7S0/7e3/87O/9fX/9zc/93d/+Dg/+vr/+3t/+/v//Dw//Ly//X1//f3//n5//z8////gzaKowAAAA90Uk5T/Pz8/Pz8/Pz8/Pz8/f39ppQKWQAAAAFiS0dEEnu8bAAAAACuSURBVAhbPY9ZF4FQFEZPSKbIMmWep4gMGTKLkIv6/3/GPbfF97b3w17rA0kQOPgvAeHW6uJ6+5h7HqLdwowgOzejXRXBdx6UdSru216xuOMBHHNU0clTzeSUA6EhF8V8kqroluMiU6HKcuf4phGPr1o2q9kYZWwNq1qfRRmTaXpqsyjj17KkWCxKBUBgXWueHIyiAIg18gsse4KHkLF5IKIY10WQgv7fOy4ST34BRiopZ8WLNrgAAAAASUVORK5CYII=);
-    background-repeat: no-repeat;
-    background-position: 0 .2em;
-    padding-left: 1.5em;
-}
-.done0 {
-    /* list-style: none; */
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAA7SURBVCiR7dMxEgAgCANBI3yVRzF5KxNbW6wsuH7LQ2YKQK1mkswBVERYF5Os3UV3gwd/jF2SkXy66gAZkxS6BniubAAAAABJRU5ErkJggg==);
-    background-repeat: no-repeat;
-    background-position: 0 .2em;
-    padding-left: 1.5em;
-}
-.done1 {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABtSURBVCiR1ZO7DYAwDER9BDmTeZQMFXmUbGYpOjrEryA0wOvO8itOslFrJYAug5BMM4BeSkmjsrv3aVTa8p48Xw1JSkSsWVUFwD05IqS1tmYzk5zzae9jnVVVzGyXb8sALjse+euRkEzu/uirFomVIdDGOLjuAAAAAElFTkSuQmCC);
-    background-repeat: no-repeat;
-    background-position: 0 .15em;
-    padding-left: 1.5em;
-}
-.done2 {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAB1SURBVCiRzdO5DcAgDAVQGxjAYgTvxlDIu1FTIRYAp8qlFISkSH7l5kk+ZIwxKiI2mIyqWoeILYRgZ7GINDOLjnmF3VqklKCUMgTee2DmM661Qs55iI3Zm/1u5h9sm4ig9z4ERHTFzLyd4G4+nFlVrYg8+qoF/c0kdpeMsmcAAAAASUVORK5CYII=);
-    background-repeat: no-repeat;
-    background-position: 0 .15em;
-    padding-left: 1.5em;
-}
-.done3 {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAxQAAAMUBHc26qAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAABoSURBVCiR7dOxDcAgDATA/0DtUdiKoZC3YhLkHjkVKF3idJHiztKfvrHZWnOSE8Fx95RJzlprimJVnXktvXeY2S0SEZRSAAAbmxnGGKH2I5T+8VfxPhIReQSuuY3XyYWa3T2p6quvOgGrvSFGlewuUAAAAABJRU5ErkJggg==);
-    background-repeat: no-repeat;
-    background-position: 0 .15em;
-    padding-left: 1.5em;
-}
-.done4 {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAAQCAYAAAAbBi9cAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAzgAAAM4BlP6ToAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAIISURBVDiNnZQ9SFtRFMd/773kpTaGJoQk1im4VDpWQcTNODhkFBcVTCNCF0NWyeDiIIiCm82QoIMIUkHUxcFBg1SEQoZszSat6cdTn1qNue92CMbEr9Sey+XC/Z/zu+f8h6ukUil3sVg0+M+4cFxk42/jH2wAqqqKSCSiPQdwcHHAnDHH9s/tN1h8V28ETdP+eU8fT9Nt62ancYdIPvJNtsu87bmjrJlrTDVM4RROJs1JrHPrD4Bar7A6cpc54iKOaTdJXCUI2UMVrQZ0Js7YPN18ECKkYNQcJe/OE/4dZsw7VqNXQMvHy3QZXQypQ6ycrtwDjf8aJ+PNEDSCzLpn7+m2pD8ZKHlKarYhy6XjEoCYGcN95qansQeA3fNdki+SaJZGTMQIOoL3W/Z89rxv+tokubNajlvk/vm+LFpF2XnUKZHI0I+QrI7Dw0OZTqdzUkpsM7mZTyfy5OPGyw1tK7AFSvmB/Ks8w8YwbUYbe6/3QEKv0vugfxWPnMLJun+d/kI/WLdizpNjMbAIKrhMF4OuwadBALqqs+RfInwUvuNi+fBd+wjogfogAFVRmffO02q01mZZ0HHdgXIzdz0QQLPezIQygX6llxNKKgOFARYCC49CqhoHIUTlss/Vx2phlYwjw8j1CAlfAiwQiJpiy7o1VHnsG5FISkoJu7Q/2YmmaV+i0ei7v38L2CBguSi5AAAAAElFTkSuQmCC);
-    background-repeat: no-repeat;
-    background-position: 0 .15em;
-    padding-left: 1.5em;
-}
-
-code {
-    font-family: Monaco,"Courier New","DejaVu Sans Mono","Bitstream Vera Sans Mono",monospace;
-    -webkit-border-radius: 1px;
-    -moz-border-radius: 1px;
-    border-radius: 1px;
-    -moz-background-clip: padding;
-    -webkit-background-clip: padding-box;
-    background-clip: padding-box;
-    padding: 0px 3px;
-    display: inline-block;
-    color: #32393d;
-    border: 1px solid #ccc;
-    background-color: #f9f9f9;
-}
author	Hugo Hörnquist <hugo@lysator.liu.se>	2019-06-20 09:26:09 +0200
committer	Hugo Hörnquist <hugo@lysator.liu.se>	2019-06-20 09:26:09 +0200
commit	9c6511ce76e9188235c364c5ba30cc23d1f9a140 (patch)
tree	9f10e094828bfabfa661e0abf98089ca12319efc
parent	Thu, 20 Jun 2019 09:25:28 +0200 (diff)
parent	Thu, 06 Jun 2019 16:08:44 +0200 (diff)
download	wiki-public-9c6511ce76e9188235c364c5ba30cc23d1f9a140.tar.gz wiki-public-9c6511ce76e9188235c364c5ba30cc23d1f9a140.tar.xz