Merge pull request #1707 from nunocoracao/dev

🔖 v2.77.0
nunocoracao · Sep 3, 2024 · b07ba75 · b07ba75
2 parents 52d6eb7 + e02dc65
commit b07ba75
Show file tree

Hide file tree

Showing 14 changed files with 106 additions and 42 deletions.
diff --git a/assets/css/compiled/main.css b/assets/css/compiled/main.css
@@ -3182,21 +3182,6 @@ body button {
   display:none
 }
 
-/* Hamburger menu */
-
-body:has(#menu-controller:checked) {
-  overflow-y:hidden
-}
-
-#menu-button:has(#menu-controller:checked) {
-  visibility:hidden
-}
-
-#menu-controller:checked~#menu-wrapper {
-  visibility:visible;
-  opacity:1
-}
-
 /* RTL support */
 
 .prose blockquote:where([dir="rtl"], [dir="rtl"] *) {

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -29,19 +29,6 @@ body button {
   @apply hidden;
 }
 
-/* Hamburger menu */
-body:has(#menu-controller:checked) {
-  @apply overflow-y-hidden;
-}
-
-#menu-button:has(#menu-controller:checked) {
-  @apply invisible;
-}
-
-#menu-controller:checked~#menu-wrapper {
-  @apply visible opacity-100;
-}
-
 /* RTL support */
 .prose blockquote {
   @apply rtl:pr-4 rtl:border-l-0 rtl:border-r-4;

diff --git a/assets/js/mobilemenu.js b/assets/js/mobilemenu.js
@@ -0,0 +1,27 @@
+var menuButton = document.getElementById("menu-button");
+var menuCloseButton = document.getElementById("menu-close-button");
+
+var menuOpen = false;
+
+menuButton.addEventListener("click", function () {
+  if (!menuOpen) {
+    menuOpen = true;
+    var menuWrapper = document.getElementById("menu-wrapper");
+    document.body.style.overflowY = "hidden";
+    menuButton.style.visibility = "hidden";
+    menuWrapper.style.visibility = "visible";
+    menuWrapper.style.opacity = "1";
+  }
+});
+
+menuCloseButton.addEventListener("click", function (e) {
+  if (menuOpen) {
+    menuOpen = false;
+    var menuWrapper = document.getElementById("menu-wrapper");
+    document.body.style.overflowY = "auto";
+    menuButton.style.visibility = "visible";
+    menuWrapper.style.visibility = "hidden";
+    menuWrapper.style.opacity = "0";
+    e.stopPropagation();
+  }
+});
diff --git a/config.toml b/config.toml
@@ -2,4 +2,4 @@
 [module.hugoVersion]
 extended = true
 min = "0.87.0"
-max = "0.133.1"
+max = "0.134.0"
diff --git a/exampleSite/content/docs/configuration/index.md b/exampleSite/content/docs/configuration/index.md
@@ -136,16 +136,16 @@ The default file can be used as a template to create additional languages, or re
 
 <!-- prettier-ignore-end -->
 
-#### Author
+##### Author
 | Name                  | Default   | Description                                                                                                                                                                                                                                                                                                                 |
 | --------------------- | --------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `author.name`         | _Not set_ | The author's name. This will be displayed in article footers, and on the homepage when the profile layout is used.                                                                                                                                                                                                          |
-| `author.email`    | _Not set_ | The author's email. This will be used if the reply-via-email functionality is enabled.                                                                                                                                                                                                                                      |
-| `author.image`        | _Not set_ | Path to the image file of the author. The image should be a 1:1 aspect ratio. The image can be placed in the site's `assets/` folder or can be external url.                                                                                                                                                                |
-| `author.imageQuality` | `96`      | The author's image file will be treated as a "high quality" image to minimize artifacts on the front page. Value range 1-100.                                                                                                                                                                                               |
-| `author.headline`     | _Not set_ | A Markdown string containing the author's headline. It will be displayed on the profile homepage under the author's name.                                                                                                                                                                                                   |
-| `author.bio`          | _Not set_ | A Markdown string containing the author's bio. It will be displayed in article footers.                                                                                                                                                                                                                                     |
-| `author.links`        | _Not set_ | The links to display alongside the author's details. The config file contains example links which can simply be uncommented to enable. The order that the links are displayed is determined by the order they appear in the array. Custom links can be added by providing corresponding SVG icon assets in `assets/icons/`. |
+| `params.author.name`         | _Not set_ | The author's name. This will be displayed in article footers, and on the homepage when the profile layout is used.                                                                                                                                                                                                          |
+| `params.author.email`    | _Not set_ | The author's email. This will be used if the reply-via-email functionality is enabled.                                                                                                                                                                                                                                      |
+| `params.author.image`        | _Not set_ | Path to the image file of the author. The image should be a 1:1 aspect ratio. The image can be placed in the site's `assets/` folder or can be external url.                                                                                                                                                                |
+| `params.author.imageQuality` | `96`      | The author's image file will be treated as a "high quality" image to minimize artifacts on the front page. Value range 1-100.                                                                                                                                                                                               |
+| `params.author.headline`     | _Not set_ | A Markdown string containing the author's headline. It will be displayed on the profile homepage under the author's name.                                                                                                                                                                                                   |
+| `params.author.bio`          | _Not set_ | A Markdown string containing the author's bio. It will be displayed in article footers.                                                                                                                                                                                                                                     |
+| `params.author.links`        | _Not set_ | The links to display alongside the author's details. The config file contains example links which can simply be uncommented to enable. The order that the links are displayed is determined by the order they appear in the array. Custom links can be added by providing corresponding SVG icon assets in `assets/icons/`. |
 <!-- prettier-ignore-end -->
 
 ### Menus

diff --git a/exampleSite/content/users/andrealucchini.com/feature.jpg b/exampleSite/content/users/andrealucchini.com/feature.jpg
diff --git a/exampleSite/content/users/andrealucchini.com/index.it.md b/exampleSite/content/users/andrealucchini.com/index.it.md
@@ -0,0 +1,14 @@
+---
+                title: "andrealucchini.com"
+                tags: [Sito personale, Blog]
+                externalUrl: "https://andrealucchini.com"
+                weight: 891
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                ---
+

diff --git a/exampleSite/content/users/andrealucchini.com/index.ja.md b/exampleSite/content/users/andrealucchini.com/index.ja.md
@@ -0,0 +1,14 @@
+---
+                title: "andrealucchini.com"
+                tags: [個人サイト, ブログ]
+                externalUrl: "https://andrealucchini.com"
+                weight: 891
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                ---
+

diff --git a/exampleSite/content/users/andrealucchini.com/index.md b/exampleSite/content/users/andrealucchini.com/index.md
@@ -0,0 +1,13 @@
+---
+                title: "andrealucchini.com"
+                tags: [Personal site,Blog]
+                externalUrl: "https://andrealucchini.com"
+                weight: 891
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                ---

diff --git a/exampleSite/content/users/andrealucchini.com/index.zh-cn.md b/exampleSite/content/users/andrealucchini.com/index.zh-cn.md
@@ -0,0 +1,14 @@
+---
+                title: "andrealucchini.com"
+                tags: [个人网站, 博客]
+                externalUrl: "https://andrealucchini.com"
+                weight: 891
+                showDate: false
+                showAuthor: false
+                showReadingTime: false
+                showEdit: false
+                showLikes: false
+                showViews: false
+                layoutBackgroundHeaderSpace: false
+                ---
+

diff --git a/exampleSite/content/users/users.json b/exampleSite/content/users/users.json
@@ -739,5 +739,14 @@
       "Personal Site",
       "Blog"
     ]
+  },
+  {
+    "title": "andrealucchini.com",
+    "url": "https://andrealucchini.com",
+    "source": "https://github.com/CommanderKen/commanderken.github.io",
+    "tags": [
+      "Personal site",
+      "Blog"
+    ]
   }
-]
+]
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -66,6 +66,8 @@
   {{ $jsRTL := resources.Get "js/rtl.js" }}
   {{ $assets.Add "js" (slice $jsRTL) }}
   {{ end }}
+  {{ $jsMobileMenu := resources.Get "js/mobilemenu.js" }}
+  {{ $assets.Add "js" (slice $jsMobileMenu) }}
   {{ if $assets.Get "js" }}
   {{ $bundleJS := $assets.Get "js" | resources.Concat "js/main.bundle.js" | resources.Minify | resources.Fingerprint
   "sha512" }}

diff --git a/layouts/partials/header/basic.html b/layouts/partials/header/basic.html
@@ -93,8 +93,7 @@
     </div>
     <div class="-my-2 -mr-2 md:hidden">
 
-        <label id="menu-button" for="menu-controller" class="block">
-            <input type="checkbox" id="menu-controller" class="hidden" />
+        <label id="menu-button" class="block">
             {{ if .Site.Menus.main }}
             <div class="cursor-pointer hover:text-primary-600 dark:hover:text-primary-400">
                 {{ partial "icon.html" "bars" }}
@@ -104,7 +103,7 @@
                 <ul
                     class="flex space-y-2 mt-3 flex-col items-end w-full px-6 py-6 mx-auto overflow-visible list-none ltr:text-right rtl:text-left max-w-7xl">
 
-                    <li>
+                    <li id="menu-close-button">
                         <span
                             class="cursor-pointer inline-block align-text-bottom hover:text-primary-600 dark:hover:text-primary-400">{{
                             partial

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hugo-blowfish-theme",
-  "version": "2.76.0",
+  "version": "2.77.0",
   "description": "Blowfish theme for Hugo.",
   "scripts": {
     "postinstall": "vendor-copy",