Merge pull request #418 from gethinode/develop

Fix navbar

assets/js/critical/color.js

@@ -40,8 +40,7 @@
       })
 
       for (let i = 0; i < activeSelectors.length; ++i) {
-        activeSelectors[i].className = activeIcon.className
+        activeSelectors[i].innerHTML = activeIcon.innerHTML
-        activeSelectors[i].className = activeSelectors[i].className.replace('theme-icon', 'theme-icon-active')
       }
 
       for (let i = 0; i < activeButtons.length; ++i) {

assets/scss/common/_variables-dark.scss

@@ -1,6 +1,7 @@
 @if $enable-dark-mode {
     @include color-mode(dark) {
         --bs-primary: #{$primary-text-emphasis-dark};
+        --bs-secondary: #{$secondary-text-emphasis-dark};
         --bs-primary-dark: #{$primary-bg-subtle-dark};
         --bs-primary-bg-subtle: #{$primary-bg-subtle-dark};
         --bg-primary-subtle: rgba(var(--bs-primary-rgb), var(--bs-link-opacity, 0.1));
@@ -30,6 +31,10 @@
           background-color: var(--bs-primary);
         }
 
+        .alert-primary {
+          --bs-alert-bg: var(--bg-primary-subtle);
+        }
+        
         .btn-outline-primary {
           --bs-btn-color: var(--bs-primary);
           --bs-btn-border-color: var(--bs-primary);
@@ -41,6 +46,17 @@
           --bs-btn-disabled-border-color: var(--bs-primary);
         }
         
+        .btn-outline-secondary {
+          --bs-btn-color: var(--bs-secondary);
+          --bs-btn-border-color: var(--bs-secondary);
+          --bs-btn-hover-bg: var(--bs-secondary);
+          --bs-btn-hover-border-color: var(--bs-secondary);
+          --bs-btn-active-bg: var(--bs-secondary);
+          --bs-btn-active-border-color: var(--bs-secondary);
+          --bs-btn-disabled-color: var(--bs-secondary);
+          --bs-btn-disabled-border-color: var(--bs-secondary);
+        }
+
         .link-primary {
           color: var(--bs-primary) if($enable-important-utilities, !important, null);
           text-decoration-color: var(--bs-primary) if($enable-important-utilities, !important, null);

assets/scss/common/_variables.scss

@@ -28,6 +28,7 @@ $carousel-dark-control-icon-filter:  invert(0) grayscale(100) !default;
 
 // scss-docs-start color-mode
 $primary-text-emphasis-dark:        mix(white, $primary, $dark-mode-tint) !default;
+$secondary-text-emphasis-dark:      mix(white, $secondary, $dark-mode-tint) !default;
 $link-color-dark:                   mix(white, $primary, $dark-mode-tint) !default;
 $primary-bg-subtle-dark:            mix(black, $primary, $dark-mode-shade) !default;
 $primary-border-subtle-dark:        mix(black, $primary, $dark-mode-shade / 2) !default;

assets/scss/components/_alert.scss

@@ -1,3 +1,18 @@
-.alert-no-decoration {
+.alert code {
-    --bs-alert-border-radius: none;
+    color: inherit;
 }
+
+/* stylelint-disable declaration-block-no-redundant-longhand-properties */
+.alert a {
+    color: inherit;
+    
+    &:link,
+    &:visited,
+    &:hover,
+    &:active {
+        text-decoration-line: underline;
+        text-decoration-style: dotted;
+        text-decoration-color: var(--bs-body);
+    }    
+}
+/* stylelint-enable declaration-block-no-redundant-longhand-properties */

assets/scss/components/_sidebar.scss

@@ -69,24 +69,25 @@
 @if $enable-dark-mode {
     @include color-mode(dark) {
         .sidebar-item {
-            color: var(--bs-tertiary-color);
+            color: var(--bs-body-color);
             margin-left: 0 !important;
             padding-left: 0.85rem !important;
         
             &.active,
             &:hover,
             &:focus {
-                color: var(--bs-secondary-color);
+                color: white !important;
+                background-color: transparent;
             }
         }
 
         .btn-toggle {
-            color: var(--bs-tertiary-color);
+            color: var(--bs-body-color);
         
             &:hover,
             &:focus {
-                color: $secondary;
+                color: white !important;
-                background-color: tint-color($primary, 90%);
+                background-color: transparent;
             }
         
             &::before {
@@ -105,8 +106,8 @@
 
             &:hover,
             &:focus {
-                color: $secondary;
+                color: white !important;
-                background-color: tint-color($primary, 90%);
+                background-color: transparent;
             }
 
             &.active {

assets/scss/components/_timeline.scss

@@ -14,11 +14,7 @@ $semi-circle-border: 0.2rem;
     .timeline-#{$state} {
       --timeline-highlight: var(--#{$prefix}#{$state});
     }
-
+}
-    .timeline-bg-#{$state} {
-        --timeline-connector-bg: var(--#{$prefix}#{$state}-bg-subtle);
-      }
-  }
 
 // scss-docs-end timeline
 
@@ -27,10 +23,16 @@ $semi-circle-border: 0.2rem;
 }
 
 .timeline-sm {
-    --timeline-icon-radius: calc(#{$semi-circle-radius} / 2);
+    --timeline-icon-radius: calc(#{$semi-circle-radius} / 2.4);
     --timeline-offset: 25%
 }
 
+@include media-breakpoint-up(sm) {
+    .timeline-sm {
+        --timeline-icon-radius: calc(#{$semi-circle-radius} / 2);
+    }
+}
+  
 .timeline::before, .timeline-sm::before {
     content: "";
     width: 2 * $semi-circle-border;

assets/scss/components/_toc.scss

@@ -83,6 +83,10 @@
 
         .toc nav a {
             color: var(--bs-body-color);
+
+            &:hover {
+                color: white;
+            }
         }
     }
 }

exampleSite/go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/gethinode/mod-bootstrap v1.1.1 // indirect
-	github.com/gethinode/mod-flexsearch v1.3.0 // indirect
+	github.com/gethinode/mod-flexsearch v1.4.0 // indirect
 	github.com/gethinode/mod-fontawesome v1.2.5 // indirect
 	github.com/gethinode/mod-katex v1.0.2 // indirect
 	github.com/gethinode/mod-leaflet v0.3.4 // indirect

exampleSite/go.sum

@@ -4,6 +4,8 @@ github.com/gethinode/mod-flexsearch v1.2.0 h1:SSMpWzK9SMbi9QRYfil9PJZLLWWLHWzlTc
 github.com/gethinode/mod-flexsearch v1.2.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.3.0 h1:RbfEDw219Y1rOVp9lHmy5ePdF9lyPalDu2J5oVeejrU=
 github.com/gethinode/mod-flexsearch v1.3.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
+github.com/gethinode/mod-flexsearch v1.4.0 h1:5e/NVRLyWzUZ9fO/fNsM5o+O7nw+xyln2rfEOtbgfWc=
+github.com/gethinode/mod-flexsearch v1.4.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-fontawesome v1.2.4 h1:SqE3CQ+boaBIhrVh3MPu4nz0uoHPfEH5t60nNY1CfsI=
 github.com/gethinode/mod-fontawesome v1.2.4/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.2.5 h1:RqkLRj6+s+gM4nKd0IwNMMDA8cRmxfp0fxkVH4FdAGU=

go.mod

@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/gethinode/mod-bootstrap v1.1.1 // indirect
-	github.com/gethinode/mod-flexsearch v1.3.0 // indirect
+	github.com/gethinode/mod-flexsearch v1.4.0 // indirect
 	github.com/gethinode/mod-fontawesome v1.2.5 // indirect
 	github.com/gethinode/mod-katex v1.0.2 // indirect
 	github.com/gethinode/mod-leaflet v0.3.4 // indirect

go.sum

@@ -20,6 +20,8 @@ github.com/gethinode/mod-flexsearch v1.2.0 h1:SSMpWzK9SMbi9QRYfil9PJZLLWWLHWzlTc
 github.com/gethinode/mod-flexsearch v1.2.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-flexsearch v1.3.0 h1:RbfEDw219Y1rOVp9lHmy5ePdF9lyPalDu2J5oVeejrU=
 github.com/gethinode/mod-flexsearch v1.3.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
+github.com/gethinode/mod-flexsearch v1.4.0 h1:5e/NVRLyWzUZ9fO/fNsM5o+O7nw+xyln2rfEOtbgfWc=
+github.com/gethinode/mod-flexsearch v1.4.0/go.mod h1:TXbGbWsvmhBdsTzRt887mcpFfr4ORpzG3+h/l4W3YM4=
 github.com/gethinode/mod-fontawesome v1.0.2 h1:ZSK6D20/w4y5GnfYfTBB58uHD0ChIfkpKfRGwioS9rg=
 github.com/gethinode/mod-fontawesome v1.0.2/go.mod h1:Ki1qkWEOiF0hQpCgWeZRw+HkpL6nd1DxKFptU0O2feI=
 github.com/gethinode/mod-fontawesome v1.1.0 h1:rsDzUI+3ZlS/do2ff3ne8/z3KwHeysmuA+WsXlumXXk=

layouts/partials/assets/navbar.html

@@ -1,6 +1,7 @@
 <!-- 
     Displays a navigation header with a toggler. The partial supports the following arguments:
-    "id"            Optional id of the navbar toggler, defaults to "navbar-collapse-0".
+    "id"            Optional id of the navbar, defaults to "navbar-0". The id is used by several child elements,
+                    including a color mode switcher, version switcher, and collapse panel.
     "page"          Required object reference to the current page.
     "menus"         Optional name of the menu configuration, defaults to "main".
     "size"          Optional size of the button, either "sm", "md" (default), or "lg".
@@ -20,13 +21,14 @@
 {{- define "partials/navbar-mode.html" -}}
     {{- $size := .size -}}
     {{- $collapsed := .collapsed -}}
+    {{- $id := .id -}}
 
     <li class="nav-item dropdown {{ if $collapsed }}d-{{ $size }}-none{{ else }}d-none d-{{ $size }}-block{{ end }}">
-        <a class="nav-link dropdown-toggle" href="#!" role="button" data-bs-toggle="dropdown" aria-label="{{ T "colorMode" }}" aria-expanded="false" id="navbar-color-theme{{ if $collapsed }}-collapsed{{ end }}">
+        <a class="nav-link dropdown-toggle" href="#!" role="button" data-bs-toggle="dropdown" aria-label="{{ T "colorMode" }}" aria-expanded="false" id="{{ $id }}-theme{{ if $collapsed }}-collapsed{{ end }}">
-            <span class="theme-icon-active">{{- partial "assets/icon.html" (dict "icon" "fas sun fa-fw") }} {{ if $collapsed }} {{ T "colorMode" }} {{ end }}</span>
+            <span class="theme-icon-active">{{- partial "assets/icon.html" (dict "icon" "fas sun fa-fw") }}</span>{{ if $collapsed }} {{ T "colorMode" }} {{ end }}
             <span class="d-md-none"></span>
         </a>
-        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbar-color-theme{{ if $collapsed }}-collapsed{{ end }}">
+        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="{{ $id }}-theme{{ if $collapsed }}-collapsed{{ end }}">
             <li>
                 <a class="dropdown-item{{ if $collapsed }} switch-mode-collapsed{{ end }}" data-bs-theme-value="light" href="#!">
                     <span class="theme-icon">{{- partial "assets/icon.html" (dict "icon" "fas sun fa-fw") }}</span>&nbsp;
@@ -55,13 +57,14 @@
     {{- $collapsed := .collapsed -}}
     {{- $page := .page -}}
     {{- $list := site.Params.docs.releases -}}
+    {{- $id := .id -}}
     {{- $version := partial "utilities/GetVersion.html" (dict "page" $page) -}}
 
     <li class="nav-item dropdown {{ if $collapsed }}d-{{ $size }}-none{{ else }}d-none d-{{ $size }}-block{{ end }}">
-        <a class="nav-link dropdown-toggle" href="#!" role="button" data-bs-toggle="dropdown" aria-expanded="false" id="navbar-version-switch">
+        <a class="nav-link dropdown-toggle" href="#!" role="button" data-bs-toggle="dropdown" aria-expanded="false" id="{{ $id }}-version-switch">
             {{ if $collapsed }}{{ site.Title }} {{ end }}{{ $version }}
         </a>
-        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbar-version-switch">
+        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="{{ $id }}-version-switch">
             {{- range $index, $item := $list -}}
                 {{- $active := eq $item.label $version -}}
                 {{- $disabled := false -}}
@@ -97,7 +100,7 @@
 {{- $absoluteURL := site.Params.main.canonifyAssetsURLs | default false -}}
 {{- $supportedFlags := slice "true" "false" -}}
 
-{{- $id := printf "navbar-collapse-%d" 0 -}}
+{{- $id := printf "navbar-%d" 0 -}}
 {{ with .id }}
     {{ $id = . }}
 {{ end }}
@@ -185,12 +188,12 @@
 {{- $theme := "light" -}}
 {{- if in (slice "primary" "secondary" "success" "danger" "black") $color }}{{ $theme = "dark" }}{{ end -}}
 {{- if in (slice "body" "body-tertiary") $color }}{{ $theme = "" }}{{ end -}}
+{{- if not $color }}{{ $theme = "" }}{{ end -}}
 {{- $class := .class -}}
 
 {{- $contrast := false -}}
 {{- if in (slice "primary" "secondary" "success" "danger") $color }}{{ $contrast = true }}{{ end -}}
 
-
 <div class="container-fluid {{ if $fixed }}fixed-top{{ end }} p-0{{ with $class }} {{ . }}{{ end }}">
     {{- partial "assets/page-alert.html" (dict "page" $page) -}}
     <nav class="navbar navbar-expand-{{ $size }}{{ if $contrast }} navbar-contrast{{ end }}{{ with $color }} bg-{{ . }}{{ end }} p-4"{{ with $theme }} data-bs-theme="{{ . }}"{{ end }}>
@@ -220,7 +223,7 @@
     
             <!-- Insert main navigation toggler -->
             <div class="d-flex fw-30">
-                <button class="navbar-toggler main-nav-toggler collapsed p-0" type="button" data-bs-toggle="collapse" data-bs-target="#{{ $id }}"
+                <button class="navbar-toggler main-nav-toggler collapsed p-0" type="button" data-bs-toggle="collapse" data-bs-target="#{{ $id }}-collapse"
                     aria-controls="{{ $id }}" aria-expanded="false" aria-label="{{ T "toggleMainNav" }}">
                     <span class="toggler-icon top-bar emphasis{{ with $theme }}-{{ . }}{{ end }}"></span>
                     <span class="toggler-icon middle-bar emphasis{{ with $theme }}-{{ . }}{{ end }}"></span>
@@ -228,7 +231,7 @@
                 </button>
             </div>
     
-            <div class="navbar-collapse collapse" id="{{ $id }}">
+            <div class="navbar-collapse collapse" id="{{ $id }}-collapse">
                 <!-- Insert search input -->
                 {{- if $search }}{{ partial "assets/search-input.html" -}}{{ end -}}
                 
@@ -281,8 +284,8 @@
                                     
                     <!-- Insert version switcher -->
                     {{- if $enableVersions -}}
-                        {{- partial "partials/navbar-versions.html" (dict "page" $page "size" $size "collapsed" true ) -}}
+                        {{- partial "partials/navbar-versions.html" (dict "page" $page "size" $size "collapsed" true "id" .id) -}}
-                        {{- partial "partials/navbar-versions.html" (dict "page" $page "size" $size "collapsed" false) -}}
+                        {{- partial "partials/navbar-versions.html" (dict "page" $page "size" $size "collapsed" false "id" .id) -}}
                     {{- end -}}
     
                     <!-- Insert color mode switcher -->
@@ -293,8 +296,8 @@
                         </li>
                         <li><hr class="dropdown-divider-bg"></li>
     
-                        {{- partial "partials/navbar-mode.html" (dict "size" $size "collapsed" true) -}}
+                        {{- partial "partials/navbar-mode.html" (dict "size" $size "collapsed" true "id" .id) -}}
-                        {{- partial "partials/navbar-mode.html" (dict "size" $size "collapsed" false) -}}
+                        {{- partial "partials/navbar-mode.html" (dict "size" $size "collapsed" false "id" .id) -}}
                     {{- end -}}
                 </ul>
             </div>

layouts/shortcodes/timeline.html

@@ -102,7 +102,7 @@
 </div>
 
 <!-- Render timeline for smaller devices -->
-<div class="container p-0 d-block d-md-none {{ with $background }} timeline-bg-{{ . }}{{ end }}{{ with $class }} {{ . }}{{ end }}">
+<div class="container p-0 d-block d-md-none small{{ with $background }} timeline-bg-{{ . }}{{ end }}{{ with $class }} {{ . }}{{ end }}">
     {{ range $index, $item := $entries }}
         <div class="row timeline-sm timeline-{{ $item.color }} timeline-dot g-0">
             {{ partial "partials/timeline-icon.html" (dict "icon" $item.icon "direction" "end" "col" 3) }}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.18.0-beta2",
+  "version": "0.18.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@gethinode/hinode",
-      "version": "0.18.0-beta2",
+      "version": "0.18.0",
       "license": "MIT",
       "devDependencies": {
         "@fullhuman/postcss-purgecss": "^5.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethinode/hinode",
-  "version": "0.18.0-beta2",
+  "version": "0.18.0",
   "description": "Hinode is a clean documentation and blog theme for Hugo, an open-source static site generator",
   "keywords": [
     "hugo",