From 6220d09ffba112dd6bbe4b48c8f3957deac9cb52 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Fri, 3 Dec 2021 20:50:12 +0800 Subject: [PATCH 1/5] Replace the pageviews with categories on home page --- _includes/js-selector.html | 2 +- _layouts/home.html | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/_includes/js-selector.html b/_includes/js-selector.html index 20531b4..219fe96 100644 --- a/_includes/js-selector.html +++ b/_includes/js-selector.html @@ -4,7 +4,7 @@ -{% if page.layout == 'home' or page.layout == 'post' %} +{% if page.layout == 'post' %} {% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %} diff --git a/_layouts/home.html b/_layouts/home.html index 6cf5e3c..1233e10 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -68,13 +68,17 @@ layout: page {% include read-time.html content=post.content %} - - {% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %} - - - - + + {% if post.categories.size > 0 %} + + + {% for category in post.categories %} + {{ category }} + {%- unless forloop.last -%},{%- endunless -%} + {% endfor %} + {% endif %} + {% if post.pin %} From 563e8085e8e84c9fc179be7a3e5ba07f99ce0230 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sat, 4 Dec 2021 06:56:33 +0800 Subject: [PATCH 2/5] Redesign the post meta layout - posted date - updated date - read time - license statement of post bottom - also refactor the `timeago.js` --- _data/locales/en.yml | 3 ++- _data/locales/id-ID.yml | 3 ++- _data/locales/zh-CN.yml | 3 ++- _includes/read-time.html | 6 ++--- _includes/timeago.html | 23 ++++++++--------- _javascript/utils/timeago.js | 38 +++++++++++++++------------ _layouts/home.html | 5 ++-- _layouts/post.html | 50 +++++++++++++++++++++--------------- _sass/addon/commons.scss | 38 ++++++++++++--------------- _sass/addon/module.scss | 8 +++--- _sass/layout/home.scss | 8 ++++-- _sass/layout/post.scss | 36 +++++++++----------------- assets/js/dist/home.min.js | 2 +- assets/js/dist/post.min.js | 2 +- 14 files changed, 113 insertions(+), 112 deletions(-) diff --git a/_data/locales/en.yml b/_data/locales/en.yml index 65c2df0..93e4d15 100644 --- a/_data/locales/en.yml +++ b/_data/locales/en.yml @@ -59,7 +59,8 @@ not_found: # ----- Posts related labels ----- post: - published: 'on' + written_by: By + posted: Posted updated: Updated timeago: day: days ago diff --git a/_data/locales/id-ID.yml b/_data/locales/id-ID.yml index 851d5a9..4693c5e 100644 --- a/_data/locales/id-ID.yml +++ b/_data/locales/id-ID.yml @@ -59,7 +59,8 @@ not_found: # ----- Posts related labels ----- post: - published: "pada" + written_by: Oleh + posted: Diterbitkan updated: Diperbarui timeago: day: hari yang lalu diff --git a/_data/locales/zh-CN.yml b/_data/locales/zh-CN.yml index 0d479a3..83f2376 100644 --- a/_data/locales/zh-CN.yml +++ b/_data/locales/zh-CN.yml @@ -58,7 +58,8 @@ not_found: # ----- Posts related labels ----- post: - published: 发表于 + written_by: 作者 + posted: 发表于 updated: 更新于 timeago: day: 天前 diff --git a/_includes/read-time.html b/_includes/read-time.html index 2822d69..fbbc0b2 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -22,9 +22,9 @@ - {{- read_time -}}{{" "}}{{- site.data.locales[lang].post.read_time.unit -}} + {{- read_time -}}{{" "}}{{- site.data.locales[lang].post.read_time.unit -}} {%- if include.prompt -%} - {% assign _prompt_words = read_prompt | number_of_words: 'auto' %} - {% unless _prompt_words > 1 %}{{" "}}{% endunless %}{{ read_prompt }} + {%- assign _prompt_words = read_prompt | number_of_words: 'auto' -%} + {%- unless _prompt_words > 1 -%}{{ " " }}{%- endunless -%}{{ read_prompt }} {%- endif -%} diff --git a/_includes/timeago.html b/_includes/timeago.html index b68e08b..bd0ed8a 100644 --- a/_includes/timeago.html +++ b/_includes/timeago.html @@ -1,27 +1,26 @@ {% assign tooltip_df = site.data.locales[lang].date_format.tooltip %} {% assign post_long_df = site.data.locales[lang].date_format.post.long %} {% assign post_short_df = site.data.locales[lang].date_format.post.short %} -{% if include.preposition %} - {{ include.preposition }} -{% endif %} - + + {%- assign this_year = site.time | date: "%Y" -%} {%- assign post_year = include.date | date: "%Y" -%} + {%- if post_year == this_year -%} {{ include.date | date: post_short_df }} {%- else -%} {{ include.date | date: post_long_df }} {%- endif -%} - {{ include.date | date_to_xmlschema }} - + diff --git a/_javascript/utils/timeago.js b/_javascript/utils/timeago.js index 428a41c..371231a 100644 --- a/_javascript/utils/timeago.js +++ b/_javascript/utils/timeago.js @@ -3,11 +3,8 @@ */ $(function() { - const timeagoElem = $(".timeago"); - - let toRefresh = timeagoElem.length; - + let tasks = timeagoElem.length; let intervalId = void 0; const dPrompt = $("meta[name=day-prompt]").attr("content"); @@ -15,20 +12,19 @@ $(function() { const minPrompt = $("meta[name=minute-prompt]").attr("content"); const justnowPrompt = $("meta[name=justnow-prompt]").attr("content"); - function timeago(isoDate, dateStr) { + function timeago(date, initDate) { let now = new Date(); - let past = new Date(isoDate); + let past = new Date(date); if (past.getFullYear() !== now.getFullYear() || past.getMonth() !== now.getMonth()) { - return dateStr; + return initDate; } let seconds = Math.floor((now - past) / 1000); let day = Math.floor(seconds / 86400); if (day >= 1) { - toRefresh -= 1; return ` ${day} ${dPrompt}`; } @@ -47,22 +43,30 @@ $(function() { function updateTimeago() { $(".timeago").each(function() { - if ($(this).children("i").length > 0) { - let dateStr = $(this).clone().children().remove().end().text(); - let node = $(this).children("i"); - let iosDate = node.text(); /* ISO Date: "YYYY-MM-DDTHH:MM:SSZ" */ - $(this).text(timeago(iosDate, dateStr)); - $(this).append(node); + if ($(this)[0].hasAttribute("date") === false) { + tasks -= 1; + return; } + + let date = $(this).attr("date"); + let initDate = $(this).text(); + let relativeDate = timeago(date, initDate); + + if (relativeDate === initDate) { + $(this).removeAttr("date"); + } else { + $(this).text(relativeDate); + } + }); - if (toRefresh === 0 && typeof intervalId !== "undefined") { + if (tasks === 0 && typeof intervalId !== "undefined") { clearInterval(intervalId); /* stop interval */ } - return toRefresh; + return tasks; } - if (toRefresh === 0) { + if (tasks === 0) { return; } diff --git a/_layouts/home.html b/_layouts/home.html index 1233e10..279feed 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -57,9 +57,9 @@ layout: page

-
+
-
+
{% include timeago.html date=post.date tooltip=true %} @@ -78,7 +78,6 @@ layout: page {% endfor %} {% endif %} -
{% if post.pin %} diff --git a/_layouts/post.html b/_layouts/post.html index 8e78eb9..528412b 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -12,37 +12,45 @@ tail_includes:

{{ page.title }}

-
- +
+ +
- - {{ page.author | default: site.social.name }} - - {% capture _preposition %}{{ site.data.locales[lang].post.published }}{% endcapture %} - {% include timeago.html date=page.date tooltip=true preposition=_preposition %} + {{ site.data.locales[lang].post.written_by }} + {{ page.author | default: site.social.name }}
-
- - {% if page.last_modified_at %} +
+
+ + + {{ site.data.locales[lang].post.posted }} + {% include timeago.html date=page.date tooltip=true %} + + + + {% if page.last_modified_at %} {{ site.data.locales[lang].post.updated }} - {% include timeago.html date=page.last_modified_at class="lastmod" tooltip=true %} + {% include timeago.html date=page.last_modified_at tooltip=true %} - {% endif %} + {% endif %} - - {% include read-time.html content=content prompt=true %} + + {% include read-time.html content=content prompt=true %} - - {% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %} - - + + {% if site.google_analytics.pv.proxy_endpoint or site.google_analytics.pv.cache_path %} + + + + + {{ site.data.locales[lang].post.pageview_measure }} - {{ site.data.locales[lang].post.pageview_measure }} - {% endif %} + {% endif %} +
-
+
diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 072ef2b..35eaf7e 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -332,23 +332,6 @@ i { // fontawesome icons } } -.post { - h1 { - margin-top: 3rem; - margin-bottom: 1rem; - } - - em { /* MarkDown italic */ - padding-right: 0.2rem; - } - - a:hover { - code { - @extend %link-hover; - } - } -} - /* --- Begin of Markdown table style --- */ .table-wrapper { // it will be created by Liquid @@ -390,6 +373,19 @@ i { // fontawesome icons /* --- post --- */ +.post { + h1 { + margin-top: 3rem; + margin-bottom: 1rem; + } + + a:hover { + code { + @extend %link-hover; + } + } +} + .pageviews .fa-spinner { font-size: 80%; } @@ -409,6 +405,10 @@ i { // fontawesome icons @extend %link-hover; } } + + em { + @extend %normal-font-style; + } } .post-content { @@ -575,10 +575,6 @@ i { // fontawesome icons /* --- Effects classes --- */ -.semi-bold { - font-weight: 600 !important; -} - .loaded { display: block !important; diff --git a/_sass/addon/module.scss b/_sass/addon/module.scss index 9053ede..51d3c88 100644 --- a/_sass/addon/module.scss +++ b/_sass/addon/module.scss @@ -63,6 +63,10 @@ cursor: pointer; } +%normal-font-style { + font-style: normal; +} + /* ---------- scss mixin --------- */ @mixin no-text-decoration { @@ -88,10 +92,6 @@ opacity: 0.6; } -@mixin semi-bold { - font-weight: 600; -} - @mixin label($font-size: 1rem, $font-weight: 600, $color: var(--label-color)) { color: $color; font-size: $font-size; diff --git a/_sass/layout/home.scss b/_sass/layout/home.scss index 7382fbb..af80ba3 100644 --- a/_sass/layout/home.scss +++ b/_sass/layout/home.scss @@ -74,10 +74,14 @@ .post-meta { i { font-size: 0.73rem; + + &:not(:first-child) { + margin-left: 1.2rem; + } } - span:not(:last-child) { - margin-right: 1.2rem; + em { + @extend %normal-font-style; } } diff --git a/_sass/layout/post.scss b/_sass/layout/post.scss index 6d37a32..91562e0 100644 --- a/_sass/layout/post.scss +++ b/_sass/layout/post.scss @@ -16,18 +16,19 @@ border-color: var(--btn-border-color); } -@mixin dot($pl: 0.2rem, $pr: 0.4rem) { +@mixin dot($pl: 0.25rem, $pr: 0.25rem) { content: "\2022"; - color: rgba(158, 158, 158, 0.8); padding-left: $pl; padding-right: $pr; } h1 + .post-meta { - > div:nth-child(2) { - > span:not(:first-child)::before { - @include dot; - } + span + span::before { + @include dot; + } + + em { + color: var(--text-color); } } @@ -165,6 +166,10 @@ nav[data-toggle=toc] { @include label(1.1rem, 600); } + em { + @extend %normal-font-style; + } + .card { border-color: var(--card-border-color); background-color: var(--card-bg); @@ -308,7 +313,7 @@ nav[data-toggle=toc] { line-height: 1.2rem; > a { - font-weight: 600; + color: var(--text-color); &:hover { @extend %link-hover; @@ -338,23 +343,6 @@ nav[data-toggle=toc] { } } -@media all and (min-width: 768px) { - #core-wrapper { - h1 + .post-meta { - > div:not(:first-child)::before { - @include dot(0.5rem, 0.2rem); - } - - &.flex-column { - -webkit-box-orient: horizontal !important; - -webkit-box-direction: normal !important; - -ms-flex-direction: row !important; - flex-direction: row !important; - } - } - } // .post -} - /* Hide SideBar and TOC */ @media all and (max-width: 830px) { .post-navigation { diff --git a/assets/js/dist/home.min.js b/assets/js/dist/home.min.js index 6d4a4a4..36e44e3 100644 --- a/assets/js/dist/home.min.js +++ b/assets/js/dist/home.min.js @@ -3,4 +3,4 @@ * © 2019 Cotes Chung * MIT Licensed */ -$(function(){$(window).scroll(()=>{50<$(this).scrollTop()&&"none"===$("#sidebar-trigger").css("display")?$("#back-to-top").fadeIn():$("#back-to-top").fadeOut()}),$("#back-to-top").click(()=>($("body,html").animate({scrollTop:0},800),!1))}),$(function(){$("#mode-toggle-wrapper").keyup(e=>{13===e.keyCode&&flipMode()})}),$(function(){const e=$("#sidebar-trigger"),t=$("#search-trigger"),o=$("#search-cancel"),a=$("#search-cleaner"),n=$("#main"),l=$("#topbar-title"),s=$("#search-wrapper"),r=$("#search-result-wrapper"),d=$("#search-results"),i=$("#search-input"),c=$("#search-hints"),u=function(){let e=0;return{block(){e=window.scrollY,$("html,body").scrollTop(0)},release(){$("html,body").scrollTop(e)},getOffset(){return e}}}(),p={on(){e.addClass("unloaded"),l.addClass("unloaded"),t.addClass("unloaded"),s.addClass("d-flex"),o.addClass("loaded")},off(){o.removeClass("loaded"),s.removeClass("d-flex"),e.removeClass("unloaded"),l.removeClass("unloaded"),t.removeClass("unloaded")}},h=function(){let e=!1;return{on(){e||(u.block(),r.removeClass("unloaded"),n.addClass("unloaded"),e=!0)},off(){e&&(d.empty(),c.hasClass("unloaded")&&c.removeClass("unloaded"),r.addClass("unloaded"),a.removeClass("visible"),n.removeClass("unloaded"),u.release(),i.val(""),e=!1)},isVisible(){return e}}}();function f(){return o.hasClass("loaded")}t.click(function(){p.on(),h.on(),i.focus()}),o.click(function(){p.off(),h.off()}),i.focus(function(){s.addClass("input-focus")}),i.focusout(function(){s.removeClass("input-focus")}),i.on("keyup",function(e){8===e.keyCode&&""===i.val()?f()?c.removeClass("unloaded"):h.off():""!==i.val()&&(h.on(),a.hasClass("visible")||a.addClass("visible"),f()&&c.addClass("unloaded"))}),a.on("click",function(){i.val(""),f()?(c.removeClass("unloaded"),d.empty()):h.off(),i.focus(),a.removeClass("visible")})}),$(function(){var e=function(){const e="sidebar-display";let t=!1;const o=$("body");return{toggle(){!1===t?o.attr(e,""):o.removeAttr(e),t=!t}}}();$("#sidebar-trigger").click(e.toggle),$("#mask").click(e.toggle)}),$(function(){$('[data-toggle="tooltip"]').tooltip()}),$(function(){const t=$("#topbar-wrapper"),o=$("#toc-wrapper"),a=$(".access"),n=$("#search-input");let l,s=0;const r=t.outerHeight();$(window).scroll(function(e){$("#topbar-title").is(":hidden")&&(l=!0)}),setInterval(function(){l&&(function(){var e=$(this).scrollTop();Math.abs(s-e)<=5||(e>s&&e>r?(t.removeClass("topbar-down").addClass("topbar-up"),0h1"),o=e.text().trim();let a=(0{50<$(this).scrollTop()&&"none"===$("#sidebar-trigger").css("display")?$("#back-to-top").fadeIn():$("#back-to-top").fadeOut()}),$("#back-to-top").click(()=>($("body,html").animate({scrollTop:0},800),!1))}),$(function(){$("#mode-toggle-wrapper").keyup(t=>{13===t.keyCode&&flipMode()})}),$(function(){const t=$("#sidebar-trigger"),e=$("#search-trigger"),o=$("#search-cancel"),a=$("#search-cleaner"),s=$("#main"),n=$("#topbar-title"),l=$("#search-wrapper"),r=$("#search-result-wrapper"),d=$("#search-results"),i=$("#search-input"),c=$("#search-hints"),u=function(){let t=0;return{block(){t=window.scrollY,$("html,body").scrollTop(0)},release(){$("html,body").scrollTop(t)},getOffset(){return t}}}(),p={on(){t.addClass("unloaded"),n.addClass("unloaded"),e.addClass("unloaded"),l.addClass("d-flex"),o.addClass("loaded")},off(){o.removeClass("loaded"),l.removeClass("d-flex"),t.removeClass("unloaded"),n.removeClass("unloaded"),e.removeClass("unloaded")}},f=function(){let t=!1;return{on(){t||(u.block(),r.removeClass("unloaded"),s.addClass("unloaded"),t=!0)},off(){t&&(d.empty(),c.hasClass("unloaded")&&c.removeClass("unloaded"),r.addClass("unloaded"),a.removeClass("visible"),s.removeClass("unloaded"),u.release(),i.val(""),t=!1)},isVisible(){return t}}}();function h(){return o.hasClass("loaded")}e.click(function(){p.on(),f.on(),i.focus()}),o.click(function(){p.off(),f.off()}),i.focus(function(){l.addClass("input-focus")}),i.focusout(function(){l.removeClass("input-focus")}),i.on("keyup",function(t){8===t.keyCode&&""===i.val()?h()?c.removeClass("unloaded"):f.off():""!==i.val()&&(f.on(),a.hasClass("visible")||a.addClass("visible"),h()&&c.addClass("unloaded"))}),a.on("click",function(){i.val(""),h()?(c.removeClass("unloaded"),d.empty()):f.off(),i.focus(),a.removeClass("visible")})}),$(function(){var t=function(){const t="sidebar-display";let e=!1;const o=$("body");return{toggle(){!1===e?o.attr(t,""):o.removeAttr(t),e=!e}}}();$("#sidebar-trigger").click(t.toggle),$("#mask").click(t.toggle)}),$(function(){$('[data-toggle="tooltip"]').tooltip()}),$(function(){const e=$("#topbar-wrapper"),o=$("#toc-wrapper"),a=$(".access"),s=$("#search-input");let n,l=0;const r=e.outerHeight();$(window).scroll(function(t){$("#topbar-title").is(":hidden")&&(n=!0)}),setInterval(function(){n&&(function(){var t=$(this).scrollTop();Math.abs(l-t)<=5||(t>l&&t>r?(e.removeClass("topbar-down").addClass("topbar-up"),0h1"),o=t.text().trim();let a=(0{50<$(this).scrollTop()&&"none"===$("#sidebar-trigger").css("display")?$("#back-to-top").fadeIn():$("#back-to-top").fadeOut()}),$("#back-to-top").click(()=>($("body,html").animate({scrollTop:0},800),!1))}),$(function(){$("#mode-toggle-wrapper").keyup(t=>{13===t.keyCode&&flipMode()})}),$(function(){const t=$("#sidebar-trigger"),e=$("#search-trigger"),o=$("#search-cancel"),a=$("#search-cleaner"),n=$("#main"),l=$("#topbar-title"),r=$("#search-wrapper"),s=$("#search-result-wrapper"),i=$("#search-results"),c=$("#search-input"),d=$("#search-hints"),u=function(){let t=0;return{block(){t=window.scrollY,$("html,body").scrollTop(0)},release(){$("html,body").scrollTop(t)},getOffset(){return t}}}(),p={on(){t.addClass("unloaded"),l.addClass("unloaded"),e.addClass("unloaded"),r.addClass("d-flex"),o.addClass("loaded")},off(){o.removeClass("loaded"),r.removeClass("d-flex"),t.removeClass("unloaded"),l.removeClass("unloaded"),e.removeClass("unloaded")}},h=function(){let t=!1;return{on(){t||(u.block(),s.removeClass("unloaded"),n.addClass("unloaded"),t=!0)},off(){t&&(i.empty(),d.hasClass("unloaded")&&d.removeClass("unloaded"),s.addClass("unloaded"),a.removeClass("visible"),n.removeClass("unloaded"),u.release(),c.val(""),t=!1)},isVisible(){return t}}}();function f(){return o.hasClass("loaded")}e.click(function(){p.on(),h.on(),c.focus()}),o.click(function(){p.off(),h.off()}),c.focus(function(){r.addClass("input-focus")}),c.focusout(function(){r.removeClass("input-focus")}),c.on("keyup",function(t){8===t.keyCode&&""===c.val()?f()?d.removeClass("unloaded"):h.off():""!==c.val()&&(h.on(),a.hasClass("visible")||a.addClass("visible"),f()&&d.addClass("unloaded"))}),a.on("click",function(){c.val(""),f()?(d.removeClass("unloaded"),i.empty()):h.off(),c.focus(),a.removeClass("visible")})}),$(function(){var t=function(){const t="sidebar-display";let e=!1;const o=$("body");return{toggle(){!1===e?o.attr(t,""):o.removeAttr(t),e=!e}}}();$("#sidebar-trigger").click(t.toggle),$("#mask").click(t.toggle)}),$(function(){$('[data-toggle="tooltip"]').tooltip()}),$(function(){const e=$("#topbar-wrapper"),o=$("#toc-wrapper"),a=$(".access"),n=$("#search-input");let l,r=0;const s=e.outerHeight();$(window).scroll(function(t){$("#topbar-title").is(":hidden")&&(l=!0)}),setInterval(function(){l&&(function(){var t=$(this).scrollTop();Math.abs(r-t)<=5||(t>r&&t>s?(e.removeClass("topbar-down").addClass("topbar-up"),0h1"),o=t.text().trim();let a=(0 img[data-src],${t} img[data-src].preview-img`).each(function(){let t=$(this).next();var e="EM"===t.prop("tagName")?t.text():"",o=$(this).attr("data-src");$(this).wrap(``)}),$(".popup").magnificPopup({type:"image",closeOnContentClick:!0,showCloseBtn:!1,zoom:{enabled:!0,duration:300,easing:"ease-in-out"}}),$(t+" a").has("img").addClass("img-link")}}),$(function(){let n=$(".timeago").length,t=void 0;const l=$("meta[name=day-prompt]").attr("content"),r=$("meta[name=hour-prompt]").attr("content"),s=$("meta[name=minute-prompt]").attr("content"),i=$("meta[name=justnow-prompt]").attr("content");function e(){return $(".timeago").each(function(){if(0<$(this).children("i").length){var e=$(this).clone().children().remove().end().text();let t=$(this).children("i");var o=t.text();$(this).text(function(t,e){let o=new Date,a=new Date(t);return a.getFullYear()!==o.getFullYear()||a.getMonth()!==o.getMonth()?e:(t=Math.floor((o-a)/1e3),1<=(e=Math.floor(t/86400))?(--n,` ${e} `+l):1<=(e=Math.floor(t/3600))?` ${e} `+r:1<=(t=Math.floor(t/60))?` ${t} `+s:i)}(o,e)),$(this).append(t)}}),0===n&&void 0!==t&&clearInterval(t),n}0!==n&&0'),$("input[type=checkbox]:not([checked])").before('')}),$(function(){var t=".code-header>button";const e="timeout";function n(t){if($(t)[0].hasAttribute(e)){t=$(t).attr(e);if(Number(t)>Date.now())return 1}}function l(t){$(t).attr(e,Date.now()+2e3)}function r(t){$(t).removeAttr(e)}const o=new ClipboardJS(t,{target(t){let e=t.parentNode.nextElementSibling;return e.querySelector("code .rouge-code")}});$(t).tooltip({trigger:"hover",placement:"left"});const a=function(t){let e=$(t).children();return e.attr("class")}(t);o.on("success",t=>{t.clearSelection();const e=t.trigger;var o;n(e)||(function(t){let e=$(t),o=e.children();o.attr("class","fas fa-check")}(e),o=e,t=$(o).attr("title-succeed"),$(o).attr("data-original-title",t).tooltip("show"),l(e),setTimeout(()=>{var t;t=e,$(t).tooltip("hide").removeAttr("data-original-title"),function(t){let e=$(t),o=e.children();o.attr("class",a)}(e),r(e)},2e3))}),$("#copy-link").click(t=>{let e=$(t.target);if(!n(e)){t=window.location.href;const o=$("");$("body").append(o),o.val(t).select(),document.execCommand("copy"),o.remove();const a=e.attr("data-original-title");t=e.attr("title-succeed");e.attr("data-original-title",t).tooltip("show"),l(e),setTimeout(()=>{e.attr("data-original-title",a),r(e)},2e3)}})}),$(function(){$("a[href*='#']").not("[href='#']").not("[href='#0']").click(function(e){if(this.pathname.replace(/^\//,"")===location.pathname.replace(/^\//,"")&&location.hostname===this.hostname){const r=decodeURI(this.hash);let o=RegExp(/^#fnref:/).test(r),a=!o&&RegExp(/^#fn:/).test(r);var l=r.includes(":")?r.replace(/\:/g,"\\:"):r;let n=$(l);if(n.length){e.preventDefault(),history.pushState&&history.pushState(null,null,r);l=$(this).offset().top;let t=n.offset().top;e=t{const t=$(n);t.focus();var e="scroll-focus";if($(`[${e}=true]`).length&&$(`[${e}=true]`).attr(e,!1),$(":target").length&&$(":target").attr(e,!1),(a||o)&&t.attr(e,!0),t.is(":focus"))return!1;t.attr("tabindex","-1"),t.focus()})}}})}); \ No newline at end of file +$(function(){$(window).scroll(()=>{50<$(this).scrollTop()&&"none"===$("#sidebar-trigger").css("display")?$("#back-to-top").fadeIn():$("#back-to-top").fadeOut()}),$("#back-to-top").click(()=>($("body,html").animate({scrollTop:0},800),!1))}),$(function(){$("#mode-toggle-wrapper").keyup(t=>{13===t.keyCode&&flipMode()})}),$(function(){const t=$("#sidebar-trigger"),e=$("#search-trigger"),o=$("#search-cancel"),a=$("#search-cleaner"),n=$("#main"),l=$("#topbar-title"),r=$("#search-wrapper"),s=$("#search-result-wrapper"),i=$("#search-results"),c=$("#search-input"),d=$("#search-hints"),u=function(){let t=0;return{block(){t=window.scrollY,$("html,body").scrollTop(0)},release(){$("html,body").scrollTop(t)},getOffset(){return t}}}(),p={on(){t.addClass("unloaded"),l.addClass("unloaded"),e.addClass("unloaded"),r.addClass("d-flex"),o.addClass("loaded")},off(){o.removeClass("loaded"),r.removeClass("d-flex"),t.removeClass("unloaded"),l.removeClass("unloaded"),e.removeClass("unloaded")}},h=function(){let t=!1;return{on(){t||(u.block(),s.removeClass("unloaded"),n.addClass("unloaded"),t=!0)},off(){t&&(i.empty(),d.hasClass("unloaded")&&d.removeClass("unloaded"),s.addClass("unloaded"),a.removeClass("visible"),n.removeClass("unloaded"),u.release(),c.val(""),t=!1)},isVisible(){return t}}}();function f(){return o.hasClass("loaded")}e.click(function(){p.on(),h.on(),c.focus()}),o.click(function(){p.off(),h.off()}),c.focus(function(){r.addClass("input-focus")}),c.focusout(function(){r.removeClass("input-focus")}),c.on("keyup",function(t){8===t.keyCode&&""===c.val()?f()?d.removeClass("unloaded"):h.off():""!==c.val()&&(h.on(),a.hasClass("visible")||a.addClass("visible"),f()&&d.addClass("unloaded"))}),a.on("click",function(){c.val(""),f()?(d.removeClass("unloaded"),i.empty()):h.off(),c.focus(),a.removeClass("visible")})}),$(function(){var t=function(){const t="sidebar-display";let e=!1;const o=$("body");return{toggle(){!1===e?o.attr(t,""):o.removeAttr(t),e=!e}}}();$("#sidebar-trigger").click(t.toggle),$("#mask").click(t.toggle)}),$(function(){$('[data-toggle="tooltip"]').tooltip()}),$(function(){const e=$("#topbar-wrapper"),o=$("#toc-wrapper"),a=$(".access"),n=$("#search-input");let l,r=0;const s=e.outerHeight();$(window).scroll(function(t){$("#topbar-title").is(":hidden")&&(l=!0)}),setInterval(function(){l&&(function(){var t=$(this).scrollTop();Math.abs(r-t)<=5||(t>r&&t>s?(e.removeClass("topbar-down").addClass("topbar-up"),0h1"),o=t.text().trim();let a=(0 img[data-src],${t} img[data-src].preview-img`).each(function(){let t=$(this).next();var e="EM"===t.prop("tagName")?t.text():"",o=$(this).attr("data-src");$(this).wrap(``)}),$(".popup").magnificPopup({type:"image",closeOnContentClick:!0,showCloseBtn:!1,zoom:{enabled:!0,duration:300,easing:"ease-in-out"}}),$(t+" a").has("img").addClass("img-link")}}),$(function(){let o=$(".timeago").length,t=void 0;const n=$("meta[name=day-prompt]").attr("content"),l=$("meta[name=hour-prompt]").attr("content"),r=$("meta[name=minute-prompt]").attr("content"),s=$("meta[name=justnow-prompt]").attr("content");function e(){return $(".timeago").each(function(){var t,e;!1!==$(this)[0].hasAttribute("date")?(e=function(t,e){let o=new Date,a=new Date(t);return a.getFullYear()!==o.getFullYear()||a.getMonth()!==o.getMonth()?e:(t=Math.floor((o-a)/1e3),1<=(e=Math.floor(t/86400))?` ${e} `+n:1<=(e=Math.floor(t/3600))?` ${e} `+l:1<=(t=Math.floor(t/60))?` ${t} `+r:s)}($(this).attr("date"),t=$(this).text()))===t?$(this).removeAttr("date"):$(this).text(e):--o}),0===o&&void 0!==t&&clearInterval(t),o}0!==o&&0'),$("input[type=checkbox]:not([checked])").before('')}),$(function(){var t=".code-header>button";const e="timeout";function n(t){if($(t)[0].hasAttribute(e)){t=$(t).attr(e);if(Number(t)>Date.now())return 1}}function l(t){$(t).attr(e,Date.now()+2e3)}function r(t){$(t).removeAttr(e)}const o=new ClipboardJS(t,{target(t){let e=t.parentNode.nextElementSibling;return e.querySelector("code .rouge-code")}});$(t).tooltip({trigger:"hover",placement:"left"});const a=function(t){let e=$(t).children();return e.attr("class")}(t);o.on("success",t=>{t.clearSelection();const e=t.trigger;var o;n(e)||(function(t){let e=$(t),o=e.children();o.attr("class","fas fa-check")}(e),o=e,t=$(o).attr("title-succeed"),$(o).attr("data-original-title",t).tooltip("show"),l(e),setTimeout(()=>{var t;t=e,$(t).tooltip("hide").removeAttr("data-original-title"),function(t){let e=$(t),o=e.children();o.attr("class",a)}(e),r(e)},2e3))}),$("#copy-link").click(t=>{let e=$(t.target);if(!n(e)){t=window.location.href;const o=$("");$("body").append(o),o.val(t).select(),document.execCommand("copy"),o.remove();const a=e.attr("data-original-title");t=e.attr("title-succeed");e.attr("data-original-title",t).tooltip("show"),l(e),setTimeout(()=>{e.attr("data-original-title",a),r(e)},2e3)}})}),$(function(){$("a[href*='#']").not("[href='#']").not("[href='#0']").click(function(e){if(this.pathname.replace(/^\//,"")===location.pathname.replace(/^\//,"")&&location.hostname===this.hostname){const r=decodeURI(this.hash);let o=RegExp(/^#fnref:/).test(r),a=!o&&RegExp(/^#fn:/).test(r);var l=r.includes(":")?r.replace(/\:/g,"\\:"):r;let n=$(l);if(n.length){e.preventDefault(),history.pushState&&history.pushState(null,null,r);l=$(this).offset().top;let t=n.offset().top;e=t{const t=$(n);t.focus();var e="scroll-focus";if($(`[${e}=true]`).length&&$(`[${e}=true]`).attr(e,!1),$(":target").length&&$(":target").attr(e,!1),(a||o)&&t.attr(e,!0),t.is(":focus"))return!1;t.attr("tabindex","-1"),t.focus()})}}})}); \ No newline at end of file From e2003f2b0367db79b551eba6dbafdc1f71e1e53d Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 5 Dec 2021 02:29:40 +0800 Subject: [PATCH 3/5] Add a link to the author of the post --- _layouts/post.html | 17 ++++++++++++++++- _posts/2019-08-08-text-and-typography.md | 4 +++- _posts/2019-08-08-write-a-new-post.md | 4 +++- _posts/2019-08-09-getting-started.md | 4 +++- _posts/2019-08-11-customize-the-favicon.md | 4 +++- _posts/2021-01-03-enable-google-pv.md | 4 +++- _sass/addon/commons.scss | 2 -- _sass/layout/post.scss | 16 ++++++++++++++-- 8 files changed, 45 insertions(+), 10 deletions(-) diff --git a/_layouts/post.html b/_layouts/post.html index 528412b..188c930 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -16,8 +16,23 @@ tail_includes:
+ {% capture author_name %}{{ page.author.name | default: site.social.name }}{% endcapture %} + {% assign author_link = nil %} + + {% if page.author.link %} + {% assign author_link = page.author.link %} + {% elsif author_name == site.social.name %} + {% assign author_link = site.social.links[0] %} + {% endif %} + {{ site.data.locales[lang].post.written_by }} - {{ page.author | default: site.social.name }} + + {% if author_link %} + {{ author_name }} + {% else %} + {{ author_name }} + {% endif %} +
diff --git a/_posts/2019-08-08-text-and-typography.md b/_posts/2019-08-08-text-and-typography.md index 762ad5a..bc1f553 100644 --- a/_posts/2019-08-08-text-and-typography.md +++ b/_posts/2019-08-08-text-and-typography.md @@ -1,6 +1,8 @@ --- title: Text and Typography -author: Cotes Chung +author: + name: Cotes Chung + link: https://github.com/cotes2020 date: 2019-08-08 11:33:00 +0800 categories: [Blogging, Demo] tags: [typography] diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index c750234..9ea249b 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -1,6 +1,8 @@ --- title: Writing a New Post -author: Cotes Chung +author: + name: Cotes Chung + link: https://github.com/cotes2020 date: 2019-08-08 14:10:00 +0800 categories: [Blogging, Tutorial] tags: [writing] diff --git a/_posts/2019-08-09-getting-started.md b/_posts/2019-08-09-getting-started.md index 3596dde..59108d2 100644 --- a/_posts/2019-08-09-getting-started.md +++ b/_posts/2019-08-09-getting-started.md @@ -1,6 +1,8 @@ --- title: Getting Started -author: Cotes Chung +author: + name: Cotes Chung + link: https://github.com/cotes2020 date: 2019-08-09 20:55:00 +0800 categories: [Blogging, Tutorial] tags: [getting started] diff --git a/_posts/2019-08-11-customize-the-favicon.md b/_posts/2019-08-11-customize-the-favicon.md index d5d70b3..dca8f5c 100644 --- a/_posts/2019-08-11-customize-the-favicon.md +++ b/_posts/2019-08-11-customize-the-favicon.md @@ -1,6 +1,8 @@ --- title: Customize the Favicon -author: Cotes Chung +author: + name: Cotes Chung + link: https://github.com/cotes2020 date: 2019-08-11 00:34:00 +0800 categories: [Blogging, Tutorial] tags: [favicon] diff --git a/_posts/2021-01-03-enable-google-pv.md b/_posts/2021-01-03-enable-google-pv.md index de3c3f7..c9883a6 100644 --- a/_posts/2021-01-03-enable-google-pv.md +++ b/_posts/2021-01-03-enable-google-pv.md @@ -1,6 +1,8 @@ --- title: Enable Google Page Views -author: Dinesh Prasanth Moluguwan Krishnamoorthy +author: + name: Dinesh Prasanth Moluguwan Krishnamoorthy + link: https://github.com/SilleBille date: 2021-01-03 18:32:00 -0500 categories: [Blogging, Tutorial] tags: [google analytics, pageviews] diff --git a/_sass/addon/commons.scss b/_sass/addon/commons.scss index 35eaf7e..2834866 100644 --- a/_sass/addon/commons.scss +++ b/_sass/addon/commons.scss @@ -395,8 +395,6 @@ i { // fontawesome icons word-spacing: 1px; a { - @extend %link-underline; - &:not(:last-child) { margin-right: 2px; } diff --git a/_sass/layout/post.scss b/_sass/layout/post.scss index 91562e0..2cb10e5 100644 --- a/_sass/layout/post.scss +++ b/_sass/layout/post.scss @@ -22,13 +22,21 @@ padding-right: $pr; } +%text-color { + color: var(--text-color); +} + h1 + .post-meta { span + span::before { @include dot; } em { - color: var(--text-color); + @extend %text-color; + + a { + @extend %text-color; + } } } @@ -45,6 +53,10 @@ h1 + .post-meta { margin-top: 6rem; border-bottom: 1px double var(--main-border-color); font-size: 0.85rem; + + .post-meta a { + @extend %link-underline; + } } .post-tags { @@ -179,7 +191,7 @@ nav[data-toggle=toc] { transition: all 0.3s ease-in-out; h3 { - color: var(--text-color); + @extend %text-color; } &:hover { From 36f55f091da53652dc4b3f748a84a791110339d0 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 5 Dec 2021 02:30:22 +0800 Subject: [PATCH 4/5] Add content to the tutorial --- _posts/2019-08-08-write-a-new-post.md | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/_posts/2019-08-08-write-a-new-post.md b/_posts/2019-08-08-write-a-new-post.md index 9ea249b..abe698e 100644 --- a/_posts/2019-08-08-write-a-new-post.md +++ b/_posts/2019-08-08-write-a-new-post.md @@ -9,9 +9,11 @@ tags: [writing] render_with_liquid: false --- +This post will guide you how to write a post on _Chirpy_ theme. Even if you have previous experience with Jekyll, this article is worth reading, because many features require specific variables to be set. + ## Naming and Path -Create a new file named `YYYY-MM-DD-TITLE.EXTENSION` and put it in the `_posts/` of the root directory. Please note that the `EXTENSION` must be one of `md` and `markdown`. +Create a new file named `YYYY-MM-DD-TITLE.EXTENSION` and put it in the `_posts` of the root directory. Please note that the `EXTENSION` must be one of `md` and `markdown`. If you want to save time of creating files, please consider using the plugin [`Jekyll-Compose`](https://github.com/jekyll/jekyll-compose) to accomplish this. ## Front Matter @@ -26,9 +28,9 @@ tags: [TAG] # TAG names should always be lowercase --- ``` -> **Note**: The posts' ***layout*** has been set to `post` by default, so there is no need to add the variable ***layout*** in the Front Matter block. +> **Note**: The posts' _layout_ has been set to `post` by default, so there is no need to add the variable _layout_ in the Front Matter block. -### Timezone of date +### Timezone of Date In order to accurately record the release date of a post, you should not only set up the `timezone` of `_config.yml` but also provide the post's timezone in variable `date` of its Front Matter block. Format: `+/-TTTT`, e.g. `+0800`. @@ -40,6 +42,17 @@ The `categories` of each post are designed to contain up to two elements, and th categories: [Animal, Insect] tags: [bee] ``` +### Author Information + +The author information of the post usually does not need to be filled in the _Front Matter_ , they will be obtained from variables `social.name` and the first entry of `social.links` of the configuration file by default. But you can also override it as follows: + +```yaml +--- +author: + name: Full Name + url: https://example.com +--- +``` ## Table of Contents From afcf0bde22505fe6a12e71251032e68d8d05d3f2 Mon Sep 17 00:00:00 2001 From: Cotes Chung <11371340+cotes2020@users.noreply.github.com> Date: Sun, 5 Dec 2021 03:23:00 +0800 Subject: [PATCH 5/5] Refactor footer style --- _includes/footer.html | 2 +- _sass/addon/commons.scss | 4 +--- _sass/colors/dark-typography.scss | 5 ----- _sass/colors/light-typography.scss | 3 --- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/_includes/footer.html b/_includes/footer.html index 582cb4c..29aa129 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,7 +3,7 @@ -->