From 028fe602f0dd017bc44d9802ed88a0a9a2b6b3be Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Tue, 12 Sep 2017 18:04:27 +0300 Subject: [PATCH 01/55] MOD: move `getContentHeight` to variable. --- source/js/src/utils.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/source/js/src/utils.js b/source/js/src/utils.js index 8f2f89e40..ea054add1 100644 --- a/source/js/src/utils.js +++ b/source/js/src/utils.js @@ -102,10 +102,8 @@ NexT.utils = NexT.$u = { $top.toggleClass('back-to-top-on', window.pageYOffset > THRESHOLD); var scrollTop = $(window).scrollTop(); - var docHeight = $('#content').height(); - var winHeight = $(window).height(); - var contentMath = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight); - var scrollPercent = (scrollTop) / (contentMath); + var contentHeight = NexT.utils.getContentHeight(); + var scrollPercent = (scrollTop) / (contentHeight); var scrollPercentRounded = Math.round(scrollPercent*100); var scrollPercentMaxed = (scrollPercentRounded > 100) ? 100 : scrollPercentRounded; $('#scrollpercent>span').html(scrollPercentMaxed); @@ -265,6 +263,14 @@ NexT.utils = NexT.$u = { return scrollbarWidth; }, + getContentHeight: function () { + var docHeight = $('#content').height(), + winHeight = $(window).height(), + contentHeight = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight); + + return contentHeight; + }, + /** * Affix behaviour for Sidebar. * From 43dd4b4b809f0342fe199f1db780afde3e6f3e45 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Tue, 12 Sep 2017 19:33:13 +0300 Subject: [PATCH 02/55] FIX: jumping affix if sidebar taller then content. --- source/js/src/post-details.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/js/src/post-details.js b/source/js/src/post-details.js index 1197a574f..2311ee3ee 100644 --- a/source/js/src/post-details.js +++ b/source/js/src/post-details.js @@ -30,8 +30,10 @@ $(document).ready(function () { // Sidebar float function initAffix () { - var headerHeight = $('.header-inner').height(); - var footerOffset = parseInt($('.main').css('padding-bottom'), 10); + var headerHeight = $('.header-inner').height(), + sidebarHeight = $('.sidebar-inner').outerHeight(), + contentHeight = $('#content').height(), + footerOffset = $('.footer').height(); /*jshint camelcase: false */ var sidebarTop = (CONFIG.sidebar.offset_float === 0) ? @@ -39,12 +41,14 @@ $(document).ready(function () { headerHeight; /*jshint camelcase: true */ + if (sidebarTop + sidebarHeight < contentHeight) { $('.sidebar-inner').affix({ offset: { top: sidebarTop, bottom: footerOffset } }); + } $(document) .on('affixed.bs.affix', function () { From 61086aa23ed8fa2e94580421cbc696852978fc06 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Tue, 12 Sep 2017 19:43:44 +0300 Subject: [PATCH 03/55] MOD: rename `getContentHeight` function. --- source/js/src/utils.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/js/src/utils.js b/source/js/src/utils.js index ea054add1..6d23cecb1 100644 --- a/source/js/src/utils.js +++ b/source/js/src/utils.js @@ -102,8 +102,8 @@ NexT.utils = NexT.$u = { $top.toggleClass('back-to-top-on', window.pageYOffset > THRESHOLD); var scrollTop = $(window).scrollTop(); - var contentHeight = NexT.utils.getContentHeight(); - var scrollPercent = (scrollTop) / (contentHeight); + var contentVisibilityHeight = NexT.utils.getContentVisibilityHeight(); + var scrollPercent = (scrollTop) / (contentVisibilityHeight); var scrollPercentRounded = Math.round(scrollPercent*100); var scrollPercentMaxed = (scrollPercentRounded > 100) ? 100 : scrollPercentRounded; $('#scrollpercent>span').html(scrollPercentMaxed); @@ -263,12 +263,12 @@ NexT.utils = NexT.$u = { return scrollbarWidth; }, - getContentHeight: function () { + getContentVisibilityHeight: function () { var docHeight = $('#content').height(), winHeight = $(window).height(), - contentHeight = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight); + contentVisibilityHeight = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight); - return contentHeight; + return contentVisibilityHeight; }, /** From 619c49e7200b171772c12da3b554757fcb5e8b24 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 04:07:49 +0300 Subject: [PATCH 04/55] ADD: scrolling to active TOC if TOC > viewport. Scrolling to center active TOC element if TOC content is taller then viewport. --- source/js/src/post-details.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/js/src/post-details.js b/source/js/src/post-details.js index 2311ee3ee..ecf65a05b 100644 --- a/source/js/src/post-details.js +++ b/source/js/src/post-details.js @@ -17,6 +17,9 @@ $(document).ready(function () { removeCurrentActiveClass(); $currentActiveElement.addClass('active-current'); + + // Scrolling to center active TOC element if TOC content is taller then viewport. + $tocElement.scrollTop($currentActiveElement.offset().top - $tocElement.offset().top + $tocElement.scrollTop() - ($tocElement.height() / 2)); }) .on('clear.bs.scrollspy', removeCurrentActiveClass); From 9ce276ff1f61e32da0875e4478a69fd8ed3cfdd4 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 04:13:39 +0300 Subject: [PATCH 05/55] FIX: sidebar with `motion` on Mist & Muse schemes. --- source/js/src/post-details.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/js/src/post-details.js b/source/js/src/post-details.js index ecf65a05b..e5fc3feaa 100644 --- a/source/js/src/post-details.js +++ b/source/js/src/post-details.js @@ -147,7 +147,7 @@ $(document).ready(function () { CONFIG.sidebar.display === 'always'; var hasTOC = $tocContent.length > 0 && $tocContent.html().trim().length > 0; if (isSidebarCouldDisplay && hasTOC) { - CONFIG.motion ? + CONFIG.motion.enable ? (NexT.motion.middleWares.sidebar = function () { NexT.utils.displaySidebar(); }) : NexT.utils.displaySidebar(); From e75a2a1192dabf886b5108360ac247bb9de91b68 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 08:24:34 +0300 Subject: [PATCH 06/55] ADD: sidebar scrollable in all schemes [1]. --- source/js/src/utils.js | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/source/js/src/utils.js b/source/js/src/utils.js index 6d23cecb1..e8b80f840 100644 --- a/source/js/src/utils.js +++ b/source/js/src/utils.js @@ -267,16 +267,26 @@ NexT.utils = NexT.$u = { var docHeight = $('#content').height(), winHeight = $(window).height(), contentVisibilityHeight = (docHeight > winHeight) ? (docHeight - winHeight) : ($(document).height() - winHeight); - return contentVisibilityHeight; }, - + + getSidebarSchemePadding: function () { + var sidebarb2tHeight = ($('.back-to-top').css('display') == 'block') ? 0 : $('.back-to-top').height(), + sidebarNavHeight = ($('.sidebar-nav').css('display') == 'block') ? $('.sidebar-nav').outerHeight(true) : 0, + sidebarInner = $('.sidebar-inner'), + sidebarPadding = sidebarInner.innerWidth() - sidebarInner.width(), + sidebarSchemePadding = this.isPisces() || this.isGemini() ? + ((sidebarPadding * 2) + sidebarNavHeight + (CONFIG.sidebar.offset * 2) + sidebarb2tHeight) : + ((sidebarPadding * 2) + (sidebarNavHeight / 2)); + return sidebarSchemePadding; + }, + /** * Affix behaviour for Sidebar. * * @returns {Boolean} */ - needAffix: function () { - return this.isPisces() || this.isGemini(); - } +// needAffix: function () { +// return this.isPisces() || this.isGemini(); +// } }; From 334e50e992e48299fa64dfeb9b2c089e4815d4d8 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 08:30:56 +0300 Subject: [PATCH 07/55] ADD: sidebar scrollable in all schemes [2]. --- source/js/src/post-details.js | 39 +++++++---------------------------- 1 file changed, 7 insertions(+), 32 deletions(-) diff --git a/source/js/src/post-details.js b/source/js/src/post-details.js index e5fc3feaa..bdb359c8b 100644 --- a/source/js/src/post-details.js +++ b/source/js/src/post-details.js @@ -3,7 +3,7 @@ $(document).ready(function () { initScrollSpy(); - NexT.utils.needAffix() && initAffix(); +// NexT.utils.needAffix() && initAffix(); initTOCDimension(); function initScrollSpy () { @@ -31,58 +31,33 @@ $(document).ready(function () { } } - // Sidebar float - function initAffix () { - var headerHeight = $('.header-inner').height(), - sidebarHeight = $('.sidebar-inner').outerHeight(), - contentHeight = $('#content').height(), - footerOffset = $('.footer').height(); - - /*jshint camelcase: false */ - var sidebarTop = (CONFIG.sidebar.offset_float === 0) ? - headerHeight + CONFIG.sidebar.offset : - headerHeight; - /*jshint camelcase: true */ - - if (sidebarTop + sidebarHeight < contentHeight) { - $('.sidebar-inner').affix({ - offset: { - top: sidebarTop, - bottom: footerOffset - } - }); - } - - $(document) - .on('affixed.bs.affix', function () { - updateTOCHeight(document.body.clientHeight - 100); - }); - } - function initTOCDimension () { - var updateTOCHeightTimer; + var updateTOCHeightTimer, + sidebarSchemePadding = NexT.utils.getSidebarSchemePadding(); $(window).on('resize', function () { updateTOCHeightTimer && clearTimeout(updateTOCHeightTimer); updateTOCHeightTimer = setTimeout(function () { - var tocWrapperHeight = document.body.clientHeight - 100; + var tocWrapperHeight = document.body.clientHeight - sidebarSchemePadding; updateTOCHeight(tocWrapperHeight); }, 0); }); // Initialize TOC Height. - updateTOCHeight(document.body.clientHeight - 100); + updateTOCHeight(document.body.clientHeight - sidebarSchemePadding); // Initialize TOC Width. var scrollbarWidth = NexT.utils.getScrollbarWidth(); $('.post-toc').css('width', 'calc(100% + ' + scrollbarWidth + 'px)'); + $('.site-overview').css('width', 'calc(100% + ' + scrollbarWidth + 'px)'); } function updateTOCHeight (height) { height = height || 'auto'; $('.post-toc').css('max-height', height); + $('.site-overview').css('max-height', height); } }); From 59209cf56fcdd9f70cb9cb166fc02e16ef96e801 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 08:32:14 +0300 Subject: [PATCH 08/55] ADD: sidebar scrollable in all schemes [3]. --- source/js/src/schemes/pisces.js | 35 +++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/source/js/src/schemes/pisces.js b/source/js/src/schemes/pisces.js index d4125b6bd..d62d9a399 100644 --- a/source/js/src/schemes/pisces.js +++ b/source/js/src/schemes/pisces.js @@ -1,17 +1,22 @@ $(document).ready(function () { - var $headerInner = $('.header-inner'); - var $sidebar = $('#sidebar'); - var getSidebarTop = function(){ - return $headerInner.height() + CONFIG.sidebar.offset; - }; - var setSidebarMarginTop = function(sidebarTop){ - return $sidebar.css({ 'margin-top': sidebarTop }); - }; - var mql = window.matchMedia('(min-width: 991px)'); - setSidebarMarginTop(getSidebarTop()).show(); - mql.addListener(function(e){ - if(e.matches){ - setSidebarMarginTop(getSidebarTop()); - } - }); + + initAffix(); + + function initAffix () { + var headerHeight = $('.header-inner').height(), + headerOffset = (headerHeight + CONFIG.sidebar.offset) + + footerInner = $('.footer-inner'), + footerMargin = footerInner.outerHeight(true) - footerInner.outerHeight(), + footerOffset = footerInner.outerHeight(true) + footerMargin; + + $('.sidebar-inner').affix({ + offset: { + top: headerOffset - CONFIG.sidebar.offset, + bottom: footerOffset + } + }); + + $('#sidebar').css({ 'margin-top': headerOffset + 'px' }).show(); + } }); From a8344d824badc8dc4e2f4b5ac616d092f110b06a Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 08:45:22 +0300 Subject: [PATCH 09/55] FIX: sidebar scrollable in all schemes [4]. --- source/js/src/schemes/pisces.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/js/src/schemes/pisces.js b/source/js/src/schemes/pisces.js index d62d9a399..ca05b7fdc 100644 --- a/source/js/src/schemes/pisces.js +++ b/source/js/src/schemes/pisces.js @@ -3,9 +3,7 @@ $(document).ready(function () { initAffix(); function initAffix () { - var headerHeight = $('.header-inner').height(), - headerOffset = (headerHeight + CONFIG.sidebar.offset) - + var headerOffset = $('.header-inner').height() + CONFIG.sidebar.offset, footerInner = $('.footer-inner'), footerMargin = footerInner.outerHeight(true) - footerInner.outerHeight(), footerOffset = footerInner.outerHeight(true) + footerMargin; From af067cdff92b270b96134934c661934a09a25a1c Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 09:06:44 +0300 Subject: [PATCH 10/55] ADD: sidebar scrollable in all schemes [5]. --- source/css/_schemes/Pisces/_sidebar.styl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl index 0892744ea..3d4f93b15 100644 --- a/source/css/_schemes/Pisces/_sidebar.styl +++ b/source/css/_schemes/Pisces/_sidebar.styl @@ -12,6 +12,7 @@ .sidebar-inner { +//padding: 20px 10px 0; box-sizing: border-box; width: 240px; color: $text-color; @@ -21,8 +22,13 @@ &.affix { position: fixed; - top: $sidebar-offset-float; + top: $sidebar-offset; } + + &.affix-bottom { + position: absolute; + } + } .site-overview { From 65cb1622326471b660a769cca21a951ab804496d Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 09:09:02 +0300 Subject: [PATCH 11/55] ADD: sidebar scrollable in all schemes [6]. --- source/css/_common/components/back-to-top-sidebar.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/css/_common/components/back-to-top-sidebar.styl b/source/css/_common/components/back-to-top-sidebar.styl index ab797f3e7..d23d35d57 100644 --- a/source/css/_common/components/back-to-top-sidebar.styl +++ b/source/css/_common/components/back-to-top-sidebar.styl @@ -1,6 +1,6 @@ .back-to-top { display: none; - margin: 15px -10px -20px; + margin: 20px -10px -20px; background: $body-bg-color; font-size: $b2t-font-size; opacity: $b2t-opacity; From d23c0e076e871799010a24d67be10e95da1c624d Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 09:10:44 +0300 Subject: [PATCH 12/55] ADD: sidebar scrollable in all schemes [7]. --- source/css/_common/components/sidebar/sidebar.styl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/css/_common/components/sidebar/sidebar.styl b/source/css/_common/components/sidebar/sidebar.styl index 39b11fdbf..635cc94fd 100644 --- a/source/css/_common/components/sidebar/sidebar.styl +++ b/source/css/_common/components/sidebar/sidebar.styl @@ -32,6 +32,15 @@ text-align: center; } +.site-overview-wrap { + overflow: hidden; +} + +.site-overview { + overflow-y: auto; + overflow-x: hidden; +} + @import "sidebar-toggle"; @import "sidebar-author"; @import "site-state"; From 0f27b0c300bae1e7344c92ecaeb569b8c953d693 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 09:20:16 +0300 Subject: [PATCH 13/55] ADD: sidebar scrollable in all schemes [8]. --- layout/_macro/sidebar.swig | 197 +++++++++++++++++++------------------ 1 file changed, 99 insertions(+), 98 deletions(-) diff --git a/layout/_macro/sidebar.swig b/layout/_macro/sidebar.swig index 5392bbaaa..6b755da11 100644 --- a/layout/_macro/sidebar.swig +++ b/layout/_macro/sidebar.swig @@ -17,125 +17,126 @@ {% if display_toc and toc(page.content).length > 1 %}
    -
  • +
  • {{ __('sidebar.toc') }}
    • -
  • +
  • {{ __('sidebar.overview') }}
{% endif %} -
- +
+
+ - - - {% if theme.rss %} -
- - - RSS - -
- {% endif %} - -
- {% if theme.social %} - {% for name, link in theme.social %} - - - {% if theme.social_icons.enable %} - {# - #}{% endif %}{# - #}{% if not theme.social_icons.icons_only %}{# - #}{{ name }}{# - #}{% endif %}{# - #} - - {% endfor %} - {% endif %} + {% include '../_custom/sidebar.swig' %}
- - {% set cc = {'by': 1, 'by-nc': 1, 'by-nc-nd': 1, 'by-nc-sa': 1, 'by-nd': 1, 'by-sa': 1, 'zero': 1} %} - {% if theme.creative_commons in cc %} -
- - Creative Commons - -
- {% endif %} - - {# Blogroll #} - {% if theme.links %} -
-
- - {{ theme.links_title }} -
-
    - {% for name, link in theme.links %} -
  • - {{ name }} -
    • - {% endfor %} -
-
- {% endif %} - - {% include '../_custom/sidebar.swig' %} -
{% if display_toc and toc(page.content).length > 1 %} From fd91285f502afb769e2ee9a7f9f17aa0fac2ea65 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 09:23:54 +0300 Subject: [PATCH 14/55] ADD: sidebar scrollable in all schemes [9]. --- source/js/src/motion.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source/js/src/motion.js b/source/js/src/motion.js index 4ba569648..288300300 100644 --- a/source/js/src/motion.js +++ b/source/js/src/motion.js @@ -173,11 +173,12 @@ $(document).ready(function () { this.sidebarEl.removeClass('sidebar-active'); this.sidebarEl.trigger('sidebar.isHiding'); - //在 post 页面下按下隐藏 sidebar 时如果当前选中的是“站点概览”，将 toc 去除 motion 效果 - //防止再次打开时会出现在“站点概览”下的 bug + // Prevent adding TOC to Overview if Overview was selected when close & open sidebar. if (!!$('.post-toc-wrap')) { - if ($('.site-overview').css('display') === 'block') { + if ($('.site-overview-wrap').css('display') === 'block') { $('.post-toc-wrap').removeClass('motion-element'); + } else { + $('.post-toc-wrap').addClass('motion-element'); } } } From e3d06b23eaa186063f429475c526c52d2369a889 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 09:32:28 +0300 Subject: [PATCH 15/55] ADD: sidebar scrollable in all schemes [10]. --- _config.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/_config.yml b/_config.yml index a8a361372..f790dfec5 100755 --- a/_config.yml +++ b/_config.yml @@ -138,11 +138,11 @@ toc: #creative_commons: sidebar: - # Sidebar Position, available value: left | right + # Sidebar Position, available value: left | right (only for Pisces | Gemini). position: left #position: right - # Sidebar Display, available value: + # Sidebar Display, available value (only for Muse | Mist): # - post expand on posts automatically. Default. # - always expand for all pages automatically # - hide expand only when click on the sidebar toggle icon. @@ -152,17 +152,16 @@ sidebar: #display: hide #display: remove - # Sidebar offset from top menubar in pixels. + # Sidebar offset from top menubar in pixels (only for Pisces | Gemini). offset: 12 - offset_float: 12 - # Back to top in sidebar + # Back to top in sidebar (only for Pisces | Gemini). b2t: false - # Scroll percent label in b2t button + # Scroll percent label in b2t button. scrollpercent: false - - # Enable sidebar on narrow view + + # Enable sidebar on narrow view (only for Muse | Mist). onmobile: false From cd927963c9637eeb6c6121a7f320862466e6efbd Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 10:17:27 +0300 Subject: [PATCH 16/55] MOD: sidebar scrollable in all schemes [11]. --- source/css/_variables/Pisces.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/css/_variables/Pisces.styl b/source/css/_variables/Pisces.styl index f5db756c5..56a918987 100644 --- a/source/css/_variables/Pisces.styl +++ b/source/css/_variables/Pisces.styl @@ -21,7 +21,7 @@ $subtitle-color = $gray-lighter // Sidebar // -------------------------------------------------- -$sidebar-offset-float = unit(hexo-config('sidebar.offset_float'), px) if hexo-config('sidebar.offset_float') is a 'unit' +$sidebar-offset = unit(hexo-config('sidebar.offset'), px) if hexo-config('sidebar.offset') is a 'unit' $sidebar-nav-hover-color = $orange $sidebar-highlight = $orange From 77b5a3092f71a286f31ef528197fec245b6e1f7e Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 15:08:31 +0300 Subject: [PATCH 17/55] FIX: sidebar scrollable in all schemes [12]. --- source/js/src/utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/js/src/utils.js b/source/js/src/utils.js index e8b80f840..eaba108e9 100644 --- a/source/js/src/utils.js +++ b/source/js/src/utils.js @@ -271,7 +271,7 @@ NexT.utils = NexT.$u = { }, getSidebarSchemePadding: function () { - var sidebarb2tHeight = ($('.back-to-top').css('display') == 'block') ? 0 : $('.back-to-top').height(), + var sidebarb2tHeight = (CONFIG.sidebar.b2t) ? $('.back-to-top').height() : 0, sidebarNavHeight = ($('.sidebar-nav').css('display') == 'block') ? $('.sidebar-nav').outerHeight(true) : 0, sidebarInner = $('.sidebar-inner'), sidebarPadding = sidebarInner.innerWidth() - sidebarInner.width(), @@ -279,7 +279,7 @@ NexT.utils = NexT.$u = { ((sidebarPadding * 2) + sidebarNavHeight + (CONFIG.sidebar.offset * 2) + sidebarb2tHeight) : ((sidebarPadding * 2) + (sidebarNavHeight / 2)); return sidebarSchemePadding; - }, + } /** * Affix behaviour for Sidebar. From dca0ff4abd005627fa84bf0836b79bfde689a0f2 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 15:12:32 +0300 Subject: [PATCH 18/55] FIX: sidebar scrollable in all schemes [13]. Fix for changing TOC dimensions at window resize. --- source/js/src/post-details.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/js/src/post-details.js b/source/js/src/post-details.js index bdb359c8b..4902e92b0 100644 --- a/source/js/src/post-details.js +++ b/source/js/src/post-details.js @@ -32,21 +32,20 @@ $(document).ready(function () { } function initTOCDimension () { - var updateTOCHeightTimer, - sidebarSchemePadding = NexT.utils.getSidebarSchemePadding(); + var updateTOCHeightTimer; $(window).on('resize', function () { updateTOCHeightTimer && clearTimeout(updateTOCHeightTimer); updateTOCHeightTimer = setTimeout(function () { - var tocWrapperHeight = document.body.clientHeight - sidebarSchemePadding; + var tocWrapperHeight = document.body.clientHeight - NexT.utils.getSidebarSchemePadding(); updateTOCHeight(tocWrapperHeight); }, 0); }); // Initialize TOC Height. - updateTOCHeight(document.body.clientHeight - sidebarSchemePadding); + updateTOCHeight(document.body.clientHeight - NexT.utils.getSidebarSchemePadding()); // Initialize TOC Width. var scrollbarWidth = NexT.utils.getScrollbarWidth(); From 920bd39f3e3b2439e514c6cef93ea83a43433a06 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 15:30:57 +0300 Subject: [PATCH 19/55] ADD: sidebar scrollable in all schemes [14]. Add `resizeListener()` to sidebar. --- source/js/src/schemes/pisces.js | 44 ++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/source/js/src/schemes/pisces.js b/source/js/src/schemes/pisces.js index ca05b7fdc..6f4cee2c8 100644 --- a/source/js/src/schemes/pisces.js +++ b/source/js/src/schemes/pisces.js @@ -1,20 +1,52 @@ $(document).ready(function () { + var sidebarInner = $('.sidebar-inner'); + initAffix(); + resizeListener(); function initAffix () { - var headerOffset = $('.header-inner').height() + CONFIG.sidebar.offset, - footerInner = $('.footer-inner'), - footerMargin = footerInner.outerHeight(true) - footerInner.outerHeight(), - footerOffset = footerInner.outerHeight(true) + footerMargin; + var headerOffset = getHeaderOffset(), + footerOffset = getFooterOffset(); - $('.sidebar-inner').affix({ + sidebarInner.affix({ offset: { top: headerOffset - CONFIG.sidebar.offset, bottom: footerOffset } }); - $('#sidebar').css({ 'margin-top': headerOffset + 'px' }).show(); + setSidebarMarginTop(headerOffset).show(); + } + + function resizeListener () { + var mql = window.matchMedia('(min-width: 991px)') + mql.addListener(function(e){ + if(e.matches){ + recalculateAffixPosition(); + } + }); + } + + function getHeaderOffset () { + return $('.header-inner').height() + CONFIG.sidebar.offset; } + + function getFooterOffset () { + var footerInner = $('.footer-inner'), + footerMargin = footerInner.outerHeight(true) - footerInner.outerHeight(), + footerOffset = footerInner.outerHeight(true) + footerMargin; + return footerOffset; + } + + function setSidebarMarginTop (headerOffset) { + return $('#sidebar').css({ 'margin-top': headerOffset }); + } + + function recalculateAffixPosition () { + $(window).off('.affix') + sidebarInner.removeData('bs.affix').removeClass('affix affix-top affix-bottom') + initAffix(); + } + }); From a0914e8f8b7788198da9cc88e3865391cfd919be Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 15:32:55 +0300 Subject: [PATCH 20/55] FIX: sidebar scrollable in all schemes [15]. --- source/js/src/schemes/pisces.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/js/src/schemes/pisces.js b/source/js/src/schemes/pisces.js index 6f4cee2c8..a08cf1994 100644 --- a/source/js/src/schemes/pisces.js +++ b/source/js/src/schemes/pisces.js @@ -20,7 +20,7 @@ $(document).ready(function () { } function resizeListener () { - var mql = window.matchMedia('(min-width: 991px)') + var mql = window.matchMedia('(min-width: 991px)'); mql.addListener(function(e){ if(e.matches){ recalculateAffixPosition(); From 267109ca2a8371699ce23a7d8d412193509c7c64 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 23 Sep 2017 15:36:20 +0300 Subject: [PATCH 21/55] FIX: sidebar scrollable in all schemes [16]. --- source/js/src/schemes/pisces.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/js/src/schemes/pisces.js b/source/js/src/schemes/pisces.js index a08cf1994..426de30f7 100644 --- a/source/js/src/schemes/pisces.js +++ b/source/js/src/schemes/pisces.js @@ -44,8 +44,8 @@ $(document).ready(function () { } function recalculateAffixPosition () { - $(window).off('.affix') - sidebarInner.removeData('bs.affix').removeClass('affix affix-top affix-bottom') + $(window).off('.affix'); + sidebarInner.removeData('bs.affix').removeClass('affix affix-top affix-bottom'); initAffix(); } From 2f2e81673718fe17517693adc571b2422be27565 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 14:14:02 +0300 Subject: [PATCH 22/55] MOD: Enhancements to Gemini scheme [1]. --- source/css/_variables/Gemini.styl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/source/css/_variables/Gemini.styl b/source/css/_variables/Gemini.styl index 919450b7a..e4c39a4a1 100644 --- a/source/css/_variables/Gemini.styl +++ b/source/css/_variables/Gemini.styl @@ -6,14 +6,14 @@ // Settings for some of the most global styles. // -------------------------------------------------- $body-bg-color = #eee -$main-desktop = 75%; -$sidebar-desktop = 240px; -$content-desktop = calc(100% - 252px); +$main-desktop = 75% +$sidebar-desktop = 240px +$content-desktop = calc(100% - 252px) // Borders. // -------------------------------------------------- -$box-shadow-inner = 0 2px 2px 0 rgba(0,0,0,.12), 0 3px 1px -2px rgba(0,0,0,.06), 0 1px 5px 0 rgba(0,0,0,.12); -$box-shadow = 0 2px 2px 0 rgba(0,0,0,.12), 0 3px 1px -2px rgba(0,0,0,.06), 0 1px 5px 0 rgba(0,0,0,.12), 0 -1px .5px 0 rgba(0,0,0,.09); +$box-shadow-inner = 0 2px 2px 0 rgba(0,0,0,.12), 0 3px 1px -2px rgba(0,0,0,.06), 0 1px 5px 0 rgba(0,0,0,.12) +$box-shadow = 0 2px 2px 0 rgba(0,0,0,.12), 0 3px 1px -2px rgba(0,0,0,.06), 0 1px 5px 0 rgba(0,0,0,.12), 0 -1px .5px 0 rgba(0,0,0,.09) -$border-radius-inner = initial; -$border-radius = initial; +$border-radius-inner = initial +$border-radius = initial From 3a1b4c0ea50c30243108df1a91c25932d200912b Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 14:16:38 +0300 Subject: [PATCH 23/55] ADD: Enhancements to Gemini scheme [2]. Add variables to all schemes for tablet & mobile padding. --- source/css/_variables/base.styl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/css/_variables/base.styl b/source/css/_variables/base.styl index 004a86c5d..c9babf619 100644 --- a/source/css/_variables/base.styl +++ b/source/css/_variables/base.styl @@ -196,7 +196,10 @@ $main-desktop-large = 1200px $content-desktop = 700px $content-desktop-large = 900px + $content-desktop-padding = 40px +$content-tablet-padding = 10px +$content-mobile-padding = 8px $sidebar-desktop = 240px From beb52f81684d8575575691701d23da15ffce3af6 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 17:16:04 +0300 Subject: [PATCH 24/55] FIX: tabbed code block padding style [1]. --- source/css/_common/components/highlight/highlight.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/source/css/_common/components/highlight/highlight.styl b/source/css/_common/components/highlight/highlight.styl index 2cb961dd8..6b540fdc3 100644 --- a/source/css/_common/components/highlight/highlight.styl +++ b/source/css/_common/components/highlight/highlight.styl @@ -27,6 +27,7 @@ code { pre { @extend $code-block; + padding: 10px; code { padding: 0; From d433afdb6c6a01719b6c1e041b49dfed544ee3de Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 17:17:31 +0300 Subject: [PATCH 25/55] FIX: tabbed code block padding style [2]. --- source/css/_common/components/post/post-expand.styl | 1 - 1 file changed, 1 deletion(-) diff --git a/source/css/_common/components/post/post-expand.styl b/source/css/_common/components/post/post-expand.styl index cac047e3a..8c6d8a5b9 100644 --- a/source/css/_common/components/post/post-expand.styl +++ b/source/css/_common/components/post/post-expand.styl @@ -11,7 +11,6 @@ .post-body { pre { - padding: 10px; .gutter pre { padding-right: 10px; } From 41ff45282259de4fe8af31ae9098ec4c1425472e Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 17:27:59 +0300 Subject: [PATCH 26/55] MOD: post more link margin-top refactor. --- source/css/_common/components/post/post-button.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/css/_common/components/post/post-button.styl b/source/css/_common/components/post/post-button.styl index a0246d742..674089c91 100644 --- a/source/css/_common/components/post/post-button.styl +++ b/source/css/_common/components/post/post-button.styl @@ -1,5 +1,5 @@ .post-button { - margin-top: 50px; + margin-top: 40px; .btn { color: $read-more-color; From b9243d98173b5290e40be1b694e745135f6d29f4 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 17:56:56 +0300 Subject: [PATCH 27/55] FIX: site state items padding for Pisces & Gemini. --- source/css/_schemes/Pisces/_sidebar.styl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl index 3d4f93b15..5fd04c9fb 100644 --- a/source/css/_schemes/Pisces/_sidebar.styl +++ b/source/css/_schemes/Pisces/_sidebar.styl @@ -46,6 +46,10 @@ &:hover { color: $black-deep; } } +.site-state-item { + padding: 0 10px; +} + .links-of-author-item { a:before { display: none; } a { From 7226ad408c7e709f87f98d06900f226a648b7270 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 20:02:38 +0300 Subject: [PATCH 28/55] MOD: Enhancements to Gemini scheme [3]. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Add 3 variables for better layout adaptation: * `sboffset` = 12px; * `$content-tablet-paddin` = 10px; * `$content-mobile-padding` = 8px; 2. Add block style to comments. 3. Add navigation items styles. 4. Hide all possible delimiters. 5. Add pagination styles. 6. Add headers styles: * Inherit `line-height` for syncronize post titles in homepage and posts. * Add `border-bottom` on H2-H3 / H3-H4 (if seo) headers like on Github. * Font sizes in `em` values » autoadaptive for all resolutions. 7. Add tablet & mobile basic styles. If need wider width may use `mobile_style_economy` option (may be used in schemes). And all of it still beta. :( --- source/css/_schemes/Gemini/index.styl | 188 +++++++++++++++++++++++++- 1 file changed, 181 insertions(+), 7 deletions(-) diff --git a/source/css/_schemes/Gemini/index.styl b/source/css/_schemes/Gemini/index.styl index e6e217eb6..f07401a19 100644 --- a/source/css/_schemes/Gemini/index.styl +++ b/source/css/_schemes/Gemini/index.styl @@ -2,11 +2,30 @@ @import "../Pisces/_brand"; @import "../Pisces/_menu"; @import "../Pisces/_sidebar"; -@import "../Pisces/_posts"; +// Import _posts if want to justify text-align on mobile. +//@import "../Pisces/_posts"; +// ================================================= // Rewrite _layout.styl // ================================================= -// For post blocks. +// Sidebar padding used as main desktop content padding for sidebar padding and post blocks padding too. + +// In main NexT config set `sidebar: offset: 12` option as main padding. +// In `source/css/_variables/Gemini.styl` there are variables for other resolutions: +// $content-tablet-paddin = 10px; +// $content-mobile-padding = 8px; +// P.S. If u want to change this paddings u may set this variables into `source/css/_variables/custom.styl`. + +// So, it will 12px in Desktop, 10px in Tablets and 8px in Mobiles for all possible paddings. +// ================================================= +// Read values from NexT config and set they as local variables to use as string variables (in any CSS section). +hexo-config('sidebar.offset') is a 'unit' ? (sboffset = unit(hexo-config('sidebar.offset'), px)) : (sboffset = 0) +use_seo = hexo-config('seo'); + +// ================================================= +// Desktop layout styles. +// ================================================= +// Post blocks. .content-wrap { padding: initial; background: initial; @@ -14,27 +33,182 @@ border-radius: initial; } -.post-block { - margin-bottom: 12px; - +// Post & comments blocks. +.post-block, +.comments { + margin-bottom: sboffset; background: white; padding: $content-desktop-padding; box-shadow: $box-shadow-inner; border-radius: $border-radius-inner; } +// Last post block in homepage (need to remove bottom margin to save style). +#posts > :last-child { + .post-block { + margin-bottom: initial; + } +} + +// Comments blocks. +.comments { + margin: initial; +} + +// Top main padding from header to posts (default 40px). .posts-expand { padding-top: initial; } -.post-eof { +// Post navigation items. +.post-nav-divider { + width: 4%; +} +.post-nav-item { + width: 48%; +} + +// Post delimiters. +.post-eof, +.post-spread { hide(); } -// For footer top alignment. +// Pagination. +.pagination { + .prev, .next, .page-number { + margin-bottom: initial; + top: initial; + } + margin: sboffset 0 0; + border-top: initial; + background: white; + box-shadow: $box-shadow; + padding: 10px 0 10px; +} + +// Footer alignment. .main { padding-bottom: initial; } .footer { bottom: auto; } + +// ================================================= +// Headers. +// ================================================= +.post-header { + h2 { + margin: initial; + } +} +.posts-expand .post-title-link { + line-height: inherit; +} +.posts-expand .post-title { + font-size: 1.7em; +} +h2 { + font-size: 1.5em; + if not use_seo { + border-bottom: 1px solid $body-bg-color; + } +} +h3 { + font-size: 1.3em; + if use_seo { + border-bottom: 1px solid $body-bg-color; + } else { + border-bottom: 1px dotted $body-bg-color; + } +} +h4 { + font-size: 1.2em; + if use_seo { + border-bottom: 1px dotted $body-bg-color; + } +} +h5 { + font-size: 1.07em; +} +h6 { + font-size: 1.03em; +} + +// ================================================= +// > 768px & < 991px +// ================================================= ++tablet() { + + // Posts in blocks. + .content-wrap { + padding: $content-tablet-padding; + } + .posts-expand { + margin: initial; + + // Components inside Posts. + .post-button { + margin-top: ($content-tablet-padding * 2); + } + } + + .post-block { + margin-bottom: $content-tablet-padding; + // Inside posts blocks content padding (default 40px). + //padding: 20px; + padding: ($content-tablet-padding * 2); + } + + .comments { + padding: $content-tablet-padding ($content-tablet-padding * 2); + //padding: initial; + //padding-top: $content-tablet-padding; + } + + .pagination { + margin: $content-tablet-padding 0 0; + } + +} +// ================================================= +// < 767px +// ================================================= ++mobile() { + + // Posts in blocks. + .content-wrap { + padding: $content-mobile-padding; + } + .posts-expand { + margin: initial; + + // Components inside Posts. + .post-button { + margin-top: sboffset; + //padding-bottom : 15px; + } + img { + padding: initial !important; + } + } + + .post-block { + margin-bottom: $content-mobile-padding; + //width: 100%; + // Inside posts blocks content padding (default 40px). + //padding: $content-mobile-padding 0px; + padding: sboffset; + min-height: auto; + } + + .comments { + padding: 0 sboffset; + } + + .pagination { + margin: $content-mobile-padding 0 0; + } + +} From 87fa64e887227c41ac143fd9303f689e41919971 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sun, 24 Sep 2017 20:13:24 +0300 Subject: [PATCH 29/55] MOD: Enhancements to Gemini scheme [4]. 1. Move main wider width styles from `+mobile()` section to Gemini `index.styl`. 2. Add `.post-block` with main margins & paddings. 3. Add `.post-nav` (wich actually need to remake into flex style). 4. Refactor some comments. --- source/css/_common/scaffolding/mobile.styl | 36 ++++++++++++---------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/source/css/_common/scaffolding/mobile.styl b/source/css/_common/scaffolding/mobile.styl index ba0d21134..d1213b2ea 100644 --- a/source/css/_common/scaffolding/mobile.styl +++ b/source/css/_common/scaffolding/mobile.styl @@ -13,27 +13,18 @@ +tablet() { } -*/ + // < 767px +mobile() { - // For Pisces scheme only wider width. - .content-wrap { - padding: 15px !important; - } - - .posts-expand { - padding-top: 20px !important; - margin: initial !important; - } - } +*/ // < 567px +mobile-small() { - // For Muse & Mist schemes only. + // For Muse & Mist schemes only vertical economy. .header-inner { margin-bottom: initial !important; } @@ -41,14 +32,15 @@ margin-top: initial !important; } - // For Pisces scheme only wider width. + // For Pisces & Gemini schemes only wider width (remove main blocks in Gemini). .content-wrap { padding: initial !important; } // For all schemes wider width. .posts-expand { - padding-top: 10px !important; + padding-top: $content-mobile-padding !important; + // For Muse & Mist & Pisces schemes only wider width. margin: initial !important; .post-header { @@ -61,9 +53,14 @@ } - .post-body { + .post-block { + margin-bottom: $content-mobile-padding; + // Inside posts blocks content padding (default 40px). + padding: $content-mobile-padding 0 !important; + } - // For post blocks wider width. + .post-body { + // For headers narrow width. h2, h3, h4, h5, h6 { margin: 10px 18px 8px; } @@ -74,10 +71,12 @@ } } + // For paragraphs narrow width. p { margin: 0 0 10px 0; padding: 0 18px; } + // Rewrite paddings & margins inside tags. .note > p, .tabs .tab-content .tab-pane > p { padding: 0 5px; @@ -105,7 +104,12 @@ .tabs .tab-content .tab-pane { padding: 10px 10px 0 10px !important; } + } + // Need to refactor into flex. + .post-nav { + padding-bottom: 2px; + //padding: 2px 8px; } } From cc2deca5e00da8ffbd4bbcf5b0568098171f26ca Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Mon, 25 Sep 2017 14:32:13 +0300 Subject: [PATCH 30/55] Update readme. [skip ci] ADD: more NexT live demo examples . FIX: non-working links in forks. --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b1786ed4e..941b5d892 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from * Pisces scheme: [Vi](http://notes.iissnan.com) | [Acris](https://blog.mrx.one) | [Rainy](https://rainylog.com) * Gemini scheme: [Ivan.Nginx](https://almostover.ru) | [Alynx](http://sh.alynx.xyz) | [Raincal](https://raincal.top) +More NexT examples [here](https://github.com/iissnan/hexo-theme-next/issues/119). + ## Installation **1.** Change dir to **hexo root** directory. There must be `node_modules`, `source`, `themes` and other directories: @@ -29,7 +31,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from **2.** Get theme from GitHub. There are several variants to do it: -### Download [latest release version](../../releases/latest). +### Download [latest release version](https://github.com/iissnan/hexo-theme-next/releases/latest). At most cases **stable**. Recommended for most users. [![curl-tar-wget-image]][curl-tar-wget-url] @@ -39,8 +41,8 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from $ curl -s https://api.github.com/repos/iissnan/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 ``` -### Download [tagged release version](../../releases). - You must define version. Replace `v5.1.2` with any version from [tags list](../../tags). +### Download [tagged release version](https://github.com/iissnan/hexo-theme-next/releases). + You must define version. Replace `v5.1.2` with any version from [tags list](https://github.com/iissnan/hexo-theme-next/tags). [![curl-tar-image]][curl-tar-url] @@ -55,7 +57,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from $ git clone --branch v5.1.2 https://github.com/iissnan/hexo-theme-next themes/next ``` -### Download [latest master branch](../../archive/master.zip). +### Download [latest master branch](https://github.com/iissnan/hexo-theme-next/archive/master.zip). May be **unstable**, but includes latest features. Recommended for developers. [![curl-tar-image]][curl-tar-url] @@ -85,7 +87,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from v5.1.2 ``` - For example, you want to switch on `v5.1.0` [tagged release version](../../tags). Input the following command: + For example, you want to switch on `v5.1.0` [tagged release version](https://github.com/iissnan/hexo-theme-next/tags). Input the following command: ```sh $ git checkout tags/v5.1.0 @@ -94,7 +96,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from HEAD now on 1f72f68... CSS: Remove global list-style setting of ul ``` - And if you want to switch back on [master branch](../../commits/master), input this command: + And if you want to switch back on [master branch](https://github.com/iissnan/hexo-theme-next/commits/master), input this command: ```sh $ git checkout master @@ -105,7 +107,7 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from theme: next ### Bugs -For those who also encounter **Error: Cannot find module 'hexo-util'** [issue](../../issues/1490), please check your NPM version. +For those who also encounter **Error: Cannot find module 'hexo-util'** [issue](https://github.com/iissnan/hexo-theme-next/issues/1490), please check your NPM version. - `> 3`: Still not work. Please remove `node_modules` directory and reinstall using `npm install`. - `< 3`: Please add `hexo-util` explicitly via `npm install --save-dev hexo-util` to you site package deps. From 45d62540ed9855c27dc483adb60ea0d0ed089cef Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Mon, 25 Sep 2017 14:56:08 +0300 Subject: [PATCH 31/55] Update readme [2]. [skip ci] FIX: non-working badget links in forks. --- README.md | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 941b5d892..492cf67e8 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ NexT is a high quality elegant [Hexo](http://hexo.io) theme. It is crafted from scratch, with love. [![gitter-image]][gitter-url] -[![mnt-image]](../../commits/master) +[![mnt-image]][commits-url] [![travis-image]][travis-url] -[![rel-image]](../../releases) +[![rel-image]][releases-url] [![hexo-image]][hexo-url] [![lic-image]](LICENSE) @@ -31,7 +31,7 @@ More NexT examples [here](https://github.com/iissnan/hexo-theme-next/issues/119) **2.** Get theme from GitHub. There are several variants to do it: -### Download [latest release version](https://github.com/iissnan/hexo-theme-next/releases/latest). +### Download [latest release version][releases-latest-url]. At most cases **stable**. Recommended for most users. [![curl-tar-wget-image]][curl-tar-wget-url] @@ -41,8 +41,8 @@ More NexT examples [here](https://github.com/iissnan/hexo-theme-next/issues/119) $ curl -s https://api.github.com/repos/iissnan/hexo-theme-next/releases/latest | grep tarball_url | cut -d '"' -f 4 | wget -i - -O- | tar -zx -C themes/next --strip-components=1 ``` -### Download [tagged release version](https://github.com/iissnan/hexo-theme-next/releases). - You must define version. Replace `v5.1.2` with any version from [tags list](https://github.com/iissnan/hexo-theme-next/tags). +### Download [tagged release version][releases-url]. + You must define version. Replace `v5.1.2` with any version from [tags list][tags-url]. [![curl-tar-image]][curl-tar-url] @@ -57,7 +57,7 @@ More NexT examples [here](https://github.com/iissnan/hexo-theme-next/issues/119) $ git clone --branch v5.1.2 https://github.com/iissnan/hexo-theme-next themes/next ``` -### Download [latest master branch](https://github.com/iissnan/hexo-theme-next/archive/master.zip). +### Download [latest master branch][download-latest-url]. May be **unstable**, but includes latest features. Recommended for developers. [![curl-tar-image]][curl-tar-url] @@ -87,7 +87,7 @@ More NexT examples [here](https://github.com/iissnan/hexo-theme-next/issues/119) v5.1.2 ``` - For example, you want to switch on `v5.1.0` [tagged release version](https://github.com/iissnan/hexo-theme-next/tags). Input the following command: + For example, you want to switch on `v5.1.0` [tagged release version][tags-url]. Input the following command: ```sh $ git checkout tags/v5.1.0 @@ -96,7 +96,7 @@ More NexT examples [here](https://github.com/iissnan/hexo-theme-next/issues/119) HEAD now on 1f72f68... CSS: Remove global list-style setting of ul ``` - And if you want to switch back on [master branch](https://github.com/iissnan/hexo-theme-next/commits/master), input this command: + And if you want to switch back on [master branch][commits-url], input this command: ```sh $ git checkout master @@ -335,5 +335,11 @@ Contribution is welcome, feel free to open an issue and fork. Waiting for your p [curl-tar-image]: https://img.shields.io/badge/install%20with%20-curl%20%7C%20tar-blue.svg [curl-tar-wget-image]: https://img.shields.io/badge/install%20with%20-curl%20%7C%20tar%20%7C%20wget-blue.svg [git-url]: http://lmgtfy.com/?q=linux+git+install -[curl-tar-url]: http://lmgtfy.com/?q=linux+curl+tar+install +[curl-tar-url]: http://lmgtfy.com/?q=linux+curl+tar+install [curl-tar-wget-url]: http://lmgtfy.com/?q=linux+curl+tar+wget+install + +[download-latest-url]: https://github.com/iissnan/hexo-theme-next/archive/master.zip +[releases-latest-url]: https://github.com/iissnan/hexo-theme-next/releases/latest +[releases-url]: https://github.com/iissnan/hexo-theme-next/releases +[tags-url]: https://github.com/iissnan/hexo-theme-next/tags +[commits-url]: https://github.com/iissnan/hexo-theme-next/commits/master From 74c34c968a8cc6720e2c45d88460316cddd4c18b Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 20:01:59 +0300 Subject: [PATCH 32/55] FIX: sidebar scrollable in all schemes [17]. --- layout/_layout.swig | 2 -- 1 file changed, 2 deletions(-) diff --git a/layout/_layout.swig b/layout/_layout.swig index fb3c6f8cf..231638745 100644 --- a/layout/_layout.swig +++ b/layout/_layout.swig @@ -66,8 +66,6 @@ {% set scheme_script = '_scripts/schemes/' + theme.scheme | lower + '.swig' %} {% include scheme_script %} - {% include '_scripts/pages/post-details.swig' %} - {% block script_extra %}{% endblock %} {% include '_scripts/boostrap.swig' %} From 42777af608b1d7507f8e29e03c270e5173e05e81 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 20:03:04 +0300 Subject: [PATCH 33/55] FIX: sidebar scrollable in all schemes [18]. --- layout/page.swig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/layout/page.swig b/layout/page.swig index f2085a849..591b5e27f 100644 --- a/layout/page.swig +++ b/layout/page.swig @@ -64,3 +64,7 @@ {% block sidebar %} {{ sidebar_template.render(false) }} {% endblock %} + +{% block script_extra %} + {% include '_scripts/pages/post-details.swig' %} +{% endblock %} From 7083a9da5e75c371793afd651fc47c9a09e9cf04 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 20:04:31 +0300 Subject: [PATCH 34/55] FIX: sidebar scrollable in all schemes [19]. --- layout/post.swig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layout/post.swig b/layout/post.swig index 2a008cb3f..827463050 100644 --- a/layout/post.swig +++ b/layout/post.swig @@ -32,4 +32,6 @@ {{ sidebar_template.render(true) }} {% endblock %} -{% block script_extra %}{% endblock %} +{% block script_extra %} + {% include '_scripts/pages/post-details.swig' %} +{% endblock %} From 1a6e24c2862ced07e3d1eb0fa4ddabae4ba21d89 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 20:07:37 +0300 Subject: [PATCH 35/55] FIX: sidebar scrollable in all schemes [20]. --- source/js/src/post-details.js | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/source/js/src/post-details.js b/source/js/src/post-details.js index 4902e92b0..a82bcc228 100644 --- a/source/js/src/post-details.js +++ b/source/js/src/post-details.js @@ -3,8 +3,6 @@ $(document).ready(function () { initScrollSpy(); -// NexT.utils.needAffix() && initAffix(); - initTOCDimension(); function initScrollSpy () { var tocSelector = '.post-toc'; @@ -31,34 +29,6 @@ $(document).ready(function () { } } - function initTOCDimension () { - var updateTOCHeightTimer; - - $(window).on('resize', function () { - updateTOCHeightTimer && clearTimeout(updateTOCHeightTimer); - - updateTOCHeightTimer = setTimeout(function () { - var tocWrapperHeight = document.body.clientHeight - NexT.utils.getSidebarSchemePadding(); - - updateTOCHeight(tocWrapperHeight); - }, 0); - }); - - // Initialize TOC Height. - updateTOCHeight(document.body.clientHeight - NexT.utils.getSidebarSchemePadding()); - - // Initialize TOC Width. - var scrollbarWidth = NexT.utils.getScrollbarWidth(); - $('.post-toc').css('width', 'calc(100% + ' + scrollbarWidth + 'px)'); - $('.site-overview').css('width', 'calc(100% + ' + scrollbarWidth + 'px)'); - } - - function updateTOCHeight (height) { - height = height || 'auto'; - $('.post-toc').css('max-height', height); - $('.site-overview').css('max-height', height); - } - }); $(document).ready(function () { From 22569da8262a56874add64a65aad20a54ddb84f9 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 21:05:59 +0300 Subject: [PATCH 36/55] FIX: sidebar scrollable in all schemes [21]. --- source/js/src/utils.js | 48 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/source/js/src/utils.js b/source/js/src/utils.js index eaba108e9..5191daf6b 100644 --- a/source/js/src/utils.js +++ b/source/js/src/utils.js @@ -270,13 +270,19 @@ NexT.utils = NexT.$u = { return contentVisibilityHeight; }, + getSidebarb2tHeight: function () { + //var sidebarb2tHeight = (CONFIG.sidebar.b2t) ? document.getElementsByClassName('back-to-top')[0].clientHeight : 0; + var sidebarb2tHeight = (CONFIG.sidebar.b2t) ? $('.back-to-top').height() : 0; + //var sidebarb2tHeight = (CONFIG.sidebar.b2t) ? 24 : 0; + return sidebarb2tHeight; + }, + getSidebarSchemePadding: function () { - var sidebarb2tHeight = (CONFIG.sidebar.b2t) ? $('.back-to-top').height() : 0, - sidebarNavHeight = ($('.sidebar-nav').css('display') == 'block') ? $('.sidebar-nav').outerHeight(true) : 0, + var sidebarNavHeight = ($('.sidebar-nav').css('display') == 'block') ? $('.sidebar-nav').outerHeight(true) : 0, sidebarInner = $('.sidebar-inner'), sidebarPadding = sidebarInner.innerWidth() - sidebarInner.width(), sidebarSchemePadding = this.isPisces() || this.isGemini() ? - ((sidebarPadding * 2) + sidebarNavHeight + (CONFIG.sidebar.offset * 2) + sidebarb2tHeight) : + ((sidebarPadding * 2) + sidebarNavHeight + (CONFIG.sidebar.offset * 2) + this.getSidebarb2tHeight()) : ((sidebarPadding * 2) + (sidebarNavHeight / 2)); return sidebarSchemePadding; } @@ -290,3 +296,39 @@ NexT.utils = NexT.$u = { // return this.isPisces() || this.isGemini(); // } }; + +$(document).ready(function () { + + initSidebarDimension(); + + /** + * Init Sidebar & TOC inner dimensions on all pages and for all schemes. + * Need for Sidebar/TOC inner scrolling if content taller then viewport. + */ + function initSidebarDimension () { + var updateSidebarHeightTimer; + + $(window).on('resize', function () { + updateSidebarHeightTimer && clearTimeout(updateSidebarHeightTimer); + + updateSidebarHeightTimer = setTimeout(function () { + var sidebarWrapperHeight = document.body.clientHeight - NexT.utils.getSidebarSchemePadding(); + + updateSidebarHeight(sidebarWrapperHeight); + }, 0); + }); + + // Initialize Sidebar & TOC Height. + updateSidebarHeight(document.body.clientHeight - NexT.utils.getSidebarSchemePadding()); + + // Initialize Sidebar & TOC Width. + var scrollbarWidth = NexT.utils.getScrollbarWidth(); + $('.site-overview, .post-toc').css('width', 'calc(100% + ' + scrollbarWidth + 'px)'); + } + + function updateSidebarHeight (height) { + height = height || 'auto'; + $('.site-overview, .post-toc').css('max-height', height); + } + +}); From 12808375bed33801ef597640b2280711529bd1f2 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 21:26:03 +0300 Subject: [PATCH 37/55] FIX: sidebar scrollable in all schemes [22]. Not affix if sidebar taller then content (to prevent bottom jumping). --- source/js/src/schemes/pisces.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/source/js/src/schemes/pisces.js b/source/js/src/schemes/pisces.js index 426de30f7..0e6e4267e 100644 --- a/source/js/src/schemes/pisces.js +++ b/source/js/src/schemes/pisces.js @@ -7,16 +7,21 @@ $(document).ready(function () { function initAffix () { var headerOffset = getHeaderOffset(), - footerOffset = getFooterOffset(); - - sidebarInner.affix({ - offset: { - top: headerOffset - CONFIG.sidebar.offset, - bottom: footerOffset - } - }); - - setSidebarMarginTop(headerOffset).show(); + footerOffset = getFooterOffset(), + sidebarHeight = $('#sidebar').height() + NexT.utils.getSidebarb2tHeight(), + contentHeight = $('#content').height(); + + // Not affix if sidebar taller then content (to prevent bottom jumping). + if (headerOffset + sidebarHeight < contentHeight) { + sidebarInner.affix({ + offset: { + top: headerOffset - CONFIG.sidebar.offset, + bottom: footerOffset + } + }); + } + + setSidebarMarginTop(headerOffset).css({ 'margin-left': 'initial' }); } function resizeListener () { From fa871de4bb02be78cf9e03c0d999018280833697 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 21:46:49 +0300 Subject: [PATCH 38/55] FIX: sidebar scrollable in all schemes [23]. 1. Replace display style for sidebar top alignment with margin-left. 2. Add motion for sidebar in Pisces | Gemini. --- source/css/_schemes/Pisces/_sidebar.styl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/css/_schemes/Pisces/_sidebar.styl b/source/css/_schemes/Pisces/_sidebar.styl index 5fd04c9fb..03c1023dd 100644 --- a/source/css/_schemes/Pisces/_sidebar.styl +++ b/source/css/_schemes/Pisces/_sidebar.styl @@ -1,7 +1,7 @@ .use-motion .sidebar .motion-element { opacity: 1; } .sidebar { - display: none; + margin-left: -50%; right: auto; bottom: auto; @@ -19,6 +19,7 @@ background: white; box-shadow: $box-shadow; border-radius: $border-radius; + if (hexo-config('motion.enable') and hexo-config('motion.transition.sidebar')) { opacity: 0; } &.affix { position: fixed; From 11c5d1c1bfe4b5ee744505903fda7c32c7a9528e Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 21:50:50 +0300 Subject: [PATCH 39/55] FIX: sidebar scrollable in all schemes [24]. Add `post_block` motion effects on `.pagination` and `.comments` [2]. --- source/css/_common/components/post/post.styl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/css/_common/components/post/post.styl b/source/css/_common/components/post/post.styl index 878f1e477..ef6a24ec2 100644 --- a/source/css/_common/components/post/post.styl +++ b/source/css/_common/components/post/post.styl @@ -34,7 +34,11 @@ } .use-motion { - if hexo-config('motion.transition.post_block') { .post-block { opacity: 0; } } + if hexo-config('motion.transition.post_block') { + .post-block, + .pagination, + .comments { opacity: 0; } + } if hexo-config('motion.transition.post_header') { .post-header { opacity: 0; } } if hexo-config('motion.transition.post_body') { .post-body { opacity: 0; } } if hexo-config('motion.transition.coll_header') { .collection-title { opacity: 0; } } From 867fdbd23d7e0120c915cc144f2ef625c0a750cf Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 21:54:03 +0300 Subject: [PATCH 40/55] FIX: sidebar scrollable in all schemes [25]. 1. Add `post_block` motion effects on `.pagination` and `.comments` [3]. 2. Add motion for sidebar in Pisces | Gemini [2]. --- source/js/src/motion.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/source/js/src/motion.js b/source/js/src/motion.js index 288300300..112917917 100644 --- a/source/js/src/motion.js +++ b/source/js/src/motion.js @@ -290,7 +290,7 @@ $(document).ready(function () { postList: function (integrator) { //var $post = $('.post'); - var $postBlock = $('.post-block'); + var $postBlock = $('.post-block, .pagination, .comments'); var $postBlockTransition = CONFIG.motion.transition.post_block; var $postHeader = $('.post-header'); var $postHeaderTransition = CONFIG.motion.transition.post_header; @@ -298,6 +298,8 @@ $(document).ready(function () { var $postBodyTransition = CONFIG.motion.transition.post_body; var $collHeader = $('.collection-title, .archive-year'); var $collHeaderTransition = CONFIG.motion.transition.coll_header; + var $sidebarAffix = $('.sidebar-inner'); + var $sidebarAffixTransition = CONFIG.motion.transition.sidebar; var hasPost = $postBlock.size() > 0; hasPost ? postMotion() : integrator.next(); @@ -312,6 +314,10 @@ $(document).ready(function () { drag: true }; postMotionOptions.complete = function () { + // After motion complete need to remove transform from sidebar to let affix work on Pisces | Gemini. + if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) { + $sidebarAffix.css({ 'transform': 'initial' }); + } integrator.next(); }; @@ -328,6 +334,10 @@ $(document).ready(function () { if (CONFIG.motion.transition.coll_header) { $collHeader.velocity('transition.' + $collHeaderTransition, postMotionOptions); } + // Only for Pisces | Gemini. + if (CONFIG.motion.transition.sidebar && (NexT.utils.isPisces() || NexT.utils.isGemini())) { + $sidebarAffix.velocity('transition.' + $sidebarAffixTransition, postMotionOptions); + } } }, From c2c2834d5bd95c49c07136e5d6c9c01a82212b71 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 22:00:23 +0300 Subject: [PATCH 41/55] FIX: sidebar scrollable in all schemes [26]. --- _config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index d9266f6d3..d79ba07f6 100755 --- a/_config.yml +++ b/_config.yml @@ -558,7 +558,7 @@ tabs: #! UNLESS YOU KNOW WHAT YOU ARE DOING #! --------------------------------------------------------------- -# Motion +# Use velocity to animate everything. motion: enable: true async: false @@ -574,6 +574,8 @@ motion: post_header: slideDownIn post_body: slideDownIn coll_header: slideLeftIn + # Only for Pisces | Gemini. + sidebar: slideUpIn # Fancybox fancybox: true From d8543f894a4d9313dbdf0a1b3e7898fda5e4d605 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 22:12:36 +0300 Subject: [PATCH 42/55] FIX: comments block only show if comments present. --- layout/_partials/comments.swig | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/layout/_partials/comments.swig b/layout/_partials/comments.swig index e76d76ae7..278e6e737 100644 --- a/layout/_partials/comments.swig +++ b/layout/_partials/comments.swig @@ -1,35 +1,51 @@ {% if page.comments %} -
{% if (theme.duoshuo and theme.duoshuo.shortname) or theme.duoshuo_shortname %} +
+
{% elseif theme.facebook_sdk.enable and theme.facebook_comments_plugin.enable %} +
+
{% elseif theme.vkontakte_api.enable and theme.vkontakte_api.comments %} +
+
{% elseif theme.disqus.enable %} +
+
{% elseif theme.hypercomments_id %} +
+
{% elseif theme.youyan_uid %} +
+
{% elseif theme.livere_uid %} +
+
{% elseif theme.changyan.appid and theme.changyan.appkey %} +
+
{% elseif theme.valine.appid and theme.valine.appkey %} +
+
{% endif %} -
{% endif %} From abb14242cc7df733f25af3dcaacf1efc3b4f103a Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 22:21:32 +0300 Subject: [PATCH 43/55] FIX: comments block show if comments present [2]. --- layout/_partials/comments.swig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/layout/_partials/comments.swig b/layout/_partials/comments.swig index 278e6e737..b0aa1df1f 100644 --- a/layout/_partials/comments.swig +++ b/layout/_partials/comments.swig @@ -1,11 +1,11 @@ {% if page.comments %} - {% if (theme.duoshuo and theme.duoshuo.shortname) or theme.duoshuo_shortname %} + {% if (theme.duoshuo and theme.duoshuo.shortname) or theme.duoshuo_shortname %}
- {% elseif theme.facebook_sdk.enable and theme.facebook_comments_plugin.enable %} + {% elseif theme.facebook_sdk.enable and theme.facebook_comments_plugin.enable %}
- {% elseif theme.vkontakte_api.enable and theme.vkontakte_api.comments %} + {% elseif theme.vkontakte_api.enable and theme.vkontakte_api.comments %}
- {% elseif theme.disqus.enable %} + {% elseif theme.disqus.enable %}
- {% elseif theme.hypercomments_id %} + {% elseif theme.hypercomments_id %}
- {% elseif theme.youyan_uid %} + {% elseif theme.youyan_uid %}
- {% elseif theme.livere_uid %} + {% elseif theme.livere_uid %}
- {% elseif theme.changyan.appid and theme.changyan.appkey %} + {% elseif theme.changyan.appid and theme.changyan.appkey %}
- {% elseif theme.valine.appid and theme.valine.appkey %} + {% elseif theme.valine.appid and theme.valine.appkey %}
- {% endif %} + {% endif %} {% endif %} From 031244b4443fecf3e85984dbd298629ebc5af143 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 22:40:29 +0300 Subject: [PATCH 44/55] ADD: responsive favicons options [1]. 1. NexT logo (SVG, 512x512). 2. Apple icon (PNG, 180x180). 3. Favicon (PNG, 32x32). 4. Favicon (PNG, 16x16). --- source/images/apple-touch-icon.png | Bin 0 -> 1544 bytes source/images/favicon-16x16.png | Bin 0 -> 435 bytes source/images/favicon-32x32.png | Bin 0 -> 640 bytes source/images/logo.svg | 23 +++++++++++++++++++++++ 4 files changed, 23 insertions(+) create mode 100644 source/images/apple-touch-icon.png create mode 100644 source/images/favicon-16x16.png create mode 100644 source/images/favicon-32x32.png create mode 100644 source/images/logo.svg diff --git a/source/images/apple-touch-icon.png b/source/images/apple-touch-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..86a0d1d33bc2ae8a0416ebba67d1bbb60aa29c38 GIT binary patch literal 1544 zcmV+j2KV`iP)Px#OHfQyMIs_1FE20E)zv2_C(h2!$jHdT!ovUm|GT@p zWo2de_xJq#{8d#|IyyQ>M@Qx533`J9dBE>4W{r{KFjMLpp4N$2iMRJCGfPM7@le{)BPzVgz zp?ByVdWYVj|4-=tUS5SkR}Te{-Fr#UrxsqJ9+ed6YY9KmoXq6n^B9DRMwF@T2u)qH z!=wh-sAdPH_8fFy0-I1d68Zp);!FTtdweUZc2nr)?5^hh99w*FOU z@NYFT^!v%iPrGly0Q*+sLVtesYh+the|AET4WK8lR^dv1IZ-3FhAuiK5V|-?gf2#j z&_yW`x^K3G&OKl4kP$$ih@p!?B6M+)2(4Rz(6$=G6WT(;6uP)cgkEi(xI(Yi7`D(w zo(Y6r>FyarFV`4e&^@lk@PfWf|DSeM5}?agV`>aDXt-c%3^!*Ij0g0Q8X5*mjbRC$9oB0MOK51O_53LU8p`RzcozW; zx3wC>721@58xhdzx?E$}LW9xpjUu4UhOZO>Z8Us+D+1bR_}&sQXJ}B}yadb|8fraT zV|YUw4WF(>KpPF;mjp}*eTo5XG<+u!&}PFoihwq!uhI`XPYZ1{e1FDs0nqR?Ym5YF zqv0DwK${KUMFjNpqb>9(0vg8Y^d$otmiJc}L#s|8wD~Z~fHtQu8PG6DgwAq-&}PFY z1KMo(WI!7YpAcwxN`zJiV(2pgG_<|npE+y^Z8UsBppAx42(;Po$$&N*J{izP!?y+W zi2YsL=fkK`KXsymhWcmL#_y-S*Y&V_u#us^S9pDvbMSkxv7uidoc36Qa`CQ+5AC^d z=CTJ%0ZkrQ=v?t(E_)>OCL8YaU+nX$$--iAUNb;m^jBG2!5*5enU|exmY3aQcv=O- znjO}ft-yw2|VZs2g-W`Epf@n*5gsJ2LLtC^nFlq8+?%Xc!{Z3_|hFI~!oeU$ep z%4jE9Y9n1{ah68@W{++)8|fc~HIM4)QycHpg}3P<_K$M$L~}7jBXs?6bDwjvo+I;D zsoi}398La6+~*osM@45l#ptQ6MrZFz597*no3v)ffsUEletxWeW~`A+ntYvaeQj?e z*kSqGXZsrrhZ>IsxH$({IR{z11zkG`GR^j$#{%z41lp5(Ne#glJc5nj-BUaKR!X?# zzN6F-<0?&z;|30?9q0Z}oHG*G)Q)s%Db~RbjMU)mp-u&Dmm0zkF~o9eRh}p?ByVnjn4wmEZ*c=^{+H00012dQ@0+Qek%>aB^>E zX>4U6ba`-PAZc)PV*mhnoa6Eg2ys>@D9TUE%t_@^00ScnE@KN5BNI!L6ay0=M1VBI uWCJ6!R3OXP)X2ol#2my2%YaCrN-hBE7ZG&wLN%2D0000`v literal 0 HcmV?d00001 diff --git a/source/images/favicon-16x16.png b/source/images/favicon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..de8c5d3a5f8215c3f7b095c9e284e061bda65f86 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%A+0*}aIAe|4wj2{=>aRxHH1AIbUeKHFb!9Yn#DLy_vBO^maMdk0`zd#Zw z0tY~@yu3V6p{Ay$mX_Az$B+O0`?r4m`qisfPnj~MwY3$f@^9nqaG!lvI6;x#X;^) z4C~IxyaaMM3p^r=f%IJvW-JI^#13S11^9%x`eYU=fq|TyoQjGHgbgIWfB*jF%NI8{ zx2;>Zu3x`iO-&6bs0aoM3JPUqWq0n}*}Qo(P|Le_@AmKC57(%ytPE5IHwwrGiqzKD z{{8#c)YSCg!Gk}3{P_R>|Gj(no6k4eJyZq^Jd4Jw%*zpM57yY9pK zMcQgs21j>QigM54W!RCVazM0UCtHDVhG46xh5pA!(TqDDnlwLEm~eRS(JM@6p3293 zNMwDW(!P~x!s$%jghh-wOB)P19fJ88oOHECttPa5*~LF^Vp#0%pwrbyN~~|szWB|o z_J4%n&U>rEu5s2%I6jof{A;(j!|>g|;yo?%ZfFGheBJp^9_Zijs*s41pu}>8f};Gi z%$!t(lFEWqh0KDIWCn(cIgdZ_a1@4VXq@stea7=?5CgL^w_Y;0u(GiCWD#az1(ybs x!zs+ln?n>%-?(z($eANDN7zp{cr5VJV|XPlSn|oqbSlsa22WQ%mvv4FO#p=N1nU3* literal 0 HcmV?d00001 diff --git a/source/images/logo.svg b/source/images/logo.svg new file mode 100644 index 000000000..ae2936960 --- /dev/null +++ b/source/images/logo.svg @@ -0,0 +1,23 @@ + +image/svg+xml \ No newline at end of file From 685b0eefcf4e6bb5af9b237032a510b71e408d2b Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 22:43:53 +0300 Subject: [PATCH 45/55] FIX: responsive favicons options [2]. --- source/images/logo.svg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/images/logo.svg b/source/images/logo.svg index ae2936960..cbb3937ec 100644 --- a/source/images/logo.svg +++ b/source/images/logo.svg @@ -12,7 +12,7 @@ width="512px" y="0px" x="0px" - id="圖層_1" + id="NexT" version="1.1">image/svg+xml \ No newline at end of file + d="M 256.4,25.8 56.4,141.3 56,371.5 255.6,486.2 455.6,370.7 456,140.5 Z m 92.6,328.8 -18.4,10.7 -18.6,-11 0,0 -112,-142.3 0,142.6 -18.4,10.7 -18.6,-11 0,-197 18.5,-10.6 18.5,10.8 0,0 112,144.5 0,-144.6 18.5,-10.6 18.5,10.8 z" /> From f4069020676824b00d5bca7425d1934e7b64941a Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 22:57:56 +0300 Subject: [PATCH 46/55] ADD: responsive favicons options [3]. --- layout/_partials/head.swig | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/layout/_partials/head.swig b/layout/_partials/head.swig index 51c240a91..1e03db687 100644 --- a/layout/_partials/head.swig +++ b/layout/_partials/head.swig @@ -73,6 +73,25 @@ +{% if theme.favicon.apple_touch_icon %} + +{% endif %} +{% if theme.favicon.medium %} + +{% endif %} +{% if theme.favicon.small %} + +{% endif %} +{% if theme.favicon.safari_pinned_tab %} + +{% endif %} +{% if theme.favicon.android_manifest %} + +{% endif %} +{% if theme.favicon.ms_browserconfig %} + +{% endif %} + {% if page.keywords %} {% elif page.tags and page.tags.length %} @@ -90,11 +109,6 @@ {% endif %} -{% if theme.favicon %} - -{% endif %} - - {% if theme.facebook_sdk.enable and theme.facebook_sdk.webmaster %} From 2ca6c064e10618c2b9f20ec6b977ca1ef92f0600 Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Thu, 28 Sep 2017 23:04:30 +0300 Subject: [PATCH 47/55] ADD: responsive favicons options [4]. --- _config.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index d79ba07f6..a80b8129e 100755 --- a/_config.yml +++ b/_config.yml @@ -10,8 +10,17 @@ override: false # Site Information Settings # --------------------------------------------------------------- -# Put your favicon.ico into `hexo-site/source/` directory. -favicon: /favicon.ico +# To get favicons visit: https://realfavicongenerator.net +# Put your favicons into `hexo-site/source/` or `hexo-site/themes/next/source/images/` directory. +# Default NexT favicons placed in `hexo-site/themes/next/source/images/` directory. +# And if you want to place your icons in `hexo-site/source/`, you must remove `/images` prefix from pathes. +favicon: + small: /images/favicon-16x16.png + medium: /images/favicon-32x32.png + apple_touch_icon: /images/apple-touch-icon.png + safari_pinned_tab: /images/logo.svg + #android_manifest: /images/manifest.json + #ms_browserconfig: /images/browserconfig.xml # Set default keywords (Use a comma to separate) keywords: "Hexo, NexT" From 0ed5ec9b75f8f3bb46b921b889c36d75d1663e4e Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Fri, 29 Sep 2017 14:49:12 +0300 Subject: [PATCH 48/55] FIX: Enhancements to Gemini scheme [5]. Remove excess margin for better economy in all schemes. --- source/css/_common/scaffolding/mobile.styl | 1 - 1 file changed, 1 deletion(-) diff --git a/source/css/_common/scaffolding/mobile.styl b/source/css/_common/scaffolding/mobile.styl index d1213b2ea..191fbfdaa 100644 --- a/source/css/_common/scaffolding/mobile.styl +++ b/source/css/_common/scaffolding/mobile.styl @@ -54,7 +54,6 @@ } .post-block { - margin-bottom: $content-mobile-padding; // Inside posts blocks content padding (default 40px). padding: $content-mobile-padding 0 !important; } From 00f7b6467bd02b3afe8fb19ef6a9f8748dfd1ddd Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Fri, 29 Sep 2017 14:57:40 +0300 Subject: [PATCH 49/55] ADD: Enhancements to Gemini scheme [6]. Note to remember `$border-radius` values. --- source/css/_variables/Gemini.styl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/css/_variables/Gemini.styl b/source/css/_variables/Gemini.styl index e4c39a4a1..4d6e7e01a 100644 --- a/source/css/_variables/Gemini.styl +++ b/source/css/_variables/Gemini.styl @@ -17,3 +17,5 @@ $box-shadow = 0 2px 2px 0 rgba(0,0,0,.12), 0 3px 1px -2px $border-radius-inner = initial $border-radius = initial +//$border-radius-inner = 0 0 3px 3px; +//$border-radius = 3px; From 36a3e31d691ce2d34ef42c00c8281c05fcac76ef Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Fri, 29 Sep 2017 15:10:34 +0300 Subject: [PATCH 50/55] MOD: Enhancements to Gemini scheme [7]. 1. Changed `margin-bottom` on `margin-top` in main blocks offsets & add siblings metod to detect blocks with offsets. 2. Rewrited shadows in all blocks with offsets & added forgotten borders. 3. Removed unused (commented) values. --- source/css/_schemes/Gemini/index.styl | 50 ++++++++++++++++++++------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/source/css/_schemes/Gemini/index.styl b/source/css/_schemes/Gemini/index.styl index f07401a19..0086232a7 100644 --- a/source/css/_schemes/Gemini/index.styl +++ b/source/css/_schemes/Gemini/index.styl @@ -33,26 +33,32 @@ use_seo = hexo-config('seo'); border-radius: initial; } -// Post & comments blocks. -.post-block, -.comments { - margin-bottom: sboffset; - background: white; +// Post & Comments blocks. +.post-block { padding: $content-desktop-padding; + background: white; box-shadow: $box-shadow-inner; border-radius: $border-radius-inner; } -// Last post block in homepage (need to remove bottom margin to save style). -#posts > :last-child { +// When blocks are siblings (homepage). +#posts > article + article { .post-block { - margin-bottom: initial; + margin-top: sboffset; + // Rewrite shadows & borders because all blocks have offsets. + box-shadow: $box-shadow; + border-radius: $border-radius; } } // Comments blocks. .comments { + padding: $content-desktop-padding; margin: initial; + margin-top: sboffset; + background: white; + box-shadow: $box-shadow; + border-radius: $border-radius; } // Top main padding from header to posts (default 40px). @@ -84,6 +90,7 @@ use_seo = hexo-config('seo'); border-top: initial; background: white; box-shadow: $box-shadow; + border-radius: $border-radius; padding: 10px 0 10px; } @@ -155,13 +162,22 @@ h6 { } .post-block { - margin-bottom: $content-tablet-padding; // Inside posts blocks content padding (default 40px). - //padding: 20px; padding: ($content-tablet-padding * 2); + // Rewrite shadows & borders because all blocks have offsets. + box-shadow: $box-shadow; + border-radius: $border-radius; + } + + // Only if blocks are siblings need bottom margin (homepage). + #posts > article + article { + .post-block { + margin-top: $content-tablet-padding; + } } .comments { + margin-top: $content-tablet-padding; padding: $content-tablet-padding ($content-tablet-padding * 2); //padding: initial; //padding-top: $content-tablet-padding; @@ -195,15 +211,23 @@ h6 { } .post-block { - margin-bottom: $content-mobile-padding; - //width: 100%; // Inside posts blocks content padding (default 40px). - //padding: $content-mobile-padding 0px; padding: sboffset; min-height: auto; + // Rewrite shadows & borders because all blocks have offsets. + box-shadow: $box-shadow; + border-radius: $border-radius; + } + + // Only if blocks are siblings need bottom margin (homepage). + #posts > article + article { + .post-block { + margin-top: $content-mobile-padding; + } } .comments { + margin-top: $content-mobile-padding; padding: 0 sboffset; } From 7b41c6aea4a6e62af409656a6af353b7d93e127e Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Fri, 29 Sep 2017 16:34:19 +0300 Subject: [PATCH 51/55] MOD: Enhancements to Gemini scheme [8]. Used `.post-body` to filter `` tags & refactored fonts sizes. --- source/css/_schemes/Gemini/index.styl | 47 +++++++++++++++------------ 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/source/css/_schemes/Gemini/index.styl b/source/css/_schemes/Gemini/index.styl index 0086232a7..95dd34dc4 100644 --- a/source/css/_schemes/Gemini/index.styl +++ b/source/css/_schemes/Gemini/index.styl @@ -105,8 +105,9 @@ use_seo = hexo-config('seo'); // ================================================= // Headers. // ================================================= +// No need anymore? .post-header { - h2 { + h1, h2 { margin: initial; } } @@ -116,31 +117,35 @@ use_seo = hexo-config('seo'); .posts-expand .post-title { font-size: 1.7em; } -h2 { - font-size: 1.5em; - if not use_seo { +.post-body { + h1 { + font-size: 1.6em; border-bottom: 1px solid $body-bg-color; } -} -h3 { - font-size: 1.3em; - if use_seo { + h2 { + font-size: 1.45em; border-bottom: 1px solid $body-bg-color; - } else { - border-bottom: 1px dotted $body-bg-color; } -} -h4 { - font-size: 1.2em; - if use_seo { - border-bottom: 1px dotted $body-bg-color; + h3 { + font-size: 1.3em; + if use_seo { + border-bottom: 1px solid $body-bg-color; + } else { + border-bottom: 1px dotted $body-bg-color; + } + } + h4 { + font-size: 1.2em; + if use_seo { + border-bottom: 1px dotted $body-bg-color; + } + } + h5 { + font-size: 1.07em; + } + h6 { + font-size: 1.03em; } -} -h5 { - font-size: 1.07em; -} -h6 { - font-size: 1.03em; } // ================================================= From a558d60f60744092f8df65f554aab8082cc7484c Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 30 Sep 2017 12:38:16 +0300 Subject: [PATCH 52/55] ADD: Post custom copyright feature. Issues: #1843, #1767, 1036. --- layout/_macro/post-copyright.swig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layout/_macro/post-copyright.swig b/layout/_macro/post-copyright.swig index e1f6a1dd4..4ad0490c8 100644 --- a/layout/_macro/post-copyright.swig +++ b/layout/_macro/post-copyright.swig @@ -1,11 +1,11 @@
  • {{ __('post.copyright.author') + __('symbol.colon') }} - {{ config.author }} + {{ post.author | default(config.author) }}
  • {{ __('post.copyright.link') + __('symbol.colon') }} - {{ post.permalink }} + {{ post.url | default(post.permalink) }}
  • {{ __('post.copyright.license_title') + __('symbol.colon') }} From 9c33832d746b99b5cc21f20b7d4e5b3531acb29d Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 30 Sep 2017 12:57:09 +0300 Subject: [PATCH 53/55] Update version to 5.1.3 [1]. --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index a80b8129e..18344b8b8 100755 --- a/_config.yml +++ b/_config.yml @@ -714,4 +714,4 @@ js: js images: images # Theme version -version: 5.1.2 +version: 5.1.3 From 3a2f34dc25814b673bb8d05bc40b14e1c683911b Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 30 Sep 2017 13:01:38 +0300 Subject: [PATCH 54/55] Update version to 5.1.3 [2]. --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index ed2a6748c..ec1ec27e0 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "isn-next", - "version": "5.1.2", + "version": "5.1.3", "homepage": "https://github.com/iissnan/hexo-theme-next", "authors": [ "iissnan " From 88c3904720af7d4273470f141cf390f53a67d59d Mon Sep 17 00:00:00 2001 From: "Ivan.Nginx" Date: Sat, 30 Sep 2017 13:02:10 +0300 Subject: [PATCH 55/55] Update version to 5.1.3 [3]. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a7ede38be..743761e78 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hexo-theme-next", - "version": "5.1.2", + "version": "5.1.3", "description": "Elegant theme for Hexo", "main": "index.js", "directories": {