果式设计

layout/includes/footer.pug

@@ -1,52 +1,33 @@
-#footer_deal
-  if theme.footer.footer_icons.enable
-      each i in theme.footer.footer_icons.left
-        if i.class == "in"
-          a.deal_link(href=`${i.link}`, title=`${i.desrc}`)
-            i(class=`${i.icon}`)
-        else if i.class == "out"
-          a.deal_link(target='_blank', rel='noopener external nofollow', href=`${i.link}`, title=`${i.desrc}`)
-            i(class=`${i.icon}`)
-        else 
-          a.deal_link(href=`${i.link}`, title=`${i.desrc}`)
-            i(class=`${i.icon}`)
-  img.footer_mini_logo.entered.loading(title='返回顶部' onclick='btf.scrollToDest(0, 500)' src=`${theme.footer.footer_logo.url}` data-ll-status='loading')
-  if theme.footer.footer_icons.enable
-      each i in theme.footer.footer_icons.right 
-        if i.class == "in"
-          a.deal_link(href=`${i.link}`, title=`${i.desrc}`)
-            i(class=`${i.icon}`)
-        else if i.class == "out"
-          a.deal_link(target='_blank', rel='noopener external nofollow', href=`${i.link}`, title=`${i.desrc}`)
-            i(class=`${i.icon}`)
-        else 
-          a.deal_link(href=`${i.link}`, title=`${i.desrc}`)
-            i(class=`${i.icon}`)
-#Jay-footer
-  each item in theme.footer.footer_group.footer_group_link
-    .footer-group
-        h3.footer-title=item.group_title
-            .footer-links
-              each i in item.footer_links
-                if i.class == "in"
-                  a.footer-item(href=`${i.link}`)=i.text
-                else if i.class == "out"
-                  a.footer-item(target='_blank', href=`${i.link}`)=i.text
-                else 
-                  a.footer-item(href=`${i.link}`)=i.text
-#footer-banner
-  .footer-banner-links
-    .footer-banner-left
-      .footer-banner-left
-        #footer-banner-tips=`${theme.footer.text}`
-
-    .footer-banner-right
-      a.footer-banner-link(href="https://hexo.io/zh-cn/" title="Hexo")=theme.footer.framework
-      a.footer-banner-link |
-      a.footer-banner-link(href="/archives/49841/" title="theme") 主题：Dynasty
-      a.footer-banner-link |
-      a.footer-banner-link(href="/about/" title="about") 关于
-      a.footer-banner-link |
-      a.footer-banner-link.cc(href="/cc/" title="cc协议")
-        i.fab.fa-creative-commons
-        span 协议。
+.footer
+  #in
+    .title
+      img(src=url_for(theme.footer.footer_logo.url) style='border-radius:100vh;box-shadow:0 8px 12px -3px #4259ef23')
+    .author
+      span.name=config.author
+      .descr=config.subtitle
+      if theme.footer.footer_icons.enable
+        .links
+          each i in theme.footer.footer_icons.icons
+            if i.class == "in"
+              a.deal_link(href=`${i.link}`, title=`${i.desrc}`)
+                i(class=`${i.icon}` style='font-size:25px')
+            else if i.class == "out"
+              a.deal_link(target='_blank', rel='noopener external nofollow', href=`${i.link}`, title=`${i.desrc}`)
+                i(class=`${i.icon}` style='font-size:25px')
+            else 
+              a.deal_link(href=`${i.link}`, title=`${i.desrc}`)
+                i(class=`${i.icon}` style='font-size:25px')
+      about.about
+        a.footer-button(href="/about/" style='box-shadow:0 8px 12px -3px #ee7d7936;background:#F04A63;border-radius:100vh;')
+          i.dys.caozuo-wailian
+          span 了解更多
+        a.footer-button(href="/cc/" style='box-shadow:0 8px 12px -3px #87ee7936;background:#57BD6A;border-radius:100vh;')
+          i.dys.creativecommons
+          span 转载协议
+      div.frame
+        span HEXO
+        i.dys.heart-beat(style='font-size:20px')
+        span Dynasty
+      //- p(style="margin:5px 10px 5px 10px;height:20px")
+        a.active(href="https://cdnnb.cn")
+          img(src="https://img.shields.io/badge/本站由失控的防御系统提供加速防御支持-green?style=flat&logo=Claris")

layout/includes/head.pug

@@ -40,7 +40,7 @@ if (theme.pwa && theme.pwa.enable)
 
 //- main css
 link(rel='stylesheet', href=url_for(theme.asset.main_css))
-link(rel='stylesheet', href=url_for(theme.asset.fontawesomeV6) media="print" onload="this.media='all'")
+//- link(rel='stylesheet', href=url_for(theme.asset.fontawesomeV6) media="print" onload="this.media='all'")
 
 if (theme.snackbar && theme.snackbar.enable)
   link(rel='stylesheet', href=url_for(theme.asset.snackbar_css) media="print" onload="this.media='all'")
@@ -55,7 +55,7 @@ if theme.fancybox
 !=partial('includes/head/analytics', {}, {cache: true})
 
 //- font
-if theme.blog_title_font &&　theme.blog_title_font.font_link
+if theme.blog_title_font &&  theme.blog_title_font.font_link
   link(rel='stylesheet' href=url_for(theme.blog_title_font.font_link) media="print" onload="this.media='all'")
 
 //- global config

layout/includes/header/index.pug

@@ -39,18 +39,7 @@ header#page-header(class=isHomeClass style=bg_img)
           use(href='#gentle-wave', x='48', y='3')
           use(href='#gentle-wave', x='48', y='5')
           use(href='#gentle-wave', x='48', y='7')
-  else if is_home() 
-    //- #site-info
-      h1#site-title=site_title
-      if theme.subtitle.enable
-        - var loadSubJs = true
-        #site-subtitle
-          span#subtitle
-      if(theme.social)
-        #site_social_icons
-          !=fragment_cache('social', function(){return partial('includes/header/social')})
-    #scroll-down
-      i.fas.fa-angle-down.scroll-down-effects
+  else if is_home()
   else
     #page-site-info
       h1#site-title=site_title

layout/includes/header/menu_item.pug

@@ -1,27 +1,27 @@
 if theme.nav.menu
-  .menus_items
+  .menus_items#menus-items
     each value, label in theme.nav.menu
       if typeof value !== 'object'
         .menus_item
           - const valueArray = value.split('||')
           a.site-page(href=url_for(trim(valueArray[0])))
             if valueArray[1]
-              i.fa-fw(class=trim(valueArray[1]))
+              i(class=trim(valueArray[1]))
             span=' '+label
       else
         .menus_item
           - const labelArray = label.split('||')
           - const hideClass = labelArray[2] && trim(labelArray[2]) === 'hide' ? 'hide' : ''
           a.site-page.group(class=`${hideClass}` href='javascript:void(0);')
             if labelArray[1]
-              i.fa-fw(class=trim(labelArray[1]))
+              i(class=trim(labelArray[1]))
             span=' '+ trim(labelArray[0])
-            i.fas.fa-chevron-down
+            i.dys.arrowdown
           ul.menus_item_child
             each val,lab in value 
               - const valArray = val.split('||')
               li
                 a.site-page.child(href=url_for(trim(valArray[0])))
                   if valArray[1]
-                    i.fa-fw(class=trim(valArray[1]))
+                    i(class=trim(valArray[1]))
                   span=' '+ lab

layout/includes/header/nav.pug

@@ -6,36 +6,45 @@ nav#nav
       span#blog_name
         a#site-name(href=url_for('/'))
           .title #[=theme.nav.title.title]
-          i.fa-solid.fa-house
+          i.dys.home
     else
       span#blog_name(style="margin-left:-5px;height:30px;width:30px")
         a#site-name(href=url_for('/'))
           img(src=url_for(theme.nav.title.title) style="width:30px;height:30px;border-radius:100vh;")
-      #toggle-menu(style='margin:auto;')
+
+    .nav-menus#nav-menus
+      #toggle-menu(style='margin:0 10px 0 5px;')
         a.site-page(style='display:flex; align-items:center; height:35px;')
-          i.fas.fa-bars-progress.fa-fw
+          i.dys.apps(style='font-size: 25px;')
           | 菜单
 
-    !=partial('includes/header/menu_item', {}, {cache: true})
+      !=partial('includes/header/menu_item', {}, {cache: true})
+
+    .notebar#notebar
 
     a.link(href="https://travellings.cn/go.html" style='margin-right:10px')
-      i.fas.fa-bus
+      i.dys.tower(style='font-size: 22px;')
+
     if (theme.algolia_search.enable || theme.local_search.enable)
       div.nav-button#search-button
         a.site-page.social-icon.search
           .search-button-text
-            i.fas.fa-search.fa-fw
+            i.dys.searchico(style='font-size:25px')
             //- span 搜索
     else
-          div.nav-button
-            a.site-page.social-icon.search
-              .search-button-text
-                i.fas.fa-search.fa-fw
-                span 未开启
-
-  #buttons
-    a.link(onclick='showconsolebtn()')
-      i.fas.fa-gear.fa-spin
+      div.nav-button
+        a.site-page.social-icon.search
+          .search-button-text
+            i.dys.searchico(style='font-size:25px')
+            span 未开启
+    //- div.nav-button
+      a.link(onclick='showconsolebtn()')
+        i.dys.apps(style='font-size: 26px;')
+
+  #buttons.conbtn(onclick='btf.scrollToDest(0,500)')
+    a.link
+      i.dys.arrowup(style='font-size: 26px;')
+      span#percent
 
 
 

layout/includes/header/post-info.pug

@@ -7,19 +7,19 @@
       if (theme.post_meta.post.date_type)
         span.post-meta-date
           if (theme.post_meta.post.date_type === 'both')
-            i.far.fa-calendar-alt.fa-fw.post-meta-icon
+            i.dys.time.post-meta-icon
             span.post-meta-label= _p('post.created')
             time.post-meta-date-created(datetime=date_xml(page.date) title=_p('post.created') + ' ' + full_date(page.date))=date(page.date, config.date_format)
             span.post-meta-separator |
-            i.fas.fa-history.fa-fw.post-meta-icon
+            i.dys.shijianzhou.post-meta-icon
             span.post-meta-label= _p('post.updated')
             time.post-meta-date-updated(datetime=date_xml(page.updated) title=_p('post.updated') + ' ' + full_date(page.updated))=date(page.updated, config.date_format)
           else
             - let data_type_update = theme.post_meta.post.date_type === 'updated'
             - let date_type = data_type_update ? 'updated' : 'date'
-            - let date_icon = data_type_update ? 'fas fa-history' :'far fa-calendar-alt'
+            - let date_icon = data_type_update ? 'dys shijianzhou' :'dys time'
             - let date_title = data_type_update ? _p('post.updated') : _p('post.created')
-            i.fa-fw.post-meta-icon(class=date_icon)
+            i.post-meta-icon(class=date_icon)
             span.post-meta-label= date_title
             time(datetime=date_xml(page[date_type]) title=date_title + ' ' + full_date(page[date_type]))=date(page[date_type], config.date_format)
       if (theme.post_meta.post.categories && page.categories.data.length > 0)
@@ -28,32 +28,32 @@
             span.post-meta-separator |
 
           each item, index in page.categories.data
-            i.fas.fa-inbox.fa-fw.post-meta-icon
+            i.dys.-disk.post-meta-icon
             a(href=url_for(item.path)).post-meta-categories #[=item.name]
             if (index < page.categories.data.length - 1)
-              i.fas.fa-angle-right.post-meta-separator
+              i.dys.arrow-right.post-meta-separator
 
     .meta-secondline
       - let postWordcount = theme.wordcount.enable && (theme.wordcount.post_wordcount || theme.wordcount.min2read)
       if (postWordcount)
         span.post-meta-separator |
         span.post-meta-wordcount
           if theme.wordcount.post_wordcount
-            i.far.fa-file-word.fa-fw.post-meta-icon
+            i.far.fa-file-word.post-meta-icon
             span.post-meta-label= _p('post.wordcount') + ':'
             span.word-count= wordcount(page.content)
             if theme.wordcount.min2read
               span.post-meta-separator |
           if theme.wordcount.min2read
-            i.far.fa-clock.fa-fw.post-meta-icon
+            i.far.fa-clock.post-meta-icon
             span.post-meta-label= _p('post.min2read') + ':'
             span= min2read(page.content, {cn: 350, en: 160}) + _p('post.min2read_unit')
 
       //- for pv and count
       mixin pvBlock(parent_id,parent_class,parent_title)
         span.post-meta-separator |
         span(class=parent_class id=parent_id data-flag-title=page.title)
-          i.far.fa-eye.fa-fw.post-meta-icon
+          i.dys.view.post-meta-icon
           span.post-meta-label=_p('post.page_pv') + ':'
           if block
             block
@@ -63,35 +63,35 @@
         if commentUse[0] === 'Valine' && theme.valine.visitor
           +pvBlock(url_for(page.path),'leancloud_visitors',page.title)
             span.leancloud-visitors-count
-              i.fa-solid.fa-spinner.fa-spin
+              i.dys.spinner3.spin.ani
         else if commentUse[0] === 'Waline' && theme.waline.pageview
           +pvBlock('','','')
             span.waline-pageview-count(data-path=url_for(page.path))
-              i.fa-solid.fa-spinner.fa-spin
+              i.dys.spinner3.spin.ani
         else if commentUse[0] === 'Twikoo' && theme.twikoo.visitor
           +pvBlock('','','')
             span#twikoo_visitors
-              i.fa-solid.fa-spinner.fa-spin
+              i.dys.spinner3.spin.ani
         else if commentUse[0] === 'Artalk' && theme.artalk.visitor
           +pvBlock('','','')
             span#ArtalkPV
-              i.fa-solid.fa-spinner.fa-spin
+              i.dys.spinner3.spin.ani
         else if theme.busuanzi.page_pv
           +pvBlock('','post-meta-pv-cv','')
             span#busuanzi_value_page_pv
-              i.fa-solid.fa-spinner.fa-spin
+              i.dys.spinner3.spin.ani
       else if theme.busuanzi.page_pv
         +pvBlock('','post-meta-pv-cv','')
           span#busuanzi_value_page_pv
-            i.fa-solid.fa-spinner.fa-spin
+            i.dys.spinner3.spin.ani
 
       if comments.count && !comments.lazyload && page.comments !== false && comments.use
         - var whichCount = comments.use[0]
 
         mixin countBlock
           span.post-meta-separator |
           span.post-meta-commentcount
-            i.far.fa-comments.fa-fw.post-meta-icon
+            i.far.fa-comments.post-meta-icon
             span.post-meta-label= _p('post.comments') + ':'
             if block
               block
@@ -101,32 +101,32 @@
             +countBlock
               span.disqus-comment-count
                 a(href=full_url_for(page.path) + '#disqus_thread')
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani
           when 'Disqusjs'
             +countBlock
               a(href=full_url_for(page.path) + '#disqusjs')
                 span.disqus-comment-count(data-disqus-url=full_url_for(page.path))
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani
           when 'Valine'
             +countBlock
               a(href=url_for(page.path) + '#post-comment' itemprop="discussionUrl")
                 span.valine-comment-count(data-xid=url_for(page.path) itemprop="commentCount")
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani
           when 'Waline'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.waline-comment-count(data-path=url_for(page.path))
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani
           when 'Gitalk'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.gitalk-comment-count
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani
           when 'Twikoo'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span#twikoo-count
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani
           when 'Facebook Comments'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
@@ -135,9 +135,9 @@
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.remark42__counter(data-url=urlNoIndex())
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani
           when 'Artalk'
             +countBlock
               a(href=url_for(page.path) + '#post-comment')
                 span.artalk-count
-                  i.fa-solid.fa-spinner.fa-spin
+                  i.dys.spinner3.spin.ani