Skip to content

Commit 8c98510

Browse files
hellokatonhellokaton
committed
Upgrade a blog I forgot to follow
1 parent e0bc24e commit 8c98510

File tree

6 files changed

+56
-37
lines changed

6 files changed

+56
-37
lines changed

‎Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ gem "jekyll-paginate"
55
gem 'jekyll-feed'
66
gem 'jekyll-sitemap'
77
gem 'jekyll-seo-tag'
8-
gem 'wdm', '>= 0.1.1'
9-
gem "webrick", "~> 1.7"
8+
gem 'wdm', '>= 0.2.0'
9+
gem "webrick", ">= 1.8.2"

‎_config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
title: HelloKaton
22
url: https://blog.hellokaton.com
3-
baseurl: ''
4-
cdnurl: 'https://blog-biezhi-me-1251171175.cos.ap-shanghai.myqcloud.com'
3+
baseurl: ""
4+
cdnurl: "https://blog-biezhi-me-1251171175.cos.ap-shanghai.myqcloud.com"
55
description: >
66
关于编程的一些想法。
77
88
permalink: /:year/:month/:title.html
99

1010
image: /public/images/mountains.jpg
11-
color: '#dc322f'
12-
google_analytics:
13-
baidu_analytics: 2209f3e596f3e0c61a293f49a2f65ba3
11+
color: "#dc322f"
12+
google_analytics:
13+
umami_analytics: bc691a71-e1e2-49bc-bb28-cc7f38a7d47f
1414
disqus: blog-biezhi-me
1515

1616
markdown: kramdown
@@ -83,4 +83,4 @@ plugins:
8383
- jekyll-paginate
8484
- jekyll-feed
8585
- jekyll-seo-tag
86-
- jekyll-sitemap
86+
- jekyll-sitemap

‎_includes/baidu_analytics.html

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎_includes/head.html

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,46 @@
11
<head>
2-
<meta charset="UTF-8">
3-
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;" />
2+
<meta charset="UTF-8" />
3+
<meta
4+
name="viewport"
5+
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;"
6+
/>
47
{% seo %}
5-
<link rel="stylesheet" href="{{ '/public/css/styles.css' | prepend: site.cdnurl }}">
6-
<link rel="stylesheet" href="{{ '/public/plugins/fancybox/jquery.fancybox.min.css' | prepend: site.cdnurl }}"
7-
media="all">
8-
<link rel="stylesheet" href="{{ '/public/fonts/caomei/style.css' }}" media="all">
8+
<link
9+
rel="stylesheet"
10+
href="{{ '/public/css/styles.css' | prepend: site.cdnurl }}"
11+
/>
12+
<link
13+
rel="stylesheet"
14+
href="{{ '/public/plugins/fancybox/jquery.fancybox.min.css' | prepend: site.cdnurl }}"
15+
media="all"
16+
/>
17+
<link
18+
rel="stylesheet"
19+
href="{{ '/public/fonts/caomei/style.css' }}"
20+
media="all"
21+
/>
922
{% include head_css.html %}
1023
<!-- Icons -->
11-
<link rel="icon" type="image/jpeg"
12-
href="{{ '/public/images/icons/launcher-icon-128x128.jpeg' | prepend: site.cdnurl }}">
13-
<link rel="apple-touch-icon-precomposed" sizes="144x144"
14-
href="{{ '/public/images/icons/launcher-icon-152x152.jpeg' | prepend: site.cdnurl }}">
24+
<link
25+
rel="icon"
26+
type="image/jpeg"
27+
href="{{ '/public/images/icons/launcher-icon-128x128.jpeg' | prepend: site.cdnurl }}"
28+
/>
29+
<link
30+
rel="apple-touch-icon-precomposed"
31+
sizes="144x144"
32+
href="{{ '/public/images/icons/launcher-icon-152x152.jpeg' | prepend: site.cdnurl }}"
33+
/>
1534
<!-- RSS -->
16-
<link rel="alternate" type="application/feed+xml" title="{{site.title}}" href="{{site.baseurl}}/feed.xml">
17-
<link rel="manifest" href="/manifest.json">
35+
<link
36+
rel="alternate"
37+
type="application/feed+xml"
38+
title="{{site.title}}"
39+
href="{{site.baseurl}}/feed.xml"
40+
/>
41+
<link rel="manifest" href="/manifest.json" />
1842
<script src="{{ '/public/js/jquery.min.js' | prepend: site.cdnurl }}"></script>
1943
<script src="{{ '/public/js/highlight.min.js' | prepend: site.cdnurl }}"></script>
2044
<script src="{{ '/public/plugins/fancybox/jquery.fancybox.min.js' | prepend: site.cdnurl }}"></script>
21-
{% include google_analytics.html %}
22-
{% include baidu_analytics.html %}
23-
</head>
45+
{% include google_analytics.html %} {% include umami_analytics.html %}
46+
</head>

‎_includes/umami_analytics.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{{% if site.umami_analytics %}}
2+
<script
3+
defer
4+
src="https://umami.hellokaton.me/script.js"
5+
data-website-id="{{ site.umami_analytics }}"
6+
></script>
7+
{{% endif %}}

‎public/css/styles.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
@charset "utf-8";
66
// Imports sass/scss files
77

8-
@import "poole";
9-
@import "hyde";
10-
@import "highlight";
8+
@use "poole";
9+
@use "hyde";
10+
@use "highlight";

0 commit comments

Comments
 (0)