X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/35336cd73e444534cb2eda20e3730464cc4e6553..3aaefcb3c76ff470b475d950398d01255e87712a:/doc/_layouts/default.html.liquid?ds=sidebyside

diff --git a/doc/_layouts/default.html.liquid b/doc/_layouts/default.html.liquid
index 4585b7032a..db6c00bc3e 100644
--- a/doc/_layouts/default.html.liquid
+++ b/doc/_layouts/default.html.liquid
@@ -1,8 +1,14 @@
+{% comment %}
+Copyright (C) The Arvados Authors. All rights reserved.
+
+SPDX-License-Identifier: CC-BY-SA-3.0
+{% endcomment %}
+
 <!DOCTYPE html>
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{% unless page.title == "Arvados | Documentation" %} Arvados | Documentation | {% endunless %}{{ page.title }}</title>
+    <title>{% unless page.title == "Arvados | Documentation" %} Arvados {% if page.navmenu %}| {{ page.navmenu }} {% endif %} | {% endunless %}{{ page.title }}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
@@ -12,53 +18,15 @@
     <link href="{{ site.baseurl }}/css/nav-list.css" rel="stylesheet">
     <link href="{{ site.baseurl }}/css/badges.css" rel="stylesheet">
     <link href="{{ site.baseurl }}/css/code.css" rel="stylesheet">
-    <style>
-      html {
-      height:100%;
-      }
-      body {
-      padding-top: 61px;
-      height: 90%; /* If calc() is not supported */
-      height: calc(100% - 46px); /* Sets the body full height minus the padding for the menu bar */
-      }
-      @media (max-width: 979px) {
-      div.frontpagehero {
-      margin-left: -20px;
-      margin-right: -20px;
-      padding-left: 20px;
-      }
-      }
-      .sidebar-nav {
-        padding: 9px 0;
-      }
-      .section-block {
-      background: #eeeeee;
-      padding: 1em;
-      -webkit-border-radius: 12px;
-      -moz-border-radius: 12px;
-      border-radius: 12px;
-      margin: 0 2em;
-      }
-      .row-fluid :first-child .section-block {
-      margin-left: 0;
-      }
-      .row-fluid :last-child .section-block {
-      margin-right: 0;
-      }
-      .rarr {
-      font-size: 1.5em;
-      }
-      .darr {
-      font-size: 4em;
-      text-align: center;
-      margin-bottom: 1em;
-      }
-      :target {
-      padding-top: 61px;
-      margin-top: -61px;
-      }
-    </style>
-    
+    <link href="{{ site.baseurl }}/css/font-awesome.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/carousel-override.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/button-override.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/images.css" rel="stylesheet">
+    <link href="{{ site.baseurl }}/css/layout.css" rel="stylesheet">
+    <script src="{{ site.baseurl }}/js/jquery.min.js"></script>
+    <script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
+    <script src="https://hypothes.is/embed.js" async></script>
+
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
         <script src="../assets/js/html5shiv.js"></script>
@@ -71,7 +39,8 @@
     {{ content }}
     {% else %}
 
-    <div class="container-fluid">
+    <div class="container-fluid" style="padding-right: 30px">
+
       <div class="row">
         {% include 'navbar_left' %}
         <div class="col-sm-9">
@@ -85,8 +54,6 @@
 
     </div>
     {% endif %}
-    <script src="{{ site.baseurl }}/js/jquery.min.js"></script>
-    <script src="{{ site.baseurl }}/js/bootstrap.min.js"></script>
     <script>
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -98,14 +65,16 @@
 
     </script>
 
+{% if page.no_nav_left %}
+{% else %}
 <p style="text-align: center"><small>
 The content of this documentation is licensed under the
 <a href="{{ site.baseurl }}/user/copying/by-sa-3.0.html">Creative
   Commons Attribution-Share Alike 3.0 United States</a> licence.<br>
-Code samples in this documentation are licensed under the 
+Code samples in this documentation are licensed under the
 <a href="{{ site.baseurl }}/user/copying/LICENSE-2.0.html">Apache License, Version 2.0.</a></small>
 </p>
+{% endif %}
 
   </body>
 </html>
-
