New content structure outline

Updates #1
bep · Mar 4, 2022 · a3f7261 · a3f7261
1 parent f0fb3ad
commit a3f7261
Show file tree

Hide file tree

Showing 36 changed files with 700 additions and 563 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/assets/css/components/all.css b/assets/css/components/all.css
@@ -1,4 +1,5 @@
 @import "variables.css";
+@import "fonts.css";
 @import "chroma.css";
 @import "chroma_dark.css";
 @import "code.css";

diff --git a/assets/css/components/fonts.css b/assets/css/components/fonts.css
@@ -0,0 +1,45 @@
+/* mulish-200 - latin */
+@font-face {
+    font-family: 'Mulish';
+    font-style: normal;
+    font-weight: 200;
+    src: local(''),
+         url('../fonts/mulish-v10-latin-200.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+         url('../fonts/mulish-v10-latin-200.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  }
+  /* mulish-regular - latin */
+  @font-face {
+    font-family: 'Mulish';
+    font-style: normal;
+    font-weight: 400;
+    src: local(''),
+         url('../fonts/mulish-v10-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+         url('../fonts/mulish-v10-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  }
+  /* mulish-800 - latin */
+  @font-face {
+    font-family: 'Mulish';
+    font-style: normal;
+    font-weight: 800;
+    src: local(''),
+         url('../fonts/mulish-v10-latin-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+         url('../fonts/mulish-v10-latin-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  }
+  /* mulish-italic - latin */
+  @font-face {
+    font-family: 'Mulish';
+    font-style: italic;
+    font-weight: 400;
+    src: local(''),
+         url('../fonts/mulish-v10-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+         url('../fonts/mulish-v10-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  }
+  /* mulish-800italic - latin */
+  @font-face {
+    font-family: 'Mulish';
+    font-style: italic;
+    font-weight: 800;
+    src: local(''),
+         url('../fonts/mulish-v10-latin-800italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+         url('../fonts/mulish-v10-latin-800italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+  }
diff --git a/assets/css/components/prose.css b/assets/css/components/prose.css
@@ -12,7 +12,7 @@
 }
 
 .prose table th {
-  @apply font-semibold;
+  @apply font-extrabold;
 }
 
 .prose table td,

diff --git a/assets/css/styles.css b/assets/css/styles.css
@@ -5,43 +5,43 @@
 @import "components/all.css";
 
 html {
-    font-size: 14px;
+  font-size: 14px;
 }
 
 @screen md {
-    html {
-        font-size: 16px;
-    }
+  html {
+    font-size: 16px;
+  }
 }
 
 body {
-    -moz-osx-font-smoothing: grayscale;
-    -webkit-font-smoothing: antialiased;
-    fill: currentColor; /* Applies to SVG only */
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  fill: currentColor; /* Applies to SVG only */
 }
 
 .nested-blockquote blockquote {
-    border-left: 4px solid var(--primary-color);
-    padding-left: 1em;
-    /*margin: 0;*/
+  border-left: 4px solid var(--primary-color);
+  padding-left: 1em;
+  /*margin: 0;*/
 }
 
 .mw-90 {
-    max-width: 90%;
+  max-width: 90%;
 }
 
 /* Hide pre-initialized DOM elements. */
 [x-cloak] {
-    visibility: hidden;
+  visibility: hidden;
 }
 
 /* Combine with classes in skins and skins-pseudo for 
  * many different transition possibilities. */
 .bg-animate,
 .bg-animate:hover,
 .bg-animate:focus {
-    -webkit-transition: background-color 0.15s ease-in-out;
-    transition: background-color 0.15s ease-in-out;
+  -webkit-transition: background-color 0.15s ease-in-out;
+  transition: background-color 0.15s ease-in-out;
 }
 
 /*
@@ -50,36 +50,36 @@ body {
 
 */
 .dim {
-    opacity: 1;
-    -webkit-transition: opacity 0.15s ease-in;
-    transition: opacity 0.15s ease-in;
+  opacity: 1;
+  -webkit-transition: opacity 0.15s ease-in;
+  transition: opacity 0.15s ease-in;
 }
 .dim:hover,
 .dim:focus {
-    opacity: 0.5;
-    -webkit-transition: opacity 0.15s ease-in;
-    transition: opacity 0.15s ease-in;
+  opacity: 0.5;
+  -webkit-transition: opacity 0.15s ease-in;
+  transition: opacity 0.15s ease-in;
 }
 .dim:active {
-    opacity: 0.8;
-    -webkit-transition: opacity 0.15s ease-out;
-    transition: opacity 0.15s ease-out;
+  opacity: 0.8;
+  -webkit-transition: opacity 0.15s ease-out;
+  transition: opacity 0.15s ease-out;
 }
 
 @layer components {
-    .btn-primary {
-        @apply py-2 px-4 font-semibold rounded-md shadow-md bg-steel-600 hover:bg-steel-700 text-white hover:text-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-steel-500;
-    }
+  .btn-primary {
+    @apply py-2 px-4 font-extrabold rounded-md shadow-md bg-steel-600 hover:bg-steel-700 text-white hover:text-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-steel-500;
+  }
 
-    .btn-secondary {
-        @apply py-2 px-4 font-semibold rounded-md shadow-md bg-green-600 hover:bg-green-700 text-white hover:text-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-steel-500;
-    }
+  .btn-secondary {
+    @apply py-2 px-4 font-extrabold rounded-md shadow-md bg-green-600 hover:bg-green-700 text-white hover:text-gray-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-steel-500;
+  }
 
-    a {
-        @apply text-blue-700 hover:text-steel-500 no-underline;
-    }
+  a {
+    @apply text-blue-700 hover:text-steel-500 no-underline;
+  }
 
-    .dark a {
-        @apply text-steel-600 hover:text-steel-400 no-underline;
-    }
+  .dark a {
+    @apply text-steel-600 hover:text-steel-400 no-underline;
+  }
 }
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -50,6 +50,10 @@ keepWhitespace = true
 
 
 [module]
+[[module.mounts]]
+lang = "en"
+source = "content/en"
+target = "content"
 [[module.imports]]
 path = "github.com/gohugoio/gohugoioTheme2"
 [[module.imports]]
@@ -60,18 +64,13 @@ ignoreImports = true
 [[module.imports.mounts]]
 lang = "en"
 source = "content/en"
-target = "content/documentation"
+target = "content/old"
 
 [[module.imports.mounts]]
 lang = "en"
 source = "content/site/en"
 target = "content"
 
-[[module.imports.mounts]]
-lang = "zh"
-source = "content/zh"
-target = "content/documentation"
-
 [[module.imports.mounts]]
 source = "static"
 target = "static"

diff --git a/exampleSite/content/en/documentation/_index.md b/exampleSite/content/en/documentation/_index.md
@@ -0,0 +1,5 @@
+---
+title: Hugo Documentation
+linkTitle: Docs
+---
+
diff --git a/exampleSite/content/en/documentation/explanation/_index.md b/exampleSite/content/en/documentation/explanation/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Explanation"
+linkTitle: "Explanation"
+weight: 20
+---
diff --git a/exampleSite/content/en/documentation/guides/_index.md b/exampleSite/content/en/documentation/guides/_index.md
@@ -0,0 +1,5 @@
+---
+title: "How-to Guides"
+linkTitle: "Guides"
+weight: 40
+---
diff --git a/exampleSite/content/en/documentation/reference/_index.md b/exampleSite/content/en/documentation/reference/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Technical Reference"
+linkTitle: "Reference"
+weight: 10
+---
diff --git a/exampleSite/content/en/documentation/reference/functions/_index.md b/exampleSite/content/en/documentation/reference/functions/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Template Functions"
+linkTitle: "Functions"
+weight: 10
+---
diff --git a/exampleSite/content/en/documentation/reference/functions/collections/index.md b/exampleSite/content/en/documentation/reference/functions/collections/index.md
@@ -0,0 +1,6 @@
+---
+title: "Collections Namespace"
+linkTitle: "collections"
+---
+
+
diff --git a/exampleSite/content/en/documentation/reference/interfaces/_index.md b/exampleSite/content/en/documentation/reference/interfaces/_index.md
@@ -0,0 +1,5 @@
+---
+title: "Interfaces"
+linkTitle: "Interfaces"
+weight: 20
+---
diff --git a/exampleSite/content/en/documentation/reference/interfaces/page/index.md b/exampleSite/content/en/documentation/reference/interfaces/page/index.md
@@ -0,0 +1,6 @@
+---
+title: "Page Interface"
+linkTitle: "Page"
+---
+
+
diff --git a/exampleSite/content/en/documentation/tutorials/_index.md b/exampleSite/content/en/documentation/tutorials/_index.md
@@ -0,0 +1,4 @@
+---
+title: "Tutorials"
+weight: 30
+---
diff --git a/layouts/_default/list.html b/layouts/_default/list.html
@@ -1,12 +1,6 @@
 {{ define "main" }}
-  {{ $pages := "" }}
-  {{ if .Parent.IsHome }}
-    {{/* /documentation root: Show all pages in the fundementals category. */}}
-    {{ $pages = (.Site.Taxonomies.categories.fundamentals).Pages | lang.Merge (.Sites.First.Taxonomies.categories.fundamentals).Pages }}
-  {{ else }}
-    {{ $pages = .Pages | union .Sections }}
-  {{ end }}
-  <h1 class="text-3xl text-black font-semibold">
+  {{ $pages := .Pages | union .Sections }}
+  <h1 class="text-3xl text-black font-extrabold">
     {{ .Title | title }}
   </h1>
   <div class="mt-8 text-lg text-black">

diff --git a/layouts/_default/page.html b/layouts/_default/page.html
@@ -9,7 +9,7 @@
   {{ end }}
 
 
-  <h1 class="text-4xl font-semibold leading-tight mb-3 my-0 pt-3 text-black">
+  <h1 class="text-4xl font-extrabold leading-tight mb-3 my-0 pt-3 text-black">
     {{ .Title }}
   </h1>
 </header>
@@ -43,14 +43,15 @@ <h1 class="text-4xl font-semibold leading-tight mb-3 my-0 pt-3 text-black">
     </div>
   {{ end }}
 
-
-  <div class="mt-4 text-gray-300 text-sm">
-    Last updated:
-    {{ .Lastmod.Format "January 2, 2006" }}{{ with .GitInfo }}
-      :
-      <a href="{{ site.Params.ghrepo }}commit/{{ .Hash }}"
-        >{{ .Subject }} ({{ .AbbreviatedHash }})</a
-      >
-    {{ end }}
-  </div>
+  {{ if .Lastmod }}
+    <div class="mt-4 text-gray-300 text-sm">
+      Last updated:
+      {{ .Lastmod.Format "January 2, 2006" }}{{ with .GitInfo }}
+        :
+        <a href="{{ site.Params.ghrepo }}commit/{{ .Hash }}"
+          >{{ .Subject }} ({{ .AbbreviatedHash }})</a
+        >
+      {{ end }}
+    </div>
+  {{ end }}
 </div>
diff --git a/layouts/news/list.html b/layouts/news/list.html
@@ -24,7 +24,7 @@ <h1 class="text-steel-900">
 
       {{ $interior_classes := $.Site.Params.flex_box_interior_classes }}
       <section class="sm:flex flex-wrap justify-between w-full w-80-nsTK v-top">
-        {{ $paginator := .Paginate (.Pages | lang.Merge (where .Sites.First.RegularPages "Section" .Section)) -}}
+        {{ $paginator := .Paginator -}}
         {{ range $paginator.Pages }}
           {{ partial "boxes-section-summaries" (dict "context" . "classes" $interior_classes "fullcontent" false) }}
         {{ end }}

diff --git a/layouts/partials/home-page-sections/showcase.html b/layouts/partials/home-page-sections/showcase.html
@@ -24,7 +24,7 @@
         >{{ $p.Summary | truncate 80 }}</a
       >
       <a
-        class="inline-flex items-center text-base md:text-lg text-steel-600 hover:text-steel-700 font-semibold"
+        class="inline-flex items-center text-base md:text-lg text-steel-600 hover:text-steel-700 font-extrabold"
         href="{{ $p.RelPermalink }}">
         <span class="mr-3">Read More</span>
         <svg

diff --git a/layouts/partials/home-page-sections/showcase2.html b/layouts/partials/home-page-sections/showcase2.html
@@ -16,7 +16,7 @@ <h3 class="text-5xl font-bold leading-tight tracking-tight pb-4 lg:pb-14">
           src="{{ $img.RelPermalink }}"
           alt="" />
       </div>
-      <h2 class="mb-3 text-3xl font-semibold font-heading">
+      <h2 class="mb-3 text-3xl font-extrabold font-heading">
         {{ .LinkTitle }}
       </h2>
       <p class="mb-3 text-xl  three-lines-ellipsis">

diff --git a/layouts/partials/home-page-sections/testimonials.html b/layouts/partials/home-page-sections/testimonials.html
@@ -7,7 +7,7 @@
           <h3 class="pb-14 mb-auto text-xl md:text-2xl font-light">
             {{ .quote | safeHTML }}
           </h3>
-          <h4 class="mb-1 text-lg font-semibold">
+          <h4 class="mb-1 text-lg font-extrabold">
             <a href="{{ .link }}">
               {{ .name | default .twitter_handle }}
             </a>

diff --git a/layouts/partials/sections/common/head.html b/layouts/partials/sections/common/head.html
@@ -1,10 +1,6 @@
 <head>
   <meta charset="utf-8" />
-  {{/* TODO1 self host https://fonts.google.com/specimen/Mulish?preview.text_type=custom */}}
-  <link rel="preconnect" href="https://fonts.gstatic.com" />
-  <link
-    href="https://fonts.googleapis.com/css2?family=Mulish:wght@200;400;800&display=swap"
-    rel="stylesheet" />
+
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   {{/* NOTE: the Site's title, and if there is a page title, that is set too */}}
   <title>