Merge pull request #18 from theme-kaze/devel

Release: v1.1.0-beta2
theme-kaze · Sep 30, 2020 · a1fdd69 · a1fdd69
2 parents 503abb6 + 7c6fbfd
commit a1fdd69
Show file tree

Hide file tree

Showing 34 changed files with 390 additions and 393 deletions.
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
@@ -1,11 +1,12 @@
 <head>
   <meta charset="UTF-8">
   <meta name="viewport"
-    content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <meta name="theme-color" content="#fff" id="theme-color">
+  <meta name="description" content="<%= config.description || config.title || theme.title %>">
   <link rel="icon" href="<%= theme.logo_img %>">
-  <title><%- theme.title %></title>
+  <title><%- page.title || theme.title %></title>
   <% if(theme.og && theme.og.enable) { %>
   <% if(theme.og.title) { %>
   <meta property="og:title" content="<%= page.title || theme.title || config.title %>">

diff --git a/layout/_partial/nav.ejs b/layout/_partial/nav.ejs
@@ -2,7 +2,7 @@
   <div class="navbar-logo">
     <span class="navbar-logo-main">
       <% if(theme.logo_img || theme.author_img ) { %>
-      <img class="navbar-logo-img" src="<%- theme.logo_img %>">
+      <img class="navbar-logo-img" src="<%- theme.logo_img %>" alt="logo">
       <% } %>
       <span class="navbar-logo-dsc"><%- theme.title || config.title %></span>
     </span>

diff --git a/layout/_partial/plugins/fslightbox.ejs b/layout/_partial/plugins/fslightbox.ejs
@@ -6,6 +6,7 @@
       var wrapper = document.createElement('a');
       wrapper.setAttribute('data-fslightbox', 'gallery');
       wrapper.setAttribute('href', img[i].getAttribute('data-src'));
+      wrapper.setAttribute('aria-label', 'illustration');
       wrapper.style.cssText = 'width: 100%; display: flex; justify-content: center;';
       img[i].before(wrapper);
       wrapper.append(img[i]);

diff --git a/layout/_partial/scrollbutton.ejs b/layout/_partial/scrollbutton.ejs
@@ -1,15 +1,15 @@
-<a role="button" id="scrollbutton" class="basebutton" <% if(!theme.scrollUpAnimation) { %> href="#" <% } %>>
+<a role="button" id="scrollbutton" class="basebutton" <% if(!theme.scrollUpAnimation) { %> href="#" <% } %> aria-label="回到顶部">
   <i class="iconfont icon-arrowleft button-icon"></i>
 </a>
 <a role="button" id="menubutton" class="basebutton">
   <i class="iconfont icon-menu button-icon"></i>
 </a>
-<a role="button" id="popbutton" class="basebutton">
+<a role="button" id="popbutton" class="basebutton" aria-label="控制中心">
   <i class="iconfont icon-expand button-icon"></i>
 </a>
-<a role="button" id="darkbutton" class="basebutton darkwidget">
+<a role="button" id="darkbutton" class="basebutton darkwidget" aria-label="夜色模式">
   <i class="iconfont icon-weather button-icon"></i>
 </a>
-<a role="button" id="searchbutton" class="basebutton searchwidget">
+<a role="button" id="searchbutton" class="basebutton searchwidget" aria-label="搜索">
   <i class="iconfont icon-search button-icon"></i>
 </a>
diff --git a/layout/about.ejs b/layout/about.ejs
@@ -1,3 +1,4 @@
+<% page.title = page.title || __('about.title') %>
 <div class="card card-content about-card">
   <% if(theme.author_img) { %>
   <img src="<%= theme.author_img %>" class="about-card-avatar">

diff --git a/layout/archive.ejs b/layout/archive.ejs
@@ -1,3 +1,4 @@
+<% page.title = __('archive.title') %>
 <div class="card card-content">
   <h1 class="widget-title"><%- __('archive.title') %></h1>
 </div>

diff --git a/layout/categories.ejs b/layout/categories.ejs
@@ -1,3 +1,4 @@
+<% page.title = __('categories.title') %>
 <div class="card card-content">
   <div class="categories-page-title" style="margin-bottom: 0.6rem;"><%- __('categories.title') %></div>
   <div>

diff --git a/layout/category.ejs b/layout/category.ejs
@@ -1,9 +1,10 @@
+<% page.title = __('categories.title') %>
 <div class="card card-content category-page-card">
   <div class="categories-page-title"><%- __('categories.title') %>&nbsp-&nbsp<%- page.category %></div>
 </div>
 <div class="archive-timeline">
   <% let archiveYear = ''; %>
-  <% page.posts.sort('date', -1).forEach(post => { %>
+  <% page.posts.forEach(post => { %>
   <% if (date(post.date,'YYYY') != archiveYear) { %>
   <div class="archive-timeline-tag"><span><%= date(post.date,'YYYY') %></span></div>
   <% archiveYear = date(post.date,'YYYY'); %>

diff --git a/layout/index.ejs b/layout/index.ejs
@@ -1,7 +1,7 @@
-<% page.posts.sort('date', -1).forEach(post => { %>
+<% page.posts.forEach(post => { %>
 <div class="card">
   <% if(post.banner_img) { %>
-  <a href="/<%= post.path %>" class="image-wrapper">
+  <a href="/<%= post.path %>" class="image-wrapper" aria-label="thumbnail">
     <img src="<%= post.banner_img %>" data-src="<%= post.banner_img %>"
       srcset="<%= post.banner_img_set || theme.lazyload.loadingImg || "data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%20300%20300'%3E%3C/svg%3E" %>"
       class="image lozad">
@@ -22,7 +22,7 @@
     </div>
     <div class="card-post-footer">
       <div class="post-meta">
-        <time datetime="<%= date_xml(post.date) _%>" style="display: flex; align-items: center;">
+        <time datetime="<%= date_xml(post.date) _%>">
           <i class="iconfont icon-calendar" style="margin-right: 2px;"></i>
           <span><%= date(post.date) %></span>
         </time>

diff --git a/layout/layout.ejs b/layout/layout.ejs
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
-<html>
-<meta <% if(config.language) { %> lang="<%- config.language %>" <% } %>>
+<html <% if(config.language) { %> lang="<%- config.language %>" <% } %>>
 <%- partial('_partial/head') %>
 
 <body>

diff --git a/layout/links.ejs b/layout/links.ejs
@@ -1,3 +1,4 @@
+<% page.title = __('friends.title') %>
 <div class="card card-content">
   <h1 class="widget-title"><%- __('friends.title') %></h1>
 </div>

diff --git a/layout/post.ejs b/layout/post.ejs
@@ -2,7 +2,9 @@
 <div class="image-wrapper">
   <img src="<%= page.banner_img %>" data-src="<%=page.banner_img %>"
     srcset="<%= page.banner_img_set || theme.lazyload.loadingImg || "data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%20300%20300'%3E%3C/svg%3E" %>"
-    class="image lozad">
+    class="image lozad"
+    alt="thumbnail"
+  >
 </div>
 <% } %>
 <article class="card card-content">
@@ -12,7 +14,7 @@
     </h1>
   </header>
   <div class="post-meta post-show-meta">
-    <time datetime="<%= date_xml(page.date) _%>" style="display: flex; align-items: center;">
+    <time datetime="<%= date_xml(page.date) _%>">
       <i class="iconfont icon-calendar" style="margin-right: 2px;"></i>
       <span><%= date(page.date) %></span>
     </time>

diff --git a/layout/tag.ejs b/layout/tag.ejs
@@ -1,9 +1,10 @@
+<% page.title = __('tags.title') %>
 <div class="card card-content tag-page-card">
   <div class="tags-page-title"><%- __('tags.title') %>&nbsp-&nbsp<%- page.tag %></div>
 </div>
 <div class="archive-timeline">
   <% let archiveYear = ''; %>
-  <% page.posts.sort('date', -1).forEach(post => { %>
+  <% page.posts.forEach(post => { %>
     <% if (date(post.date,'YYYY') != archiveYear) { %>
       <div class="archive-timeline-tag"><span><%= date(post.date,'YYYY') %></span></div>
       <% archiveYear = date(post.date,'YYYY'); %>

diff --git a/layout/tags.ejs b/layout/tags.ejs
@@ -1,3 +1,4 @@
+<% page.title = __('tags.title') %>
 <div class="card card-content">
   <div class="tags-page-title" style="margin-bottom: 0.6rem;"><%= __('tags.title') %></div>
   <div>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-kaze",
-  "version": "1.1.0-beta1",
+  "version": "1.1.0-beta2",
   "description": "hexo-theme-kaze",
   "main": "index.js",
   "scripts": {

diff --git a/source/css/_pages/about.styl b/source/css/_pages/about.styl
@@ -3,33 +3,33 @@
   flex-direction: row
   justify-content: center
   align-items: center
-  .about-card-avatar
-    width: 150px
-    height: 150px
-    margin-right: 90px
-  .about-card-content
-    display: flex
-    flex-direction: column
-    align-items: center
-    justify-content: center
-    .about-card-author
-      margin-top: 12px
-      font-size: $ex-font-size
-    .about-card-dsc
-      margin-top: 6px
-      color: var(--text-light-color)
-    .about-card-society
-      margin-top: 8px
-      display: flex
-      flex-direction: row
-      .about-card-society-icon
-        padding: 0 5px
-        .society-icon
-          font-size: 22px
-          color: var(--text-strong-color)
+.about-card-avatar
+  width: 150px
+  height: 150px
+  margin-right: 90px
+.about-card-content
+  display: flex
+  flex-direction: column
+  align-items: center
+  justify-content: center
+.about-card-author
+  margin-top: 12px
+  font-size: $ex-font-size
+.about-card-dsc
+  margin-top: 6px
+  color: var(--text-light-color)
+.about-card-society
+  margin-top: 8px
+  display: flex
+  flex-direction: row
+.about-card-society-icon
+  padding: 0 5px
+  .society-icon
+    font-size: 22px
+    color: var(--text-strong-color)
 
 @media (max-width: 862px)
   .about-card
     flex-direction: column
-    .about-card-avatar
-      margin-right: 0
+  .about-card-avatar
+    margin-right: 0
diff --git a/source/css/_pages/archives.styl b/source/css/_pages/archives.styl
@@ -1,30 +1,28 @@
-.archive-timeline
-  .archive-timeline-tag
-    box-shadow: var(--tag-shadow-style)
-    background-color: $blue-tag-color
-    transition: background-color 0.3s
-    border-radius: 0.3rem
-    max-width: 66px
-    height: 32px
-    display: flex
-    justify-content: center
-    align-items: center
-    color: var(--text-white-color)
-    margin: 12px 0
-  .archive-timeline-item
-    position: relative
-    margin-left: 12px
-    .archive-timeline-post
-      margin-left: 10px
-      padding: 6px 6px
-      .archive-timeline-post-content
-        margin-top: 12px
-        font-size: $ml-font-size
-        .archive-timeline-post-item
-            color: var(--text-font-color)
+.archive-timeline-tag
+  box-shadow: var(--tag-shadow-style)
+  background-color: $blue-tag-color
+  transition: background-color 0.3s
+  border-radius: 0.3rem
+  max-width: 66px
+  height: 32px
+  display: flex
+  justify-content: center
+  align-items: center
+  color: var(--text-white-color)
+  margin: 12px 0
+.archive-timeline-item
+  position: relative
+  margin-left: 12px
+.archive-timeline-post
+  margin-left: 10px
+  padding: 6px 6px
+.archive-timeline-post-content
+  margin-top: 12px
+  font-size: $ml-font-size
+.archive-timeline-post-item
+    color: var(--text-font-color)
 @media(max-width: 862px)
-  .archive-timeline
-    .archive-timeline-item
-      margin-left: 18px
-      .archive-timeline-post
-        margin-left: 8px
+  .archive-timeline-item
+    margin-left: 18px
+  .archive-timeline-post
+    margin-left: 8px
diff --git a/source/css/_pages/categories.styl b/source/css/_pages/categories.styl
@@ -4,37 +4,35 @@
   margin-bottom: 24px
 .categories-page-card
   overflow: hidden
-  .categories-page-list-item
-    width: (1 / 3) * 100%
-    float: left
-    display: flex
-    color: var(--text-color)
-    font-size: $lg-font-size
-    flex-direction: column
-    align-items: center
-    justify-content: center
-    padding: 8px 20px
-    &:hover
-      cursor: pointer
-      border-radius: 0.3rem
-      background-color: var(--badge-background-color)
-      transition: background-color 0.3s
-      transition-duration: 0.3s
-      transition-timing-function: ease-in-out
-    + .categories-page-list-item
-      margin-top: 0.4rem
-    .categories-page-list-item-total
-      font-size: $sm-font-size
+.categories-page-list-item
+  width: (1 / 3) * 100%
+  float: left
+  display: flex
+  color: var(--text-color)
+  font-size: $lg-font-size
+  flex-direction: column
+  align-items: center
+  justify-content: center
+  padding: 8px 20px
+  &:hover
+    cursor: pointer
+    border-radius: 0.3rem
+    background-color: var(--badge-background-color)
+    transition: background-color 0.3s
+    transition-duration: 0.3s
+    transition-timing-function: ease-in-out
+  + .categories-page-list-item
+    margin-top: 0.4rem
+.categories-page-list-item-total
+  font-size: $sm-font-size
 
 @media (max-width : 968px)
-  .categories-page-card
-    .categories-page-list-item
-      width: (1 / 2) * 100%
+  .categories-page-list-item
+    width: (1 / 2) * 100%
 
 @media (max-width : 742px)
-  .categories-page-card
-    .categories-page-list-item
-      width: 100%
-      flex-direction: row
-      justify-content: space-between
-      align-content: center
+  .categories-page-list-item
+    width: 100%
+    flex-direction: row
+    justify-content: space-between
+    align-content: center
diff --git a/source/css/_pages/rewrite.styl b/source/css/_pages/rewrite.styl
@@ -1,7 +1,6 @@
-.comment-card
-  .comment-card-title
-    font-size: $ml-font-size
-    margin-bottom: 16px
+.comment-card-title
+  font-size: $ml-font-size
+  margin-bottom: 16px
 .widget-title
   font-size: $lg-font-size
   font-weight: bold