hexo-theme-solitude 1.4.7 → 1.5.0

package/CONTRIBUTING.md

@@ -15,8 +15,8 @@
 * 在 GitHub 上 `fork` 到自己的仓库，如 `yife68/Hexo-Theme-Solitude`，然后 `clone` 到本地Hexo主题目录，并设置用户信息。
 
 ```bash
-$ git clone git@github.com:{your-github-username}/Hexo-Theme-Solitude.git themes/Solitude
-$ cd Solitude
+$ git clone git@github.com:{your-github-username}/hexo-theme-solitude.git themes/solitude
+$ cd solitude
 $ git config user.name "yourname"
 $ git config user.email "your email"
 ```
@@ -38,4 +38,17 @@ $ git fetch upstream
 $ git checkout dev
 $ git rebase upstream/dev
 $ git push -f origin dev
-```
+```
+
+* 不得添加任何第三方的创作，请自行创作插件并`PR`到 `solitude-pugins` 仓库
+
+### 插件创作
+* 插件创作
+
+```
+$ git clone git@github.com:{your-github-username}/solitude-plugins.git
+$ git config user.name "yourname"
+$ git config user.email "your email"
+```
+
+* 根据 `README` 进行添加。

package/README.md

@@ -12,9 +12,9 @@
 
 ![首页](https://github.com/wleelw/hexo-theme-solitude/assets/74389842/d008aba4-942d-4fdb-a611-d934c0bad9fe)
 
-主题预览:  [王卓Sco](https://blog.wzsco.top/) ｜  [Demo](https://solitude.wzsco.top/)
+主题预览:  [王卓Sco](https://blog.wzsco.cn/) ｜  [Demo](https://solitude.wzsco.cn/)
 
-主题文档:  [中文](https://docs.wzsco.top/) ｜ [ English ](https://docs.wzsco.top/en/)
+主题文档:  [中文](https://docs.wzsco.cn/) ｜ [ English ](https://docs.wzsco.cn/en/)
 
 主题交流群：`文档内有群二维码和链接`
 

package/README_EN.md

@@ -13,9 +13,9 @@
 
 ![首页](https://github.com/wleelw/hexo-theme-solitude/assets/74389842/d008aba4-942d-4fdb-a611-d934c0bad9fe)
 
-Theme Preview:  [王卓Sco](https://blog.wzsco.top/)｜[Demo](https://solitude.wzsco.top/)
+Theme Preview:  [王卓Sco](https://blog.wzsco.cn/)｜[Demo](https://solitude.wzsco.cn/)
 
-Theme Document: [中文](https://docs.wzsco.top/)｜[ English ](https://docs.wzsco.top/en/)
+Theme Document: [中文](https://docs.wzsco.cn/)｜[ English ](https://docs.wzsco.cn/en/)
 
 Theme discussion group：`The usage document above contains a QR code`
 

package/_config.yml

@@ -49,71 +49,37 @@ nav:
       # 显示分类名
       # Display category name
       项目:
-        # # 显示子类
-        # # Display subcategories
-        # Solitude:
-        #   # 显示的图标
-        #   # Displayed icon
-        #   icon: https://bu.dusays.com/2023/11/08/654af68b25bb8.jpg
-        #   # 点击的跳转链接
-        #   # Click the jump link
-        #   url: https://github.com/wleelw/Hexo-Theme-solitude
+      # # 显示子类
+      # # Display subcategories
+      # Solitude:
+      #   # 显示的图标
+      #   # Displayed icon
+      #   icon: https://bu.dusays.com/2023/11/08/654af68b25bb8.jpg
+      #   # 点击的跳转链接
+      #   # Click the jump link
+      #   url: https://github.com/wleelw/Hexo-Theme-solitude
 
   # 导航栏内容
   # Navigation bar content
   # tip：此部分内容是顶部导航栏中间菜单区域
   # tip: This part of the content is the menu area in the middle of the top navigation bar
   menu:
-    # 显示的大分类名称
-    # Displayed category name
-    # 文库:
-    #   # 点击跳转链接
-    #   # Click the jump link
-    #   # tip：如果没有子类就填跳转链接，例如：/archives，否则填false
-    #   # tip: If there is no subcategory, fill in the jump link, for example: /archives, otherwise fill in false
-    #   url: false
-    #   # 子类数组
-    #   # Subcategory array
-    #   child:
-    #     # 子类名称
-    #     # Subcategory name
-    #     文章列表:
-    #       # 点击跳转链接
-    #       # Click the jump link
-    #       url: /archives/
-    #       # 子类名称左侧图标
-    #       # Subcategory name left icon
-    #       icon: sco-folder-fill
-    #     全部分类:
-    #       url: /categories/
-    #       icon: sco-checkbox-multiple-blank-fill
-    #     全部标签:
-    #       url: /tags/
-    #       icon: sco-price-tag-fill
-    # 友链:
-    #   url: false
-    #   child:
-    #     友情链接:
-    #       url: /links/
-    #       icon: sco-group-fill
-    #     宝藏博主:
-    #       url: javascript:travelling()
-    #       icon: sco-gift-fill
-    # 我的:
-    #   url: false
-    #   child:
-    #     装备:
-    #       url: /equipment/
-    #       icon: sco-laptop-line
-    #     工具箱:
-    #       url: /tlink/
-    #       icon: sco-tools-fill
-    # 关于:
-    #   url: false
-    #   child:
-    #     关于本站:
-    #       url: /about/
-    #       icon: sco-contacts-fill
+  #  首页: / # 显示名称：路径 / Display name: path
+  #  文库: # 显示名称 / Display name
+  #    文章列表: /archives/ || sco-folder-fill # 子菜单名称：路径 || 图标 / Submenu name: path || icon
+  #    全部分类: /categories/ || sco-checkbox-multiple-blank-fill
+  #    全部标签: /tags/ || sco-price-tag-fill
+  #  友链:
+  #    友链鱼塘: /moments/ || sco-wifi-fill
+  #    友情链接: /links/ || sco-group-fill
+  #    宝藏博主: javascript:travelling() || sco-gift-fill
+  #  我的:
+  #    相册集: /gallery/ || sco-image-fill
+  #    装备: /equipment/ || sco-laptop-line
+  #    工具箱: /tlink/ || sco-tools-fill
+  #    音乐馆: /music/ || sco-disc-fill
+  #  关于:
+  #    关于本站: /about/ || sco-contacts-fill
 
   # 导航栏右侧按钮
   # Button on the right side of the navigation bar
@@ -125,11 +91,11 @@ nav:
     # 从左至右
     # From left to right
     custom:
-      # - name: 开往 - 友链接力 # 显示文字 / Displayed text
-      #   url: https://www.travellings.cn/go.html # 跳转链接 / Jump link
-      #   icon: sco-train-line # 图标 / Icon
-      #   onclick: # 点击事件 / Click event
-      #   id: travellings_button # id
+    # - name: 开往 - 友链接力 # 显示文字 / Displayed text
+    #   url: https://www.travellings.cn/go.html # 跳转链接 / Jump link
+    #   icon: sco-train-line # 图标 / Icon
+    #   onclick: # 点击事件 / Click event
+    #   id: travellings_button # id
 
 # 首页顶部样式
 # Home top style
@@ -151,61 +117,40 @@ hometop:
     # 轮播icon
     # Carousel icon
     icon:
-      # # 名字 / Name
-      # HTML:
-      #   # 图片 / Image
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/HTML.png
-      #   # 背景色 / Background color
-      #   color: "#e9572b"
-      # JS:
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/JS.png
-      #   color: "#f7cb4f"
-      # Kotlin:
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/kotlin-logo.svg
-      #   color: "#ffffff"
-      # Docker:
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/docker.png
-      #   color: "#57b6e6"
-      # Flutter:
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/flutter.png
-      #   color: "#ffffff"
-      # WebPack:
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/webpack.png
-      #   color: "#2e3a41"
-      # Git:
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/git.png
-      #   color: "#df5b40"
-      # VS:
-      #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/vs-logo.svg
-      #   color: "#ffffff"
-
-  # 顶部三大分类
-  # Top three categories
-  categoryGroup:
-    # 左侧
-    # Left
-    G1:
-      # 显示文字
-      # Displayed text
-      name: 必看精选
-      # 显示图标
-      # Displayed icon
-      icon: scoicon sco-star-smile-fill
-      # 跳转链接
-      # Jump link
-      url: /tags/精选/
-    # 中间
-    # Middle
-    G2:
-      name: 热门文章
-      icon: scoicon sco-fire-fill
-      url: /categories/热门/
-    # 右侧
-    # Right
-    G3:
-      name: 实用教程
-      icon: scoicon sco-book-mark-fill
-      url: /tags/教程/
+    # # 名字 / Name
+    # HTML:
+    #   # 图片 / Image
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/HTML.png
+    #   # 背景色 / Background color
+    #   color: "#e9572b"
+    # JS:
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/JS.png
+    #   color: "#f7cb4f"
+    # Kotlin:
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/kotlin-logo.svg
+    #   color: "#ffffff"
+    # Docker:
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/docker.png
+    #   color: "#57b6e6"
+    # Flutter:
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/flutter.png
+    #   color: "#ffffff"
+    # WebPack:
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/webpack.png
+    #   color: "#2e3a41"
+    # Git:
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/git.png
+    #   color: "#df5b40"
+    # VS:
+    #   img: https://npm.elemecdn.com/wleelw-blog-abs@1.0.0/img/icon/vs-logo.svg
+    #   color: "#ffffff"
+
+    # banner 左下跳转按钮
+    # Banner lower left jump button
+    group:
+    #  热门: /tags/热门/ || sco-fire-fill || linear-gradient(to right,#f65,#ffbf37)
+    #  教程: /tags/教程/ || sco-book-mark-fill || linear-gradient(to right,#358bff,#15c6ff)
+    #  精选: /tags/精选/ || sco-star-smile-fill || linear-gradient(to right,#18e7ae,#1eebeb)
 
   # 右侧置顶列表（在文章的front matter中添加“recommend: true”）
   # Right top list (add "recommend: true" in the front matter of the article)
@@ -303,16 +248,10 @@ aside:
       - 🧱 团队小组发动机
       - 💢 壮汉人狠话不多
       - 🎮 电竞游戏爱好者
+    # 个人信息卡片底部的小图标，按照例子填写
     information:
-      # # 悬停显示文字
-      # Github:
-      #   # 图标
-      #   icon: scoicon sco-github-line
-      #   # 跳转链接
-      #   url: https://github.com/wleelw/Hexo-Theme-slitude
-      # Bilibili:
-      #   icon: scoicon sco-bilibili-line
-      #   url: https://space.bilibili.com/1329819902
+    #  Github: https://github.com/wleelw || sco-github-line # 名称：链接 || 图标 / Name: link || icon
+    #  Bilibili: https://space.bilibili.com/1329819902 || sco-bilibili-line
 
   # 二维码
   # Official account QR code
@@ -515,40 +454,30 @@ footer:
   # 底部上方一排图标
   # Bottom row of icons
   information:
-    # 左侧显示图标 / Left display icon
-    left:
-      # Github:
-      #   icon: scoicon sco-bilibili-line
-      #   url: https://github.com/wleelw
-      # Mail:
-      #   icon: scoicon sco-mail-line
-      #   url: mailto:wleelw@wzsco.top
-    # 右侧显示图标 / Right display icon
-    right:
-      # Bilibili:
-      #   icon: scoicon sco-bilibili-line
-      #   url: https://space.bilibili.com/1329819902
-      # 抖音:
-      #   icon: scoicon sco-douyin-fill
-      #   url: https://v.douyin.com/iJsLc8jt/
+    left: # 左侧显示图标
+    #  Github: https://github.com/wleelw || sco-github-line # 名称：链接 || 图标 / Name: link || icon
+    #  Mail: mailto:wleelw@wzsco.top || sco-mail-line
+    right: # 右侧显示图标
+    #  Bilibili: https://space.bilibili.com/1329819902 || sco-bilibili-line
+    #  抖音: https://v.douyin.com/iJsLc8jt/ || sco-douyin-fill
 
   # 底部导航栏
   # Bottom navigation bar
   group:
-    # 导航:
-    #   归档: /archives/
-    #   分类: /categories/
-    #   标签: /tags/
-    # 服务:
-    #   阿里云: https://aliyun.com/
-    #   51la统计: https://v6.51.la/
-    #   百度统计: https://tongji.baidu.com/
-    # 支持:
-    #   打赏记录: /about/
-    # 协议:
-    #   Cookies: /cookies/
-    #   用户协议: /privacy/
-    #   版权协议: /copyright/
+  # 导航:
+  #   归档: /archives/
+  #   分类: /categories/
+  #   标签: /tags/
+  # 服务:
+  #   阿里云: https://aliyun.com/
+  #   51la统计: https://v6.51.la/
+  #   百度统计: https://tongji.baidu.com/
+  # 支持:
+  #   打赏记录: /about/
+  # 协议:
+  #   Cookies: /cookies/
+  #   用户协议: /privacy/
+  #   版权协议: /copyright/
 
   # 底部随机友链
   # Random links at the bottom
@@ -668,28 +597,28 @@ keyboard:
   # 键盘控制配置
   # Keyboard control configuration
   list:
-    # name: 按键名称
-    # name: Key name
-    # key: 按键
-    # key: Key
-    # func: 方法
-    # func: Function
-    # sco: sco内置方法
-    # sco: sco built-in method
-    # url: 跳转链接
-    # url: Jump link
-    # - name: 关闭快捷键功能
-    #   key: K
-    #   func: keyboard
-    # - name: 打开中控台
-    #   key: A
-    #   sco: showConsole
-    # - name: 播放/暂停音乐
-    #   key: M
-    #   sco: musicToggle
-    # - name: 打开友情链接
-    #   key: L
-    #   url: "/links/"
+  # name: 按键名称
+  # name: Key name
+  # key: 按键
+  # key: Key
+  # func: 方法
+  # func: Function
+  # sco: sco内置方法
+  # sco: sco built-in method
+  # url: 跳转链接
+  # url: Jump link
+  # - name: 关闭快捷键功能
+  #   key: K
+  #   func: keyboard
+  # - name: 打开中控台
+  #   key: A
+  #   sco: showConsole
+  # - name: 播放/暂停音乐
+  #   key: M
+  #   sco: musicToggle
+  # - name: 打开友情链接
+  #   key: L
+  #   url: "/links/"
 
 # 懒加载
 # lazyload
@@ -919,9 +848,9 @@ CDN:
   custom_format: https://cdn.staticfile.org/${cdnjs_name}/${version}/${min_cdnjs_file}
 
   option:
-   scoicon_css: https://cdn.cbd.int/solitude-source/icon/scoicon.min.css
-   waterfall: https://cdn.cbd.int/solitude-source/js/waterfall.min.js
-   universe_js: https://cdn.cbd.int/solitude-source/js/universe.min.js
+    scoicon_css: https://cdn.cbd.int/solitude-source/icon/scoicon.min.css
+    waterfall: https://cdn.cbd.int/solitude-source/js/waterfall.min.js
+    universe_js: https://cdn.cbd.int/solitude-source/js/universe.min.js
   #  algolia_search:
   #  instantsearch:
   #  pjax:

package/languages/en-US.yml

@@ -75,7 +75,7 @@ search:
 
 head:
   noscript: Please enable JavaScript to view the site
-  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/wleelw/Hexo-theme-solitude | Version: v1.4.7 😄'
+  console: 'Program: Hexo | Theme: Hexo-Theme-Solitude | Author: WangZhuoSco、YiFeng | Github: https://github.com/wleelw/Hexo-theme-solitude | Version: v1.5.0 😄'
 
 aside:
   postcount: 'Posts :'

package/languages/zh-CN.yml

@@ -75,7 +75,7 @@ search:
 
 head:
   noscript: 开启JavaScript才能访问本站哦~
-  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/wleelw/Hexo-theme-solitude | 版本：v1.4.7 😄'
+  console: '程序：Hexo | 主题：Hexo-Theme-Solitude | 作者：王卓Sco、亦封 | Github: https://github.com/wleelw/Hexo-theme-solitude | 版本：v1.5.0 😄'
 
 aside:
   postcount: '文章总数 :'

package/languages/zh-TW.yml

@@ -75,7 +75,7 @@ search:
 
 head:
   noscript: 開啟JavaScript才能訪問本站哦~
-  console: '程式：Hexo |主題：Hexo-Theme-Solitude |作者：王卓Sco、亦封 |Github位址： https://github.com/wleelw/Hexo-theme-solitude |版本：v1.4.7 😄'
+  console: '程式：Hexo |主題：Hexo-Theme-Solitude |作者：王卓Sco、亦封 |Github位址： https://github.com/wleelw/Hexo-theme-solitude |版本：v1.5.0 😄'
 
 aside:
   postcount: '文章數：'

package/layout/includes/footer.pug

@@ -12,16 +12,18 @@ div#footer_deal
     - var leftInfo = theme.footer && theme.footer.information && theme.footer.information.left || {}
     - var rightInfo = theme.footer && theme.footer.information && theme.footer.information.right || {}
 
-    each value, i in leftInfo
-        a.deal_link(href=url_for(value.url), title=i)
-            i.scoicon(class=value.icon)
+    each value, label in leftInfo
+        - var array = value.split('||')
+        a.deal_link(href=url_for(trim(array[0])), title=label)
+            i.scoicon(class=array[1])
 
     div#footer_mini_logo.footer_mini_logo(title=_p('nav.backtop'), onclick="sco.toTop()")
         img(src=theme.site.icon, alt=_p('nav.backtop'))
 
-    each value, i in rightInfo
-        a.deal_link(href=url_for(value.url), title=i)
-            i.scoicon(class=value.icon)
+    each value, label in rightInfo
+        - var array = value.split('||')
+        a.deal_link(href=url_for(trim(array[0])), title=label)
+            i.scoicon(class=array[1])
 div#sco-footer
     - var group = theme.footer && theme.footer.group ? theme.footer.group : {}
 

package/layout/includes/inject/body.pug

@@ -77,8 +77,6 @@ div
                 script(src=url_for(theme.cdn.twikoo))
             when 'waline'
                 script(src=url_for(theme.cdn.waline_js))
-                link(rel="stylesheet", href=url_for(theme.cdn.waline_css))
-
         if theme.comment.commentBarrage
             case theme.comment.type
                 when 'twikoo'

package/layout/includes/nav.pug

@@ -1,11 +1,11 @@
 nav#nav.show
     #nav-group
         #blog_name
-            if theme.nav.left.enable
+            if theme.nav.group
                 .back-home-button(tabindex="-1")
                     i.back-home-button-icon.scoicon.sco-more-fill
-                    include ./widgets/nav/left.pug
-            a#site-name(href="/", title=_p('nav.site_name_title'), target="_self")
+                    include ./widgets/nav/group
+            a#site-name(href="/", title=_p('nav.site_name_title'))
                 if theme.site.name.class === 'i_class'
                     i.scoicon(class=theme.site.name.custom, style="font-size: 16px;")
                 else if theme.site.name.class === 'img'

package/layout/includes/sidebar.pug

@@ -7,7 +7,7 @@ div#sidebar(style="zoom: 1;")
                 i.scoicon.sco-moon-clear-fill
                 span= __('sidebar.darkmode')
         if theme.nav.left.enable
-            include ./widgets/nav/left.pug
+            include ./widgets/nav/group
         include ./widgets/nav/menu.pug
         span.sidebar-menu-item-title= __('sidebar.title2')
         div.card-widget.card-tags.card-archives.card-webinfo.card-allinfo

package/layout/includes/widgets/aside/asideInfoCard.pug

@@ -15,6 +15,7 @@
                 .author-info__name= config.author
                 .author-info__desc!= config.subtitle
             .card-info-social-icons.is-center
-                each value, key in theme.aside.card.information || []
-                    a.social-icon(href=url_for(value.url), title=key)
-                        i.scoicon(class=value.icon)
+                each value, label in theme.aside.card.information || {}
+                    - var array = value.split('||')
+                    a.social-icon(href=url_for(trim(array[0])), title=label)
+                        i.scoicon(class=array[1])

package/layout/includes/widgets/home/banner.pug

@@ -1,6 +1,16 @@
 div.banners-title
     div.banners-title-big!= theme.hometop.banner.title
     div.banners-title-small= theme.hometop.banner.url
+- var group = theme.hometop.group
+if group
+    div.banners-links
+        each value,label in group
+            - var array = value.split('||')
+            a.banners-link-btn(href=url_for(trim(array[0])) class="banners-link-"+label)
+                if array[1]
+                    i.scoicon(class=array[1])
+                .banners-link-title= label
+
 div.tags-group-all
     .tags-group-wrapper
         each i in [1,2]
@@ -10,7 +20,4 @@ div.tags-group-all
                 .tags-group-icon-pair
                     each key in pair
                         .tags-group-icon(style=`background: ${theme.hometop.banner.icon[key].color}`)
-                            img(src=theme.hometop.banner.icon[key].img, title=key)
-a#banner-hover(onclick="toRandomPost()")
-    span.bannerText= _p('home.bannertext')
-    i.scoicon.sco-arrow-2-right-line.banner-righticon
+                            img(src=theme.hometop.banner.icon[key].img, title=key)

package/layout/includes/widgets/home/categoryGroup.pug

@@ -1,9 +1,12 @@
-- var groupNames = ['G1', 'G2', 'G3'];
-- var styles = ['--sco-shadow-blue', '--sco-shadow-red', '--sco-shadow-green'];
-- var classes = ['bikan', 'remen', 'shiyong'];
+- group = (Object.entries(theme.hometop.group)).slice(0, 2)
 
-each groupName, index in groupNames
-    .categoryItem(style=`box-shadow: var(${styles[index]});`)
-        a.categoryButton(class=classes[index], href=url_for(theme.hometop.categoryGroup[groupName].url))
-            span.categoryButtonText= theme.hometop.categoryGroup[groupName].name
-            i.scoicon(class=theme.hometop.categoryGroup[groupName].icon)
+if group
+    .categoryGroup
+
+        each item in group
+            - var array = item[1].split('||')
+            .categoryItem
+                a.categoryButton(href=url_for(trim(array[0])) if array[2] style="background:" + array[2] + ";")
+                    span.categoryButtonText= item[0]
+                    if array[1]
+                        i.scoicon(class=trim(array[1]))

package/layout/includes/widgets/home/hometop.pug

@@ -3,7 +3,6 @@
         #bannerGroup
             #banners
                 include ./banner.pug
-            .categoryGroup
-                include ./categoryGroup.pug
+            include ./categoryGroup.pug
         .topGroup
             include ./topGroup.pug

package/layout/includes/widgets/home/postList.pug

@@ -15,14 +15,14 @@ div.recent-post-item(onclick="pjax.loadUrl('/" + post.path + "')")
                 if post.prev == null && is_home()
                     span.original= _p('home.recent-post.new')
 
-                a.unvisited-post(href=url_for(post.path))= _p('home.recent-post.read')
+                a.unvisited-post(href=post.path)= _p('home.recent-post.read')
 
-            a.article-title(href=url_for(post.path), title=post.title)= post.title
+            a.article-title(href=post.path, title=post.title)= post.title
 
         div.article-meta-wrap
             span.article-meta.tags
                 each tag in post.tags.data
-                    a.article-meta__tags(href=url_for(tag.path), onclick="event.stopPropagation();")
+                    a.article-meta__tags(href=tag.path, onclick="event.stopPropagation();")
                         span.tags-punctuation=tag.name
 
             span.post-meta-date

package/layout/includes/widgets/nav/group.pug

@@ -0,0 +1,13 @@
+- var menu = theme.nav.group
+if menu
+    .back-menu-list-groups
+        each value, label in menu
+            .back-menu-list-group
+                .back-menu-list-title= label
+                .back-menu-list
+                    each data, label in value
+                        - var array = data.split('||')
+                        a.back-menu-item(href=url_for(trim(array[0])), title=index)
+                            if array[1]
+                                img.back-menu-item-icon(src=trim(array[1]), alt=index)
+                            span.back-menu-item-text= label

package/layout/includes/widgets/nav/menu.pug

@@ -1,16 +1,20 @@
-.menus_items
-    - var menu = theme.nav && theme.nav.menu ? theme.nav.menu : {}
-    each value, x in menu
-        .menus_item
-            if !value.url
-                a.site-page(href="javascript:void(0);")
-                    span= x
-                ul.menus_item_child
-                    each childValue, y in value.child
-                        li
-                            a.site-page.child(href=url_for(childValue.url))
-                                i.scoicon(class=childValue.icon)
-                                span= y
-            else
-                a.site-page.not-child(href=url_for(value.url))
-                    span= x
+- var menu = theme.nav.menu
+
+if menu
+    .menus_items
+        each value, label in menu
+            .menus_item
+                if typeof value !== 'object'
+                    a.site-page(href=url_for(value))
+                        span= label
+                else
+                    a.site-page(href="javascript:void(0);")
+                        span= label
+                    ul.menus_item_child
+                        each childValue, childLabel in value
+                            li
+                                - var array = childValue.split('||')
+                                a.site-page.child(href=url_for(trim(array[0])))
+                                    if array[1]
+                                        i.scoicon(class=array[1])
+                                    span= childLabel