From 9b5fc3172e27a8a7f994b14cb04130e63b2266b8 Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 21:15:18 +0800 Subject: [PATCH 1/9] fix baseurl problem --- _config.yml | 2 +- _includes/head.html | 8 ++++---- _includes/post-head.html | 8 ++++---- _layouts/default.html | 4 ++-- _layouts/post.html | 10 +++++----- assets/js/index.min.js | 2 +- dev/js/index.js | 4 ++-- index.html | 2 +- rss.xml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/_config.yml b/_config.yml index b3b02eb77..5a834f091 100644 --- a/_config.yml +++ b/_config.yml @@ -5,7 +5,7 @@ keyword: '廖柯宇, 廖柯宇的独立博客, 廖柯宇的博客, 前端, 前 url: '' # your host # if you don't need baseurl, you should leave this value blank. -baseurl: '' +baseurl: '/blog' # Navigation links nav: diff --git a/_includes/head.html b/_includes/head.html index 380937eb0..ae7cfab3e 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -13,9 +13,9 @@ - - - - + + + + diff --git a/_includes/post-head.html b/_includes/post-head.html index e43a9ed6d..570511baf 100644 --- a/_includes/post-head.html +++ b/_includes/post-head.html @@ -13,10 +13,10 @@ - - - - + + + + {% if site.mathjax %} diff --git a/_layouts/default.html b/_layouts/default.html index 1aa216d4d..f9551e386 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -10,7 +10,7 @@ {{ content }} - - + + diff --git a/_layouts/post.html b/_layouts/post.html index be2e97ab0..be85047de 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -16,7 +16,7 @@
{% if page.tags.size > 0 %} {% for tag in page.tags %} - {{ tag }} + {{ tag }} {% endfor %} {% endif %}
@@ -51,7 +51,7 @@

{{ page.subtitle }}

- +
@@ -107,7 +107,7 @@

{{ page.subtitle }}

{% include footer.html %} - + {% endif %} - - + + diff --git a/assets/js/index.min.js b/assets/js/index.min.js index 0afe1aef5..f350f8012 100644 --- a/assets/js/index.min.js +++ b/assets/js/index.min.js @@ -1 +1 @@ -$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({background:"url(/assets/icons/logo_"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({background:"url(/assets/icons/logo.svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file +$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({background:"url({{ "/sub/page/" | relative_url }}/assets/icons/logo_"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({background:"url({{ "/sub/page/" | relative_url }}/assets/icons/logo.svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file diff --git a/dev/js/index.js b/dev/js/index.js index a59514d92..dff274cb6 100644 --- a/dev/js/index.js +++ b/dev/js/index.js @@ -41,7 +41,7 @@ $(document).ready(function(){ 'box-shadow': '0 1px 12px rgba(0, 0, 0, .08)' }); logo.css({ - 'background': 'url(/assets/icons/logo_' + themeStyle + '.svg) no-repeat center', + 'background': 'url({{ "/sub/page/" | relative_url }}/assets/icons/logo_' + themeStyle + '.svg) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#666'); @@ -53,7 +53,7 @@ $(document).ready(function(){ 'box-shadow': 'none' }); logo.css({ - 'background': 'url(/assets/icons/logo.svg) no-repeat center', + 'background': 'url({{ "/sub/page/" | relative_url }}/assets/icons/logo.svg) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#fff'); diff --git a/index.html b/index.html index 9d85afe61..f96b9405a 100644 --- a/index.html +++ b/index.html @@ -39,7 +39,7 @@

{{ post.subtitle }}

{% if post.tags.size > 0 %} {% for tag in post.tags %} - {{ tag }} + {{ tag }} {% endfor %} {% endif %}
diff --git a/rss.xml b/rss.xml index 022378beb..d14c5a50d 100644 --- a/rss.xml +++ b/rss.xml @@ -6,7 +6,7 @@ layout: null {{ site.title | xml_escape }} {{ site.description | xml_escape }} - {{ site.url }}{{ site.baseurl }}/ + {{ site.url }}{{ "/sub/page/" | relative_url }}/ {{ site.time | date_to_rfc822 }} {{ site.time | date_to_rfc822 }} From 1701e7709ebd3015e3f947e96e76fcd91071219b Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 21:35:58 +0800 Subject: [PATCH 2/9] update baseurl to relative_url --- _includes/head.html | 8 ++++---- _includes/post-head.html | 8 ++++---- _layouts/default.html | 4 ++-- _layouts/post.html | 20 ++++++++++---------- assets/js/index.min.js | 2 +- dev/js/index.js | 4 ++-- index.html | 14 +++++++------- rss.xml | 8 ++++---- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index ae7cfab3e..b8e689e09 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -13,9 +13,9 @@ - - - - + + + + diff --git a/_includes/post-head.html b/_includes/post-head.html index 570511baf..89ea8a24c 100644 --- a/_includes/post-head.html +++ b/_includes/post-head.html @@ -13,10 +13,10 @@ - - - - + + + + {% if site.mathjax %} diff --git a/_layouts/default.html b/_layouts/default.html index f9551e386..211f8aa68 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -10,7 +10,7 @@ {{ content }}
- - + + diff --git a/_layouts/post.html b/_layouts/post.html index be85047de..eeb82d946 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -16,7 +16,7 @@
{% if page.tags.size > 0 %} {% for tag in page.tags %} - {{ tag }} + {{ tag }} {% endfor %} {% endif %}
@@ -28,7 +28,7 @@

{{ page.title }}

{% if page.cover %}
-
+
{% endif %} @@ -51,7 +51,7 @@

{{ page.subtitle }}

- +
@@ -72,28 +72,28 @@

{{ page.subtitle }}

{% if page.next.url %}
- +
{{ page.next.title }}

{{ page.next.excerpt | strip_html | strip_newlines | truncate: 60}}

{% if page.next.cover %}
- + {% endif %}
{% endif %} {% if page.previous.url %}
- +
{{ page.previous.title }}

{{ page.previous.excerpt | strip_html | strip_newlines | truncate: 60}}

{% if page.previous.cover %}
- + {% endif %}
{% endif %} @@ -107,7 +107,7 @@

{{ page.subtitle }}

{% include footer.html %} - + {% endif %} - - + + diff --git a/assets/js/index.min.js b/assets/js/index.min.js index f350f8012..3026f7b75 100644 --- a/assets/js/index.min.js +++ b/assets/js/index.min.js @@ -1 +1 @@ -$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({background:"url({{ "/sub/page/" | relative_url }}/assets/icons/logo_"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({background:"url({{ "/sub/page/" | relative_url }}/assets/icons/logo.svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file +$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({background:"url({{ "/" | relative_url }}/assets/icons/logo_"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({background:"url({{ "/" | relative_url }}/assets/icons/logo.svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file diff --git a/dev/js/index.js b/dev/js/index.js index dff274cb6..3292ae34a 100644 --- a/dev/js/index.js +++ b/dev/js/index.js @@ -41,7 +41,7 @@ $(document).ready(function(){ 'box-shadow': '0 1px 12px rgba(0, 0, 0, .08)' }); logo.css({ - 'background': 'url({{ "/sub/page/" | relative_url }}/assets/icons/logo_' + themeStyle + '.svg) no-repeat center', + 'background': 'url({{ "/" | relative_url }}/assets/icons/logo_' + themeStyle + '.svg) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#666'); @@ -53,7 +53,7 @@ $(document).ready(function(){ 'box-shadow': 'none' }); logo.css({ - 'background': 'url({{ "/sub/page/" | relative_url }}/assets/icons/logo.svg) no-repeat center', + 'background': 'url({{ "/" | relative_url }}/assets/icons/logo.svg) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#fff'); diff --git a/index.html b/index.html index f96b9405a..ce7ba7a1e 100644 --- a/index.html +++ b/index.html @@ -9,7 +9,7 @@

{{ page.home-title }}

{{ page.description }}

@@ -21,12 +21,12 @@

{{ page.description }}

{% if post.cover %}
- - + +
{% endif %}
- +

{{ post.title }}

{% if post.subtitle %}

{{ post.subtitle }}

@@ -39,7 +39,7 @@

{{ post.subtitle }}

{% if post.tags.size > 0 %} {% for tag in post.tags %} - {{ tag }} + {{ tag }} {% endfor %} {% endif %}
@@ -58,7 +58,7 @@

{{ post.subtitle }}

- +
@@ -83,7 +83,7 @@

{{ post.subtitle }}

{% if forloop.index > site.recommend-condition-size %} {% break %} {% endif %} - {{ tag[0]}} + {{ tag[0]}} {% endfor %}
{% endif %} diff --git a/rss.xml b/rss.xml index d14c5a50d..5efa9a20a 100644 --- a/rss.xml +++ b/rss.xml @@ -6,8 +6,8 @@ layout: null {{ site.title | xml_escape }} {{ site.description | xml_escape }} - {{ site.url }}{{ "/sub/page/" | relative_url }}/ - + {{ site.url }}{{ "/" | relative_url }}/ + {{ site.time | date_to_rfc822 }} {{ site.time | date_to_rfc822 }} Jekyll v{{ jekyll.version }} @@ -16,8 +16,8 @@ layout: null {{ post.title | xml_escape }} {{ post.content | xml_escape }} {{ post.date | date_to_rfc822 }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} - {{ post.url | prepend: site.baseurl | prepend: site.url }} + {{ post.url | relative_url | prepend: site.url }} + {{ post.url | relative_url | prepend: site.url }} {% for tag in post.tags %} {{ tag | xml_escape }} {% endfor %} From 25476e2cd857d53565d1e7ca854dd6480e112cc4 Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 21:59:25 +0800 Subject: [PATCH 3/9] fixed relative_url --- _includes/head.html | 8 ++++---- _includes/post-head.html | 8 ++++---- _layouts/default.html | 4 ++-- _layouts/post.html | 6 +++--- assets/js/index.min.js | 2 +- dev/js/index.js | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index b8e689e09..93fd069a6 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -13,9 +13,9 @@ - - - - + + + + diff --git a/_includes/post-head.html b/_includes/post-head.html index 89ea8a24c..4406eaf05 100644 --- a/_includes/post-head.html +++ b/_includes/post-head.html @@ -13,10 +13,10 @@ - - - - + + + + {% if site.mathjax %} diff --git a/_layouts/default.html b/_layouts/default.html index 211f8aa68..bc3595244 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -10,7 +10,7 @@ {{ content }}
- - + + diff --git a/_layouts/post.html b/_layouts/post.html index eeb82d946..9f7d69884 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -107,7 +107,7 @@

{{ page.subtitle }}

{% include footer.html %} - + {% endif %} - - + + diff --git a/assets/js/index.min.js b/assets/js/index.min.js index 3026f7b75..d2e8a9d6c 100644 --- a/assets/js/index.min.js +++ b/assets/js/index.min.js @@ -1 +1 @@ -$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({background:"url({{ "/" | relative_url }}/assets/icons/logo_"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({background:"url({{ "/" | relative_url }}/assets/icons/logo.svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file +$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({background:"url({{ '/assets/icons/logo_' | relative_url }}"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({background:"url({{ '/assets/icons/logo.svg' | relative_url }}) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file diff --git a/dev/js/index.js b/dev/js/index.js index 3292ae34a..cc30ec474 100644 --- a/dev/js/index.js +++ b/dev/js/index.js @@ -41,7 +41,7 @@ $(document).ready(function(){ 'box-shadow': '0 1px 12px rgba(0, 0, 0, .08)' }); logo.css({ - 'background': 'url({{ "/" | relative_url }}/assets/icons/logo_' + themeStyle + '.svg) no-repeat center', + 'background': 'url({{ "/assets/icons/logo_" | relative_url }}' + themeStyle + '.svg) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#666'); @@ -53,7 +53,7 @@ $(document).ready(function(){ 'box-shadow': 'none' }); logo.css({ - 'background': 'url({{ "/" | relative_url }}/assets/icons/logo.svg) no-repeat center', + 'background': 'url({{ "/assets/icons/logo.svg" | relative_url }}) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#fff'); From 4b981d685aed2e5fe2390cc6af7750a2220c0857 Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 22:01:28 +0800 Subject: [PATCH 4/9] fix baseurl --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 5a834f091..b3b02eb77 100644 --- a/_config.yml +++ b/_config.yml @@ -5,7 +5,7 @@ keyword: '廖柯宇, 廖柯宇的独立博客, 廖柯宇的博客, 前端, 前 url: '' # your host # if you don't need baseurl, you should leave this value blank. -baseurl: '/blog' +baseurl: '' # Navigation links nav: From 1c32a40e438ab1848cdec437e40f5d5801d3cd51 Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 23:14:16 +0800 Subject: [PATCH 5/9] add some comments to the baseurl --- _config.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index b3b02eb77..f809f4e62 100644 --- a/_config.yml +++ b/_config.yml @@ -4,7 +4,14 @@ description: '昵称悟空，千禧一代，前端开发者/伪极客/灵魂摄 keyword: '廖柯宇, 廖柯宇的独立博客, 廖柯宇的博客, 前端, 前端开发, 前端博客, javascript, vuejs, nodejs, 设计' url: '' # your host -# if you don't need baseurl, you should leave this value blank. +# when build blog on server, if you don't need baseurl, you should leave this value blank. +# 在服务器上建站时，如果你不需要子域名，请将这一格留空 +# if you're using GitHub Pages, set baseurl to your blog's . +# 如果你在使用 GitHub Pages, 请将 baseurl 设置为你的网址的子域名 +# for example, if your site is "kaeyleo.github.io", then this url should leave blank. +# 例如，当你的域名是 "kaeyleo.github.io" 时，这个 url 需要留空 +# but if your created a repo named "myblog", and the site is "kaeyleo.github.io/myblog", change baseurl to '/myblog' +# 但是，如果你创建了一个叫 "myblog" 的网站，此时网址会变成 "kaeyleo.github.io/myblog" ，这时再将 baseurl 设置为 '/myblog' baseurl: '' # Navigation links From 0898607072d3694ea54a66d787439d2a9fd09e11 Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 23:33:06 +0800 Subject: [PATCH 6/9] test --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index f809f4e62..bb4ac48ae 100644 --- a/_config.yml +++ b/_config.yml @@ -12,7 +12,7 @@ url: '' # your host # 例如，当你的域名是 "kaeyleo.github.io" 时，这个 url 需要留空 # but if your created a repo named "myblog", and the site is "kaeyleo.github.io/myblog", change baseurl to '/myblog' # 但是，如果你创建了一个叫 "myblog" 的网站，此时网址会变成 "kaeyleo.github.io/myblog" ，这时再将 baseurl 设置为 '/myblog' -baseurl: '' +baseurl: '/jekyll-theme-H2O' # Navigation links nav: From a4a86695c67d0888ef09a70e0ec0327cb806bd7e Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 23:39:11 +0800 Subject: [PATCH 7/9] fixed url --- _includes/header.html | 2 +- search.json | 2 +- tags.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 09c5675d3..61b6b5884 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -6,7 +6,7 @@ diff --git a/search.json b/search.json index a99865c06..a07cff3d9 100644 --- a/search.json +++ b/search.json @@ -7,7 +7,7 @@ layout: null { "title" : "{{ post.title | escape }}", "tags" : "{% for tag in post.tags %}{% if forloop.rindex != 1 %}{{ tag }} {% else %}{{ tag }}{% endif %}{% endfor %}", - "url" : "{{ post.url }}" + "url" : "{{ post.url | relative_url }}" } {% unless forloop.last %},{% endunless %} {% endfor %} ] \ No newline at end of file diff --git a/tags.html b/tags.html index 01157846d..36164e1ca 100644 --- a/tags.html +++ b/tags.html @@ -24,7 +24,7 @@

TAGS

  • 「{{ tag[0] }}」 {% for post in tag[1] %} - {{ post.title }} + {{ post.title }} {% endfor %}
    • {% endfor%} From 7a276cf8422ab129e3ae9911d6f24bc647fcc49b Mon Sep 17 00:00:00 2001 From: cometeme Date: Fri, 17 May 2019 23:40:27 +0800 Subject: [PATCH 8/9] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index bb4ac48ae..f809f4e62 100644 --- a/_config.yml +++ b/_config.yml @@ -12,7 +12,7 @@ url: '' # your host # 例如，当你的域名是 "kaeyleo.github.io" 时，这个 url 需要留空 # but if your created a repo named "myblog", and the site is "kaeyleo.github.io/myblog", change baseurl to '/myblog' # 但是，如果你创建了一个叫 "myblog" 的网站，此时网址会变成 "kaeyleo.github.io/myblog" ，这时再将 baseurl 设置为 '/myblog' -baseurl: '/jekyll-theme-H2O' +baseurl: '' # Navigation links nav: From ff4a63ccd069e9a8389a6b2a88d4edfe47a71a61 Mon Sep 17 00:00:00 2001 From: cometeme Date: Sat, 18 May 2019 17:22:03 +0800 Subject: [PATCH 9/9] fix index.js --- assets/js/index.min.js | 2 +- dev/js/index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/js/index.min.js b/assets/js/index.min.js index d2e8a9d6c..eb63b7da5 100644 --- a/assets/js/index.min.js +++ b/assets/js/index.min.js @@ -1 +1 @@ -$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({background:"url({{ '/assets/icons/logo_' | relative_url }}"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({background:"url({{ '/assets/icons/logo.svg' | relative_url }}) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file +$(document).ready(function(){function e(e,a){var t=e.width(),n=a.width(),o=e.height(),s=a.height();if(o695){var s=$(".g-header"),r=s.outerHeight(),c=$(".g-logo"),i=o.find("a"),l=$(".g-banner").attr("data-theme"),u=$(document).scrollTop();$(document).scroll(function(){var e=$(this).scrollTop(),a="nav-"+l;e>r?(e>3*r&&s.addClass("headerUp"),s.css({"background-color":"rgba(255, 255, 255, .98)","box-shadow":"0 1px 12px rgba(0, 0, 0, .08)"}),c.css({'background':"url(/assets/icons/logo_"+l+".svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#666"),o.addClass(a)):(s.removeClass("headerUp"),s.css({"background-color":"transparent","box-shadow":"none"}),c.css({'background':"url(/assets/icons/logo.svg) no-repeat center","background-size":"100% 100%"}),i.css("color","#fff"),o.removeClass(a)),u>e?s.addClass("headerDown"):s.removeClass("headerDown"),u=e})}$(".read-next-item section").each(function(){var e=$(this).height(),a=$(".read-next-item").height();$(this).css("margin-top",(a-e)/2+"px"),$(this).fadeIn()}),$(".read-next-item img").each(function(){e($(this),$(".read-next-item"))}),function(){for(var e=parseInt($("#total_pages").val()),a=parseInt($("#current_pages").val()),t=$("#base_url").val(),n="",o=a-3;o0&&1!==o?n+=''+o+"":1===o&&(n+=''+o+"");n+=''+a+"";for(var s=a+1;s<=a+3;s++)s<=e&&(n+=''+s+"");$("#page-link-container").html(n)}(),a.prototype.autoComplete=function(){var e=this.value.toLowerCase();e.length?$(".icon-search").css("color","#3199DB"):$(".icon-search").css("color","#CAD3DC"),$.getJSON("../../search.json").done(function(a){var t="";for(var n in a){var o=a[n],s=o.title,r=o.tags,c=(o.url,s+r);""!==e&&c.toLowerCase().indexOf(e)>=0&&(t+=''+o.title+"")}$(".search_result").html(t)})},new a,"true"===$("#nm-switch").val()&&function(){var e=$("body"),a=new Date,t=a.getHours();(t>=0&&t<=6||23===t)&&e.addClass("night-mode")}(),$(".post-content").on("mouseup",function(e){var a=window.getSelection();a.toString().length>=30&&n(a)})}); \ No newline at end of file diff --git a/dev/js/index.js b/dev/js/index.js index cc30ec474..a59514d92 100644 --- a/dev/js/index.js +++ b/dev/js/index.js @@ -41,7 +41,7 @@ $(document).ready(function(){ 'box-shadow': '0 1px 12px rgba(0, 0, 0, .08)' }); logo.css({ - 'background': 'url({{ "/assets/icons/logo_" | relative_url }}' + themeStyle + '.svg) no-repeat center', + 'background': 'url(/assets/icons/logo_' + themeStyle + '.svg) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#666'); @@ -53,7 +53,7 @@ $(document).ready(function(){ 'box-shadow': 'none' }); logo.css({ - 'background': 'url({{ "/assets/icons/logo.svg" | relative_url }}) no-repeat center', + 'background': 'url(/assets/icons/logo.svg) no-repeat center', 'background-size': '100% 100%' }); navText.css('color', '#fff');