Skip to content

Commit 5dfe82c

Browse files
stevenjoezhangstevenjoezhang
authored
Fix #181 and #333 (#534)
* Fix #181 * Fix #181
1 parent be776ca commit 5dfe82c

File tree

3 files changed

+36
-40
lines changed

3 files changed

+36
-40
lines changed

‎_config.yml‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ menu_settings:
151151
icons: true
152152
badges: false
153153

154+
154155
# ---------------------------------------------------------------
155156
# Scheme Settings
156157
# ---------------------------------------------------------------
@@ -252,13 +253,10 @@ sidebar:
252253

253254
# Sidebar offset from top menubar in pixels (only for Pisces | Gemini).
254255
offset: 12
255-
256256
# Back to top in sidebar (only for Pisces | Gemini).
257257
b2t: false
258-
259258
# Scroll percent label in b2t button.
260259
scrollpercent: false
261-
262260
# Enable sidebar on narrow view (only for Muse | Mist).
263261
onmobile: false
264262

@@ -370,8 +368,8 @@ android_chrome_color: "#222"
370368
# Custom Logo.
371369
# Do not support Scheme Mist currently.
372370
# Options:
373-
# enabled: [true/false] - Replace with specific image
374-
# image: url-of-image - Images's url
371+
# enabled: If true, will enable custom logo
372+
# image: Images's url, replace it with specific image
375373
custom_logo:
376374
enabled: false
377375
image:
@@ -524,7 +522,6 @@ changyan:
524522
appid:
525523
appkey:
526524

527-
528525
# Valine.
529526
# You can get your appid and appkey from https://leancloud.cn
530527
# more info please open https://valine.js.org
@@ -634,7 +631,7 @@ needmoreshare2:
634631

635632
# Application Insights
636633
# See https://azure.microsoft.com/en-us/services/application-insights
637-
# application_insights:
634+
#application_insights:
638635

639636
# Post widgets & FB/VK comments settings.
640637
# ---------------------------------------------------------------
@@ -706,14 +703,12 @@ busuanzi_count:
706703
post_views: true
707704
post_views_icon: eye
708705

709-
710706
# Tencent analytics ID
711707
#tencent_analytics:
712708

713709
# Tencent MTA ID
714710
#tencent_mta:
715711

716-
717712
# Enable baidu push so that the blog will push the url to baidu automatically which is very helpful for SEO
718713
baidu_push: false
719714

@@ -877,9 +872,8 @@ canvas_lines: false
877872
# canvas_sphere
878873
canvas_sphere: false
879874

880-
# Only fit scheme Pisces
881-
# Dependencies: https://github.com/theme-next/theme-next-canvas-ribbon
882875
# Canvas-ribbon
876+
# Dependencies: https://github.com/theme-next/theme-next-canvas-ribbon
883877
# size: The width of the ribbon.
884878
# alpha: The transparency of the ribbon.
885879
# zIndex: The display level of the ribbon.
@@ -1040,15 +1034,15 @@ vendors:
10401034
# Internal version: 1.4.0
10411035
# See: https://github.com/gitalk/gitalk
10421036
# Example:
1043-
# gitalk_js: https://cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.min.js
1044-
# gitalk_css: https://cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.css
1037+
# gitalk_js: //cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.min.js
1038+
# gitalk_css: //cdn.jsdelivr.net/npm/gitalk@1.4.0/dist/gitalk.css
10451039
gitalk_js:
10461040
gitalk_css:
10471041

10481042
# Internal version: 0.7.3
10491043
# See: https://github.com/emn178/js-md5
10501044
# Example:
1051-
# md5: https://cdn.jsdelivr.net/npm/js-md5@0.7.3/src/md5.min.js
1045+
# md5: //cdn.jsdelivr.net/npm/js-md5@0.7.3/src/md5.min.js
10521046
md5:
10531047

10541048
# Assets

‎layout/_macro/post.swig‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,14 @@
316316
{{ __('post.read_more') }} »
317317
</a>
318318
</div>
319-
{% endif %}
319+
{% endif %}
320320
<!--/noindex-->
321321
{% elif theme.auto_excerpt.enable %}
322-
{% set content = post.content | striptags %}
323-
{{ content.substring(0, theme.auto_excerpt.length) }}
324-
{% if content.length > theme.auto_excerpt.length %}...{% endif %}
322+
{% set content = post.content | replace('<td class="gutter">.*?</td>', "", "g") | striptags %}
323+
<p>
324+
{{ content.substring(0, theme.auto_excerpt.length) }}
325+
{% if content.length > theme.auto_excerpt.length %}...{% endif %}
326+
</p>
325327
<!--noindex-->
326328
{% if theme.read_more_btn %}
327329
<div class="post-button text-center">

‎layout/_scripts/vendors.swig‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,59 +7,59 @@
77
</script>
88

99
{% set js_vendors = {} %}
10-
{% set js_vendors.jquery = 'jquery/index.js?v=2.1.3' %}
10+
{% set js_vendors.jquery = 'jquery/index.js?v=2.1.3' %}
1111

1212
{% if theme.fastclick %}
13-
{% set js_vendors.fastclick = 'fastclick/lib/fastclick.min.js?v=1.0.6' %}
13+
{% set js_vendors.fastclick = 'fastclick/lib/fastclick.min.js?v=1.0.6' %}
1414
{% endif %}
1515

1616
{% if theme.lazyload %}
17-
{% set js_vendors.lazyload = 'jquery_lazyload/jquery.lazyload.js?v=1.9.7' %}
17+
{% set js_vendors.lazyload = 'jquery_lazyload/jquery.lazyload.js?v=1.9.7' %}
1818
{% endif %}
1919

20-
{% set js_vendors.velocity = 'velocity/velocity.min.js?v=1.2.1' %}
20+
{% set js_vendors.velocity = 'velocity/velocity.min.js?v=1.2.1' %}
2121
{% set js_vendors.velocity_ui = 'velocity/velocity.ui.min.js?v=1.2.1' %}
2222

2323
{% if theme.fancybox %}
24-
{% set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js?v=2.1.5' %}
24+
{% set js_vendors.fancybox = 'fancybox/source/jquery.fancybox.pack.js?v=2.1.5' %}
2525
{% endif %}
2626

2727
{% if theme.canvas_nest.enable %}
2828
{% if theme.canvas_nest.onmobile %}
29-
{% set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest.min.js')%}
30-
{% if theme.vendors.canvas_nest %}
31-
{% set canvas_nest_uri = theme.vendors.canvas_nest %}
32-
{% endif %}
29+
{% set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest.min.js') %}
30+
{% if theme.vendors.canvas_nest %}
31+
{% set canvas_nest_uri = theme.vendors.canvas_nest %}
32+
{% endif %}
3333
{% else %}
34-
{% set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest-nomobile.min.js')%}
35-
{% if theme.vendors.canvas_nest_nomobile %}
36-
{% set canvas_nest_uri = theme.vendors.canvas_nest_nomobile %}
37-
{% endif %}
34+
{% set canvas_nest_uri = url_for(theme.vendors._internal + '/canvas-nest/canvas-nest-nomobile.min.js') %}
35+
{% if theme.vendors.canvas_nest_nomobile %}
36+
{% set canvas_nest_uri = theme.vendors.canvas_nest_nomobile %}
37+
{% endif %}
3838
{% endif %}
3939
<script color='{{ theme.canvas_nest.color }}' opacity='{{ theme.canvas_nest.opacity }}' zIndex='{{ theme.canvas_nest.zIndex }}' count='{{ theme.canvas_nest.count }}' src="{{ canvas_nest_uri }}"></script>
4040
{% endif %}
4141

4242
{% if theme.three_waves %}
43-
{% set js_vendors.three = 'three/three.min.js' %}
44-
{% set js_vendors.three_waves = 'three/three-waves.min.js' %}
43+
{% set js_vendors.three = 'three/three.min.js' %}
44+
{% set js_vendors.three_waves = 'three/three-waves.min.js' %}
4545
{% endif %}
4646

4747
{% if theme.canvas_lines %}
48-
{% set js_vendors.three = 'three/three.min.js' %}
49-
{% set js_vendors.canvas_lines = 'three/canvas_lines.min.js' %}
48+
{% set js_vendors.three = 'three/three.min.js' %}
49+
{% set js_vendors.canvas_lines = 'three/canvas_lines.min.js' %}
5050
{% endif %}
5151

5252
{% if theme.canvas_sphere %}
53-
{% set js_vendors.three = 'three/three.min.js' %}
54-
{% set js_vendors.canvas_sphere = 'three/canvas_sphere.min.js' %}
53+
{% set js_vendors.three = 'three/three.min.js' %}
54+
{% set js_vendors.canvas_sphere = 'three/canvas_sphere.min.js' %}
5555
{% endif %}
5656

57-
{% if theme.canvas_ribbon.enable and theme.scheme === 'Pisces'%}
58-
{% set js_vendors.canvas_ribbon = 'canvas-ribbon/canvas-ribbon.js' %}
57+
{% if theme.canvas_ribbon.enable %}
58+
{% set js_vendors.canvas_ribbon = 'canvas-ribbon/canvas-ribbon.js' %}
5959
{% endif %}
6060

6161
{% if theme.reading_progress.enable %}
62-
{% set js_vendors.reading_progress = 'reading_progress/reading_progress.js' %}
62+
{% set js_vendors.reading_progress = 'reading_progress/reading_progress.js' %}
6363
{% endif %}
6464

6565
{% for name, internal in js_vendors %}

0 commit comments

Comments
 (0)