Merge branch 'master' into debian

1 files changed, 27 insertions, 14 deletions

diff --git a/doc/template.html b/doc/template.html
index e17f0e3..2cd7cc9 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -15,12 +15,25 @@ $if(keywords)$
 $endif$
   <title>$if(title-prefix)$$title-prefix$ – $endif$$pagetitle$</title>
   <style type="text/css">
-      code{white-space: pre-wrap;}
-      span.smallcaps{font-variant: small-caps;}
-      span.underline{text-decoration: underline;}
-      div.column{display: inline-block; vertical-align: top; width: 50%;}
+    code{white-space: pre-wrap;}
+    span.smallcaps{font-variant: small-caps;}
+    span.underline{text-decoration: underline;}
+    div.column{display: inline-block; vertical-align: top; width: 50%;}
+    pre{tab-size: 4; -moz-tab-size: 4;}
+    @media only screen and (min-width: 600px) {
+      .parent {
+        float: right;
+        margin-left: 1em;
+      }
+      .content p {
+        text-align: justify;
+      }
+    }
+    @media(max-width: 1440px) { .container{ max-width: 1080px; } }
+    @media(max-width: 1280px) { .container{ max-width: 960px; } }
+    @media(max-width: 1024px) { .container{ max-width: 768px; } }
 $if(quotes)$
-      q { quotes: "“" "”" "‘" "’"; }
+    q { quotes: "“" "”" "‘" "’"; }
 $endif$
   </style>
 $if(highlighting-css)$
@@ -31,11 +44,6 @@ $endif$
 $for(css)$
   <link rel="stylesheet" href="$css$" />
 $endfor$
-  <style type="text/css">
-    @media(max-width: 1440px) { .container{ max-width: 1080px; } }
-    @media(max-width: 1280px) { .container{ max-width: 960px; } }
-    @media(max-width: 1024px) { .container{ max-width: 768px; } }
-  </style>
 $if(math)$
   $math$
 $endif$
@@ -48,21 +56,26 @@ $endfor$
 $for(include-before)$
 $include-before$
 $endfor$
-<div class="container text-justify">
+<div class="container">
   <div class="content">
 $if(title)$
-    <div class="page-header"><h1>$title$</h1></div>
+  <div class="page-header">
+$if(parent)$
+    <div class=parent><a href="$parent$"><span class="glyphicon glyphicon-circle-arrow-up" aria-hidden="true"></span> Parent</a></div>
+$endif$
+    <h1 style="">$title$</h1>
+  </div>
 $endif$
 
 $body$
-  </div>
+</div>
 
   <footer>
     <hr/>
     <div class="row">
       <div class="col-md-8 text-muted">
 $if(author)$
-        <a href="https://git.guilhem.org/interimap/plain/COPYING">&copy;</a>
+        <a href="https://git.guilhem.org/interimap/plain/COPYING">Copyright</a> &copy;
         $for(author)$$author$$sep$, $endfor$
 $endif$
       </div>