fix merge conflicts and error in template

Author: Alban Bailly

themes/dlc/layouts/_default/baseof.html

@@ -0,0 +1,42 @@
+{{ partial "0_utilities/htmlHead.html" . }}
+
+  {{ if .Site.Params.dev.enable}}
+    {{ partial "1_atoms/cssinfo.html" . }}
+  {{ end }}
+
+  <div class="content">
+    <div class="header-wrapper bg-light-black">
+      <header class="header max-w-4xl mx-auto p-4 flex flex-wrap items-center justify-between">
+        {{ block "header" . }}
+          {{ partial "3_organisms/header.html" . }}
+        {{ end }}
+      </header>
+    </div>
+
+    <div class="main-wrapper max-w-4xl mx-auto p-4">
+      <main class="main">
+        {{ block "main" . }}
+          {{ partial "3_organisms/content.html" . }}
+        {{ end }}
+      </main>
+    </div>
+
+    <div class="footer-nav-wrapper mx-auto p-4 items-center justify-between">
+      <div class="footer-nav">
+        {{ block "footer-nav" . }}
+          {{ partial "3_organisms/footer-nav.html" . }}
+        {{ end }}
+      </div>
+    </div>
+  </div>
+
+  <div class="footer-wrapper bg-black">
+    <footer class="footer max-w-4xl mx-auto py-8 px-4 text-white">
+      {{ block "footer" . }}
+        {{ partial "3_organisms/footer.html" . }}
+      {{ end }}
+    </footer>
+  </div>
+
+{{ partial "0_utilities/scripts.html" . }}
+{{ partial "0_utilities/htmlFoot.html" . }}

themes/linode-hugo-base-theme/layouts/partials/3_organisms/footer-nav.html renamed to themes/dlc/layouts/partials/3_organisms/footer-nav.html

@@ -34,7 +34,7 @@ <h5><a href="https://linode.com/about">Company</a></h5>
         <h5><a href="https://linode.com/agreement">Legal</a></h5>
         <ul>
             <li><a href="https://linode.com/agreement">Customer Agreement</a></li>
-            <li><a href=https://linode.com"/tos">Terms of Service</a></li>
+            <li><a href="https://linode.com/tos">Terms of Service</a></li>
             <li><a href="https://linode.com/privacy">Privacy Policy</a></li>
             <li><a href="https://linode.com/aup">Acceptable Use Policy</a></li>
         </ul>

themes/dlc/layouts/partials/3_organisms/footer.html

@@ -0,0 +1,19 @@
+<div class="container mx-auto max-w-xl">
+  <div class="flex -mx-2">
+    <div class="w-1/3 px-2 text-center">
+      <div class="h-12">
+        &copy; {{ now.Year }} Linode, LLC
+      </div>
+    </div>
+    <div class="w-1/3 px-2 text-center">
+      <div class="h-12">
+          <a href="https://www.linode.com/security" target="_blank">Security</a>
+      </div>
+    </div>
+    <div class="w-1/3 px-2 text-center">
+      <div class="h-12">
+        <a href="https://www.linode.com/compliance" target="_blank">Standards &amp; Compliance</a>
+      </div>
+    </div>
+  </div>
+</div>

themes/dlc/static/assets/css/main.css

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */
 
 /* Document
@@ -382,6 +381,7 @@ html {
 h1,
 h2,
 h3,
+h5,
 p {
   margin: 0;
 }
@@ -484,6 +484,34 @@ button,
   cursor: pointer;
 }
 
+.container {
+  width: 100%;
+}
+
+@media (min-width: 576px) {
+  .container {
+    max-width: 576px;
+  }
+}
+
+@media (min-width: 768px) {
+  .container {
+    max-width: 768px;
+  }
+}
+
+@media (min-width: 992px) {
+  .container {
+    max-width: 992px;
+  }
+}
+
+@media (min-width: 1200px) {
+  .container {
+    max-width: 1200px;
+  }
+}
+
 .bg-black {
   background-color: #22292f;
 }
@@ -544,6 +572,16 @@ button,
           justify-content: space-between;
 }
 
+.flex-1 {
+  -webkit-box-flex: 1;
+      -ms-flex: 1;
+          flex: 1;
+}
+
+.h-12 {
+  height: 3rem;
+}
+
 .h-full {
   height: 100%;
 }
@@ -582,6 +620,10 @@ button,
   max-width: 50rem;
 }
 
+.max-w-xl {
+  max-width: 60rem;
+}
+
 .max-w-2xl {
   max-width: 70rem;
 }
@@ -590,6 +632,11 @@ button,
   max-width: 90rem;
 }
 
+.-mx-2 {
+  margin-left: -0.5rem;
+  margin-right: -0.5rem;
+}
+
 .-mx-4 {
   margin-left: -1rem;
   margin-right: -1rem;
@@ -603,6 +650,11 @@ button,
   padding: 2rem;
 }
 
+.px-2 {
+  padding-left: .5rem;
+  padding-right: .5rem;
+}
+
 .px-4 {
   padding-left: 1rem;
   padding-right: 1rem;
@@ -625,6 +677,10 @@ button,
   text-align: center;
 }
 
+.text-right {
+  text-align: right;
+}
+
 .text-white {
   color: #fff;
 }
@@ -639,6 +695,18 @@ button,
   white-space: nowrap;
 }
 
+.w-1\/3 {
+  width: 33.33333%;
+}
+
+.w-1\/4 {
+  width: 25%;
+}
+
+.w-3\/4 {
+  width: 75%;
+}
+
 .w-full {
   width: 100%;
 }
@@ -677,7 +745,8 @@ body {
 
 h1,
 h2,
-h3 {
+h3,
+h5 {
   font-family: Lato, sans-serif;
   font-weight: var(--heading-font-weight);
   line-height: var(--heading-line-height);
@@ -708,6 +777,10 @@ h3 {
   font-size: var(--h3);
 }
 
+h5 {
+  font-size: var(--h5);
+}
+
 a {
   color: #1ab15c;
   text-decoration: none;
@@ -871,6 +944,3 @@ a.active {
     width: 33.33333%;
   }
 }
-=======
-/*! normalize.css v7.0.0 | MIT License | github.com/necolas/normalize.css */html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;line-height:1.15}body{margin:0}h1{font-size:2em;margin:.67em 0}main{display:block}a{-webkit-text-decoration-skip:objects;background-color:transparent}img{border-style:none}/* 1 */ [type=reset],[type=submit],html [type=button]{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}[type=checkbox],[type=radio]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-cancel-button,[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}/* 1 */[hidden]{display:none}html{-webkit-box-sizing:border-box;box-sizing:border-box;font-family:sans-serif}*,:after,:before{-webkit-box-sizing:inherit;box-sizing:inherit}h1,h2,h3,p{margin:0}[tabindex="-1"]:focus{outline:none!important}*,:after,:before{border:0 solid #dae1e7}img{border-style:solid}[type=button],[type=reset],[type=submit]{border-radius:0}img{max-width:100%}[role=button]{cursor:pointer}.container{width:100%}@media (min-width:576px){.container{max-width:576px}}@media (min-width:768px){.container{max-width:768px}}@media (min-width:992px){.container{max-width:992px}}@media (min-width:1200px){.container{max-width:1200px}}.flex{display:-webkit-box;display:-ms-flexbox;display:flex}.h-12{height:3rem}.mx-auto{margin-left:auto;margin-right:auto}.mb-4{margin-bottom:1rem}.max-w-xl{max-width:60rem}.p-4{padding:1rem}.text-center{text-align:center}.text-right{text-align:right}.w-1{width:.25rem}.w-3{width:.75rem}.w-full{width:100%}
->>>>>>> Design of changelog page

themes/linode-hugo-base-theme/layouts/_default/baseof.html

@@ -20,14 +20,6 @@
         {{ end }}
       </main>
     </div>
-
-    <div class="footer-nav-wrapper mx-auto p-4 items-center justify-between">
-      <div class="footer-nav">
-        {{ block "footer-nav" . }}
-          {{ partial "3_organisms/footer-nav.html" . }}
-        {{ end }}
-      </div>
-    </div>
   </div>
 
   <div class="footer-wrapper bg-black">

themes/linode-hugo-base-theme/layouts/partials/3_organisms/footer.html

@@ -1,19 +1 @@
-    <div class="container mx-auto max-w-xl">
-        <div class="flex -mx-2">
-            <div class="w-1/3 px-2 text-center">
-                <div class="h-12">
-                   &copy; {{ now.Year }} Linode, LLC
-                </div>
-            </div>
-            <div class="w-1/3 px-2 text-center">
-                <div class="h-12">
-                   <a href="https://www.linode.com/security" target="_blank">Security</a>
-                </div>
-            </div>
-            <div class="w-1/3 px-2 text-center">
-                <div class="h-12">
-                    <a href="https://www.linode.com/compliance" target="_blank">Standards &amp; Compliance</a>
-                </div>
-            </div>
-        </div>
-    </div>
+&copy; {{ now.Year }} {{ .Site.Title }}