diff --git a/_config.yml b/_config.yml index 4527242..52a2b5c 100755 --- a/_config.yml +++ b/_config.yml @@ -42,7 +42,7 @@ avatar_placeholder: https://cdn.jsdelivr.net/gh/xaoxuu/assets@master/avatar/avat # 日期格式 http://momentjs.com/docs/ date_format: 'YYYY-MM-DD' # 文章发布日期的格式 -updated_date_format: 'llll' # 文章更新日期的格式 +updated_date_format: 'lll' # 文章更新日期的格式 ############################### 自定义 ############################### diff --git a/layout/_meta/author.ejs b/layout/_meta/author.ejs index 0ed69fc..b6351d7 100755 --- a/layout/_meta/author.ejs +++ b/layout/_meta/author.ejs @@ -1,8 +1,12 @@ <% if(post.author || config.author){ %>
- - <%- post.author || config.author %> + <% if (config.avatar) { %> + + <% } else { %> + + <% } %> +

<%- post.author || config.author %>

<% } %> diff --git a/layout/_meta/categories.ejs b/layout/_meta/categories.ejs index 144076f..a73aaf7 100755 --- a/layout/_meta/categories.ejs +++ b/layout/_meta/categories.ejs @@ -10,7 +10,7 @@
- <%- cats.join(' / ') %> +

<%- cats.join(' / ') %>

<% } %> diff --git a/layout/_meta/counter.ejs b/layout/_meta/counter.ejs index d023ba7..59579ec 100644 --- a/layout/_meta/counter.ejs +++ b/layout/_meta/counter.ejs @@ -3,9 +3,11 @@
- - - +

+ + + +

<% } %> diff --git a/layout/_meta/date.ejs b/layout/_meta/date.ejs index 1ebb93a..097bab9 100755 --- a/layout/_meta/date.ejs +++ b/layout/_meta/date.ejs @@ -1,6 +1,6 @@
- <%= date(post.date, theme.date_format) %> +

<%- date(post.date, theme.date_format) %>

diff --git a/layout/_meta/tags.ejs b/layout/_meta/tags.ejs index 68ddf58..31a6a91 100644 --- a/layout/_meta/tags.ejs +++ b/layout/_meta/tags.ejs @@ -2,7 +2,7 @@ <% var items = []; post.tags.each(function(item){ - items.push('
 ' + item.name + '
'); + items.push('
 

' + item.name + '

'); }); %> <%- items.join(' ') %> diff --git a/layout/_meta/topping.ejs b/layout/_meta/topping.ejs index e4b36c3..b3b9b3d 100644 --- a/layout/_meta/topping.ejs +++ b/layout/_meta/topping.ejs @@ -2,7 +2,7 @@
- <%- post.top != true ? post.top : __('post.top') %> +

<%- post.top != true ? post.top : __('post.top') %>

<% } %> diff --git a/layout/_meta/updated.ejs b/layout/_meta/updated.ejs index 12559e6..a1b80d3 100644 --- a/layout/_meta/updated.ejs +++ b/layout/_meta/updated.ejs @@ -1,6 +1,6 @@
- <%- __('post.updated') + ' ' + date(post.updated, theme.updated_date_format) %> +

<%- __('post.updated') + ' ' + date(post.updated, theme.updated_date_format) %>

diff --git a/layout/_third-party/share.ejs b/layout/_third-party/share.ejs index 7afb3b8..4797143 100644 --- a/layout/_third-party/share.ejs +++ b/layout/_third-party/share.ejs @@ -1,5 +1,4 @@
-
<% (theme.share||[]).forEach(function(item){ %> <% if (item.id == 'qrcode'){ %> diff --git a/layout/_widget/related_posts.ejs b/layout/_widget/related_posts.ejs index 7c9d7c0..6a1a944 100755 --- a/layout/_widget/related_posts.ejs +++ b/layout/_widget/related_posts.ejs @@ -1,4 +1,4 @@ -<% if(page.layout == 'post' && page.content && page.path){ %> +<% if(page.layout == 'post' && page.content && page.path != undefined){ %>
<%- partial('header', {item: item, defIcon: 'fas fa-bookmark', defTitle: __('sidebar.related_posts')}) %>
diff --git a/source/less/_main.less b/source/less/_main.less index 6c43ce4..9f74d28 100755 --- a/source/less/_main.less +++ b/source/less/_main.less @@ -362,6 +362,7 @@ .new-meta-box{ @metaH: 24px; .enable-trans(); + padding-top: 4px; padding-bottom: 8px; display: flex; align-items: center; @@ -374,12 +375,16 @@ cursor: default; &:hover{ color: fade(@color_text_main, 70%); + p{ + color: fade(@color_text_main, 70%); + } } } display: flex; align-items: center; + justify-content: center; padding: 2px; - margin: 4px 8px 4px 0; + margin: 0 8px 0 0; border-radius: 4px; &:last-child{ margin-right: 0; @@ -387,13 +392,13 @@ img,i{ border-radius: 100%; display: inline; - width: @metaH - 4px; - } - img{ - width: @metaH - 10px; } i{ - margin-right: 2px; + margin-right: 4px; + border-radius: 0; + &.fa-hashtag{ + margin-right: 1px; + } } p,a{ color: fade(@color_text_main, 70%); @@ -401,8 +406,26 @@ padding-right: 4px; } a{ + font-family: @fontfamily_base; + display: flex; + justify-content: center; + align-items: center; + img{ + height: @metaH - 7px; + width: @metaH - 7px; + margin-right: 5px; + } + p{ + margin: 0; + padding-top: 2px; + font-weight: normal; + .enable-trans(); + } &:hover{ color: @color_text_highlight; + p{ + color: @color_text_highlight; + } text-decoration: none; } } @@ -420,7 +443,7 @@ } } } - + } }