feat: update for Doks v1.0.0-beta.2

thuliteio · Jun 9, 2023 · 6e9806e · 6e9806e
1 parent 210caaa
commit 6e9806e
Show file tree

Hide file tree

Showing 12 changed files with 1,338 additions and 1,208 deletions.
diff --git a/assets/scss/common/_global.scss b/assets/scss/common/_global.scss
@@ -398,11 +398,11 @@ li input[type="checkbox"]:checked {
   }
 }
 
-.content .icon {
+.content .svg-inline {
   margin-bottom: 1.5rem;
 }
 
-.content .icon:not(.icon-custom) {
+.content .svg-inline:not(.svg-inline-custom) {
   height: 1.5rem;
   width: 1.5rem;
   stroke-width: 1.5;
@@ -430,24 +430,24 @@ li input[type="checkbox"]:checked {
   }
 }
 
-.icon-lightmode {
+.svg-lightmode {
   display: block;
 }
 
-.icon-darkmode {
+.svg-darkmode {
   display: none;
 }
 
-.icon-monochrome path {
+.svg-monochrome path {
   fill: $db-bluishCyan-100;
 }
 
 @include color-mode(dark) {
-  .icon-lightmode {
+  .svg-lightmode {
     display: none;
   }
 
-  .icon-darkmode {
+  .svg-darkmode {
     display: block;
   }
 
@@ -456,7 +456,7 @@ li input[type="checkbox"]:checked {
     fill: $white;
   }
 
-  .icon-monochrome path {
+  .svg-monochrome path {
     fill: $da-gray-125;
   }
 

diff --git a/assets/scss/components/_callouts.scss b/assets/scss/components/_callouts.scss
@@ -29,7 +29,7 @@
     margin-top: -.25rem;
   }
 
-  .icon {
+  .svg-inline {
     position: relative;    
     margin: -0.25rem 0 0;
   }
@@ -41,8 +41,8 @@
     text-transform: uppercase;
     font-size: 1rem;
 
-    .icon {
-      margin-right: 0.5rem;
+    .svg-inline {
+      margin-right: 0.25rem;
     }
   }
 

diff --git a/assets/scss/components/_images.scss b/assets/scss/components/_images.scss
@@ -1,3 +1,4 @@
+/*
 figure {
   margin: 0 0 1rem;
   display: inline-block;
@@ -60,6 +61,25 @@ figure.wide .figure-caption {
   margin-top: 0.375rem;
   margin-bottom: 1.25rem;
 }
+*/
+
+img[data-sizes="auto"] {
+  display: block;
+  width: 100%;
+}
+
+.figure {
+  display: block;
+}
+
+.blur-up {
+  filter: blur(5px);
+  transition: filter 400ms;
+}
+
+.blur-up.lazyloaded {
+  filter: unset;
+}
 
 .content .gitpod-mark-monochrome.icon {
   margin-bottom: 0.125rem;

diff --git a/config/_default/module.toml b/config/_default/module.toml
@@ -0,0 +1,59 @@
+[[mounts]]
+  source = "node_modules/@hyas/doks-core/archetypes"
+  target = "archetypes"
+
+[[mounts]]
+  source = "node_modules/@hyas/doks-core/assets"
+  target = "assets"
+
+[[mounts]]
+  source = "node_modules/@hyas/doks-core/content"
+  target = "content"
+
+[[mounts]]
+  source = "node_modules/@hyas/doks-core/data"
+  target = "data"
+
+[[mounts]]
+  source = "node_modules/@hyas/doks-core/i18n"
+  target = "i18n"
+
+[[mounts]]
+  source = "node_modules/@hyas/doks-core/layouts"
+  target = "layouts"
+
+[[mounts]]
+  source = "node_modules/@hyas/doks-core/static"
+  target = "static"
+
+[[mounts]]
+  source = "node_modules/flexsearch"
+  target = "assets/js/vendor/flexsearch"
+
+[[mounts]]
+  source = "archetypes"
+  target = "archetypes"
+
+[[mounts]]
+  source = "assets"
+  target = "assets"
+
+[[mounts]]
+  source = "content"
+  target = "content"
+
+[[mounts]]
+  source = "data"
+  target = "data"
+
+[[mounts]]
+  source = "i18n"
+  target = "i18n"
+
+[[mounts]]
+  source = "layouts"
+  target = "layouts"
+
+[[mounts]]
+  source = "static"
+  target = "static"
diff --git a/layouts/_default/term.html b/layouts/_default/term.html
@@ -29,7 +29,12 @@ <h1 class="text-center">{{ .Title }}</h1>
       <div class="card">
         {{ $image := .Resources.GetMatch (printf "**%s" (index .Params.images 0)) -}}
         {{ if $image -}}
-          {{ partial "lazyimg" (dict "img" $image "alt" .Title "class" "img-fluid w-100 h-auto rounded-0") }}
+          {{ partial "picture" (dict
+          "ctx" .
+          "src" $image
+          "alt" .Title
+          "class" "img-fluid blur-up w-100 h-auto rounded-0"
+          )}}
         {{ end -}}
         <div class="card-body">
           <article>

diff --git a/layouts/blog/list.html b/layouts/blog/list.html
@@ -29,7 +29,12 @@ <h1 class="text-center">{{ .Title }}</h1>
       <div class="card">
         {{ $image := .Resources.GetMatch (printf "**%s" (index .Params.images 0)) -}}
         {{ if $image -}}
-          {{ partial "lazyimg" (dict "img" $image "alt" .Title "class" "img-fluid w-100 h-auto rounded-0") }}
+          {{ partial "picture" (dict
+          "ctx" .
+          "src" $image
+          "alt" .Title
+          "class" "img-fluid blur-up w-100 h-auto rounded-0"
+          )}}
         {{ end -}}
         <div class="card-body">
           <article>

diff --git a/layouts/blog/single.html b/layouts/blog/single.html
@@ -11,7 +11,12 @@ <h1>{{ .Title }}</h1>
     {{ $image := .Resources.GetMatch (printf "**%s" (index .Params.images 0)) -}}
     {{ if $image -}}
       <div class="col-md-13">
-        {{ partial "lazyimg" (dict "img" $image "alt" .Title "class" "img-fluid img-post-single w-100 h-auto rounded-0") }}
+        {{ partial "picture" (dict
+        "ctx" .
+        "src" $image
+        "alt" .Title
+        "class" "img-fluid blur-up img-post-single w-100 h-auto rounded-0"
+        )}}
       </div>
     {{ end -}}
 

diff --git a/layouts/legal/single.html b/layouts/legal/single.html
@@ -11,7 +11,12 @@ <h1>{{ .Title }}</h1>
     {{ $image := .Resources.GetMatch (printf "**%s" (index .Params.images 0)) -}}
     {{ if $image -}}
       <div class="col-md-13">
-        {{ partial "lazyimg" (dict "img" $image "alt" .Title "class" "img-fluid img-post-single w-100 h-auto rounded-0") }}
+        {{ partial "picture" (dict
+        "ctx" .
+        "src" $image
+        "alt" .Title
+        "class" "img-fluid blur-up img-post-single w-100 h-auto rounded-0"
+        )}}
       </div>
     {{ end -}}
 

diff --git a/layouts/partials/header/header.html b/layouts/partials/header/header.html
@@ -18,7 +18,7 @@
   {{ end -}}
 
     <!-- Site title -->
-    <a class="navbar-brand me-auto me-lg-3" href="{{ "/" | absURL }}">{{ .Site.Params.Title }}</a>
+    <a class="navbar-brand me-auto me-lg-3" href="{{ "/" | absURL }}">{{ .Site.Title }}</a>
 
     <!-- FlexSearch mobile -->
     {{ partial "main/showFlexSearch" . }}

diff --git a/layouts/shortcodes/callout.html b/layouts/shortcodes/callout.html
@@ -20,9 +20,9 @@
 
 <div class="callout callout-{{ $css_class }} d-flex flex-{{ $flex_direction }}">
   {{- if and $icon $title -}}
-    <div class="callout-title">{{ partial "svg" $icon }}{{ $title | safeHTML }}</div>
+    <div class="callout-title">{{ partial "inline-svg" (dict "src" $icon "stroke-width" "1.5") }}{{ $title | safeHTML }}</div>
   {{- else if $icon -}}
-    <div class="callout-icon me-2">{{ partial "svg" $icon }}</div>
+    <div class="callout-icon me-2">{{ partial "inline-svg" (dict "src" $icon "stroke-width" "1.5") }}</div>
   {{- else if $title -}}
     <p class="callout-title">{{ $title | safeHTML }}</p>
   {{- end -}}