diff --git a/_config.yml b/_config.yml index e3ab80c..900c6fd 100644 --- a/_config.yml +++ b/_config.yml @@ -246,7 +246,6 @@ post_meta: # Dependencies: https://github.com/next-theme/hexo-word-counter symbols_count_time: separated_meta: true - item_text_post: true item_text_total: false # Use icon instead of the symbol # to indicate the tag at the bottom of the post diff --git a/layout/_layout.njk b/layout/_layout.njk index 56dcde1..6221972 100644 --- a/layout/_layout.njk +++ b/layout/_layout.njk @@ -32,12 +32,12 @@ {{ partial('_scripts/index.njk', {}, {cache: theme.cache.enable}) }} {{ partial('_third-party/index.njk', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/statistics/index.njk', {}, {cache: theme.cache.enable}) }} {%- if theme.pjax %}
diff --git a/layout/_macro/post.njk b/layout/_macro/post.njk index 42af228..b1c0269 100644 --- a/layout/_macro/post.njk +++ b/layout/_macro/post.njk @@ -135,9 +135,7 @@ - {%- if theme.symbols_count_time.item_text_post %} - {{ __('symbols_count_time.count') + __('symbol.colon') }} - {%- endif %} + {{ __('symbols_count_time.count') + __('symbol.colon') }} {{ symbolsCount(post) }} {%- endif %} @@ -147,9 +145,7 @@ - {%- if theme.symbols_count_time.item_text_post %} - {{ __('symbols_count_time.time') }} ≈ - {%- endif %} + {{ __('symbols_count_time.time') }} ≈ {{ symbolsTime(post, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }} {%- endif %} diff --git a/layout/_partials/footer.njk b/layout/_partials/footer.njk index 76ab25a..11673ac 100644 --- a/layout/_partials/footer.njk +++ b/layout/_partials/footer.njk @@ -18,29 +18,61 @@ {{ theme.footer.copyright or author }} +
+{%- if config.symbols_count_time.total_symbols or config.symbols_count_time.total_time %} +
{%- if config.symbols_count_time.total_symbols %} - | + {%- if theme.symbols_count_time.item_text_total %} - + {{ __('symbols_count_time.count_total') + __('symbol.colon') }} {%- endif %} {{ symbolsCountTotal(site) }} + {%- endif %} {%- if config.symbols_count_time.total_time %} - | + {%- if theme.symbols_count_time.item_text_total %} - + {{ __('symbols_count_time.time_total') }} ≈ {%- endif %} {{ symbolsTimeTotal(site, config.symbols_count_time.awl, config.symbols_count_time.wpm, __('symbols_count_time.time_minutes')) }} + +{%- endif %} +
+{%- endif %} + +{%- if theme.busuanzi_count.enable %} +
+ {%- if theme.busuanzi_count.total_visitors %} + + {%- endif %} + + {%- if theme.busuanzi_count.total_views %} + {%- endif %}
+{%- endif %} {%- if theme.footer.powered %}
diff --git a/layout/_third-party/statistics/busuanzi-counter.njk b/layout/_third-party/statistics/busuanzi-counter.njk index 87ea02a..f3ff6db 100644 --- a/layout/_third-party/statistics/busuanzi-counter.njk +++ b/layout/_third-party/statistics/busuanzi-counter.njk @@ -1,31 +1,3 @@ {%- if theme.busuanzi_count.enable %} -
- - {%- if theme.busuanzi_count.total_visitors %} - - {%- endif %} - - {%- if theme.busuanzi_count.total_visitors and theme.busuanzi_count.total_views %} - - {%- endif %} - - {%- if theme.busuanzi_count.total_views %} - - {%- endif %} -
{%- endif %} diff --git a/source/css/_common/components/post/post-header.styl b/source/css/_common/components/post/post-header.styl index 2dcc1e1..cb9e31d 100644 --- a/source/css/_common/components/post/post-header.styl +++ b/source/css/_common/components/post/post-header.styl @@ -83,21 +83,14 @@ } } -.post-meta .post-meta-item + .post-meta-item::before { +// .post-meta-item exists in .post-meta and footer +.post-meta-item + .post-meta-item::before { content: '|'; margin: 0 .5em; } -.post-meta-divider { - margin: 0 .5em; -} - .post-meta-item-icon { margin-right: 3px; - - +tablet-mobile() { - display: inline-block; - } } .post-meta-item-text { diff --git a/source/css/_common/outline/footer/footer.styl b/source/css/_common/outline/footer/footer.styl index f7b9cd4..87b6d3c 100644 --- a/source/css/_common/outline/footer/footer.styl +++ b/source/css/_common/outline/footer/footer.styl @@ -71,7 +71,3 @@ animation: icon-animate 1.33s ease-in-out infinite; } } - -.powered-by, .theme-info { - display: inline-block; -}