From bb5cfe650cb5de268633eb4a47ad575e37f55175 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Fri, 28 Dec 2018 13:03:29 +0100 Subject: [PATCH 1/3] Cache is not enough? Ok, let's cache sidebar, scripts and 3rd-party's. Issues: #539, #385. --- layout/_layout.swig | 41 ++++++++++++----------- layout/{_macro => _partials}/sidebar.swig | 5 ++- layout/archive.swig | 3 +- layout/category.swig | 3 +- layout/index.swig | 3 +- layout/page.swig | 3 +- layout/post.swig | 7 +--- layout/tag.swig | 3 +- 8 files changed, 29 insertions(+), 39 deletions(-) rename layout/{_macro => _partials}/sidebar.swig (98%) diff --git a/layout/_layout.swig b/layout/_layout.swig index 1198a2c4aa..4012cc9cc1 100644 --- a/layout/_layout.swig +++ b/layout/_layout.swig @@ -94,30 +94,31 @@ {% endif %} - {% include '_scripts/vendors.swig' %} - {% include '_scripts/commons.swig' %} + {{ partial('_scripts/vendors.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_scripts/commons.swig', {}, {cache: theme.cache.enable}) }} {% set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %} - {% include scheme_script %} + {{ partial(scheme_script, {}, {cache: theme.cache.enable}) }} {% block script_extra %}{% endblock %} - {% include '_scripts/boostrap.swig' %} - - {% include '_third-party/comments/index.swig' %} - {% include '_third-party/search/index.swig' %} - {% include '_third-party/analytics/lean-analytics.swig' %} - {% include '_third-party/analytics/firestore.swig' %} - {% include '_third-party/seo/baidu-push.swig' %} - {% include '_third-party/schedule.swig' %} - {% include '_third-party/math/index.swig' %} - {% include '_third-party/needsharebutton.swig' %} - {% include '_third-party/rating.swig' %} - {% include '_third-party/pangu.swig' %} - {% include '_third-party/scroll-cookie.swig' %} - {% include '_third-party/exturl.swig' %} - {% include '_third-party/bookmark.swig' %} - {% include '_third-party/copy-code.swig' %} - {% include '_third-party/pdf.swig' %} + {{ partial('_scripts/boostrap.swig', {}, {cache: theme.cache.enable}) }} + + {{ partial('_third-party/comments/index.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/search/index.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/analytics/lean-analytics.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/analytics/firestore.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/seo/baidu-push.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/schedule.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/math/index.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/needsharebutton.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/rating.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/pangu.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/scroll-cookie.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/exturl.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/bookmark.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/copy-code.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_third-party/pdf.swig', {}, {cache: theme.cache.enable}) }} + diff --git a/layout/_macro/sidebar.swig b/layout/_partials/sidebar.swig similarity index 98% rename from layout/_macro/sidebar.swig rename to layout/_partials/sidebar.swig index a83cd2f48f..a4bb9e9bd3 100644 --- a/layout/_macro/sidebar.swig +++ b/layout/_partials/sidebar.swig @@ -1,4 +1,3 @@ -{% macro render(is_post) %}
@@ -13,7 +12,7 @@ {% endif %}
- {% set display_toc = is_post and theme.toc.enable or is_page and theme.toc.enable %} + {% set display_toc = is_post and theme.toc.enable %} {% if display_toc and toc(page.content).length > 1 %}
    @@ -84,6 +83,7 @@ {% if hasTagsPage %}{% endif %}
{% endif %} + {% endif %} @@ -186,4 +186,3 @@
-{% endmacro %} diff --git a/layout/archive.swig b/layout/archive.swig index fc146b6bf1..a0239a4737 100644 --- a/layout/archive.swig +++ b/layout/archive.swig @@ -1,6 +1,5 @@ {% extends '_layout.swig' %} {% import '_macro/post-collapse.swig' as post_template %} -{% import '_macro/sidebar.swig' as sidebar_template %} {% block title %}{{ __('title.archive') }} | {{ title }}{% endblock %} @@ -60,5 +59,5 @@ {% endblock %} {% block sidebar %} - {{ sidebar_template.render(false) }} +{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} diff --git a/layout/category.swig b/layout/category.swig index e28bdbce5d..a6788895a2 100644 --- a/layout/category.swig +++ b/layout/category.swig @@ -1,6 +1,5 @@ {% extends '_layout.swig' %} {% import '_macro/post-collapse.swig' as post_template %} -{% import '_macro/sidebar.swig' as sidebar_template %} {% block title %}{{ __('title.category') }}: {{ page.category }} | {{ title }}{% endblock %} @@ -34,5 +33,5 @@ {% endblock %} {% block sidebar %} - {{ sidebar_template.render(false) }} +{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} diff --git a/layout/index.swig b/layout/index.swig index 9fd359f078..cac5154239 100644 --- a/layout/index.swig +++ b/layout/index.swig @@ -1,6 +1,5 @@ {% extends '_layout.swig' %} {% import '_macro/post.swig' as post_template %} -{% import '_macro/sidebar.swig' as sidebar_template %} {% block title %}{{ title }}{% if theme.index_with_subtitle and subtitle %} – {{ subtitle }}{% endif %}{% endblock %} @@ -19,5 +18,5 @@ {% endblock %} {% block sidebar %} - {{ sidebar_template.render(false) }} +{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} diff --git a/layout/page.swig b/layout/page.swig index 5498cc0265..d23d9c937b 100644 --- a/layout/page.swig +++ b/layout/page.swig @@ -1,5 +1,4 @@ {% extends '_layout.swig' %} -{% import '_macro/sidebar.swig' as sidebar_template %} {% block title %}{# #}{% set page_title_suffix = ' | ' + title %}{# @@ -79,7 +78,7 @@ {% endblock %} {% block sidebar %} - {{ sidebar_template.render(false) }} +{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} {% block script_extra %} diff --git a/layout/post.swig b/layout/post.swig index b778c9c81e..1f897396c9 100644 --- a/layout/post.swig +++ b/layout/post.swig @@ -1,23 +1,18 @@ {% extends '_layout.swig' %} {% import '_macro/post.swig' as post_template %} -{% import '_macro/sidebar.swig' as sidebar_template %} - {% block title %}{{ page.title }} | {{ title }}{% endblock %} {% block page_class %}page-post-detail{% endblock %} - {% block content %} -
{{ post_template.render(page) }}
- {% endblock %} {% block sidebar %} - {{ sidebar_template.render(true) }} +{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} {% block script_extra %} diff --git a/layout/tag.swig b/layout/tag.swig index 7af5a77c75..a7748b2a0b 100644 --- a/layout/tag.swig +++ b/layout/tag.swig @@ -1,6 +1,5 @@ {% extends '_layout.swig' %} {% import '_macro/post-collapse.swig' as post_template %} -{% import '_macro/sidebar.swig' as sidebar_template %} {% block title %}{{ __('title.tag') }}: {{ page.tag }} | {{ title }}{% endblock %} @@ -33,5 +32,5 @@ {% endblock %} {% block sidebar %} - {{ sidebar_template.render(false) }} +{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} From 912595fd0e1e3872bded5e3073cc3f9f76d912f2 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 29 Dec 2018 17:51:31 +0100 Subject: [PATCH 2/3] Formatted code. --- layout/archive.swig | 2 +- layout/category.swig | 2 +- layout/index.swig | 2 +- layout/page.swig | 2 +- layout/post.swig | 2 +- layout/tag.swig | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/layout/archive.swig b/layout/archive.swig index a0239a4737..01ddabd690 100644 --- a/layout/archive.swig +++ b/layout/archive.swig @@ -59,5 +59,5 @@ {% endblock %} {% block sidebar %} -{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} diff --git a/layout/category.swig b/layout/category.swig index a6788895a2..ddd4db6c36 100644 --- a/layout/category.swig +++ b/layout/category.swig @@ -33,5 +33,5 @@ {% endblock %} {% block sidebar %} -{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} diff --git a/layout/index.swig b/layout/index.swig index cac5154239..6fd799ccd7 100644 --- a/layout/index.swig +++ b/layout/index.swig @@ -18,5 +18,5 @@ {% endblock %} {% block sidebar %} -{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} diff --git a/layout/page.swig b/layout/page.swig index d23d9c937b..fe560f154c 100644 --- a/layout/page.swig +++ b/layout/page.swig @@ -78,7 +78,7 @@ {% endblock %} {% block sidebar %} -{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} {% block script_extra %} diff --git a/layout/post.swig b/layout/post.swig index 1f897396c9..8d187598a5 100644 --- a/layout/post.swig +++ b/layout/post.swig @@ -12,7 +12,7 @@ {% endblock %} {% block sidebar %} -{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} {% block script_extra %} diff --git a/layout/tag.swig b/layout/tag.swig index a7748b2a0b..caf7fedecf 100644 --- a/layout/tag.swig +++ b/layout/tag.swig @@ -32,5 +32,5 @@ {% endblock %} {% block sidebar %} -{{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} + {{ partial('_partials/sidebar.swig', {}, {cache: theme.cache.enable}) }} {% endblock %} From e04ca9a9cbc18b1fa0ab73073fdf6db0ed0a9c3e Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 30 Dec 2018 20:24:40 +0100 Subject: [PATCH 3/3] Fixed b2t to work on all schemes. --- _config.yml | 2 +- source/css/_common/components/back-to-top-sidebar.styl | 2 +- source/css/_variables/Gemini.styl | 3 +++ source/css/_variables/Pisces.styl | 2 +- source/css/_variables/base.styl | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index 9a3f968249..0151263328 100644 --- a/_config.yml +++ b/_config.yml @@ -253,7 +253,7 @@ sidebar: # Sidebar offset from top menubar in pixels (only for Pisces | Gemini). offset: 12 - # Back to top in sidebar (only for Pisces | Gemini). + # Back to top in sidebar. b2t: false # Scroll percent label in b2t button. scrollpercent: false diff --git a/source/css/_common/components/back-to-top-sidebar.styl b/source/css/_common/components/back-to-top-sidebar.styl index ebaac83801..16f0868fb2 100644 --- a/source/css/_common/components/back-to-top-sidebar.styl +++ b/source/css/_common/components/back-to-top-sidebar.styl @@ -1,7 +1,7 @@ .back-to-top { visibility: hidden; margin: (20px - $sidebar-offset) -10px -20px; - background: $body-bg-color; + background: $b2t-bg-color; font-size: $b2t-font-size; opacity: $b2t-opacity; cursor: pointer; diff --git a/source/css/_variables/Gemini.styl b/source/css/_variables/Gemini.styl index 095aad3a8a..9e4bcdeaa0 100644 --- a/source/css/_variables/Gemini.styl +++ b/source/css/_variables/Gemini.styl @@ -16,3 +16,6 @@ $border-radius-inner = initial $border-radius = initial //$border-radius-inner = 0 0 3px 3px; //$border-radius = 3px; + +// Back to top +$b2t-bg-color = $body-bg-color diff --git a/source/css/_variables/Pisces.styl b/source/css/_variables/Pisces.styl index 3c2283dc17..7e56116bb8 100644 --- a/source/css/_variables/Pisces.styl +++ b/source/css/_variables/Pisces.styl @@ -5,7 +5,6 @@ // -------------------------------------------------- $body-bg-color = #f5f7f9 -$sidebar-offset = unit(hexo-config('sidebar.offset'), px) if hexo-config('sidebar.offset') is a 'unit' $sidebar-width = hexo-config('sidebar.width') is a 'unit' ? hexo-config('sidebar.width') : 240 $sidebar-desktop = unit($sidebar-width, 'px') $content-wrap = 'calc(100% - %s)' % unit($sidebar-width + $sidebar-offset, 'px') @@ -77,3 +76,4 @@ $btn-default-hover-bg = $black-deep $b2t-opacity = .6 $b2t-position-bottom = -100px $b2t-position-bottom-on = 30px +$b2t-bg-color = $body-bg-color diff --git a/source/css/_variables/base.styl b/source/css/_variables/base.styl index 039803d377..d2d54165f1 100644 --- a/source/css/_variables/base.styl +++ b/source/css/_variables/base.styl @@ -262,6 +262,7 @@ $posts-collapse-left-mobile = 5px // Sidebar // Variables for sidebar section elements. // -------------------------------------------------- +$sidebar-offset = unit(hexo-config('sidebar.offset'), px) if hexo-config('sidebar.offset') is a 'unit' $sidebar-nav-color = $black-light $sidebar-nav-hover-color = $whitesmoke $sidebar-highlight = $blue-bright