Skip to content

Commit fba37a2

Browse files
committed
updated to v1.3.3
1 parent 8f17dff commit fba37a2

File tree

11 files changed

+221
-79
lines changed

11 files changed

+221
-79
lines changed

Diff for: CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## 🚀 1.3.3 (Oct 23, 2019)
4+
5+
### Features ✨
6+
- Added social sharing feature - [`share.js`](https://github.com/overtrue/share.js)
7+
8+
### Changes 🙌
9+
- Changed the loading icon to `Load Awesome`'s `la-ball-atom`. - [`Load Awesome`](https://github.com/danielcardoso/load-awesome)
10+
311
## 🚀 1.3.2 (Oct 21, 2019)
412

513
### Changes 🙌

Diff for: README.md

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Hexo-theme-obsidian
22
> A dark Hexo theme, it's responsive, simple but elegant.
33
4-
- `Latest version: v1.3.2`
5-
- `Last updated at: 2019-10-21`
4+
- `Latest version: v1.3.3`
5+
- `Last updated at: 2019-10-23`
66

77
**[PREVIEW](http://tridiamond.me)** |
88
**[中文文档](https://github.com/TriDiamond/hexo-theme-obsidian/blob/master/README_CN.md)** |
@@ -34,7 +34,6 @@ theme: obsidian
3434
Open `/themes/obsidian/_config.yml` can change the theme configs
3535

3636
``` yaml
37-
3837
#! ---------------------------------------------------------------
3938
#! Obsidian theme use manual highlight.js
4039
#! To maintain the code block css display properly
@@ -160,6 +159,12 @@ html_truncate:
160159
busuanzi:
161160
enable: true
162161

162+
# Enable social media sharing
163+
# see https://github.com/overtrue/share.js/
164+
sharejs:
165+
enable: true
166+
disabled: 'facebook,douban,linkedin,diandian,tencent,google'
167+
163168
```
164169
165170
### Comments
@@ -168,14 +173,18 @@ You can choose from using Valine or Gitalk
168173
169174
- If you are using `Valine`, you need to turn off `busuanzi`, because Valine has article view count support.
170175
- If you are using `Gitalk`, you may turn on `busuanzi`, to have article view count enable.
171-
```
172176

173177
### Code block style
174178

175179
> Turn off default `highlight` to ensure code block style display properly.
176180
Because Obsidian theme use manual highlight.js
177181
To maintain the code block css display properly
178182
please change your default highlight setting as off!!
183+
184+
Hexo configuration file `_config.yml` located at the ROOT path of your blog.
185+
186+
> ⚠️ Please note do not make these changes in the theme's config file,
187+
changing configs in the theme config file `_config.yml` will not work properly.
179188

180189
```yaml
181190
...
@@ -189,7 +198,7 @@ highlight:
189198
...
190199
```
191200

192-
> Rebuild files after you changed the config
201+
Rebuild files after you changed the config
193202

194203
```bash
195204
hexo clean && hexo g

Diff for: README_CN.md

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Hexo-theme-obsidian
22
> 一款暗色的Hexo主题, 拥有响应式布局, 简约而优雅.
33
4-
- `最新版本: v1.3.2`
5-
- `最后更新时间: 2019-10-21`
4+
- `最新版本: v1.3.3`
5+
- `最后更新时间: 2019-10-23`
66

77
**[预览](http://tridiamond.me)** |
88
**[English Doc](https://github.com/TriDiamond/hexo-theme-obsidian/blob/master/README.md)** |
@@ -157,6 +157,12 @@ html_truncate:
157157
busuanzi:
158158
enable: true
159159

160+
# Sharejs 分享
161+
# see https://github.com/overtrue/share.js/
162+
sharejs:
163+
enable: true
164+
disabled: 'facebook,douban,linkedin,diandian,tencent,google'
165+
160166
```
161167
162168
### 评论插件
@@ -166,12 +172,15 @@ busuanzi:
166172
- 如果你是使用 `Valine`, 你需要关闭 `busuanzi`, 因为 Valine 自带有文章浏览量统计.
167173
- 如果你是使用 `Gitalk`, 你可以打开 `busuanzi` 文章详情页就会显示文章浏览量统计.
168174

169-
170175
### 代码块样式
171176

172177
> 因为Obsidian theme 使用手动启用 highlight.js 代码高亮
173178
为了可以正常显示代码高亮的样式
174179
请务必在hexo默认配置里面关闭`highlight`。
180+
181+
在博客根目录的`_config.yml`修改
182+
183+
> ⚠️ 注意不是主题里面的`_config.yml`,在主题里面加这个是无效的哦
175184

176185
```yaml
177186
...
@@ -185,7 +194,7 @@ highlight:
185194
...
186195
```
187196

188-
> 修改了默认highlight配置后需要重新生成文件
197+
修改了默认highlight配置后需要重新生成文件
189198

190199
```bash
191200
hexo clean && hexo g

Diff for: _config.yml

+5
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,8 @@ html_truncate:
130130
# see http://ibruce.info/2015/04/04/busuanzi/
131131
busuanzi:
132132
enable: true
133+
134+
#Enable social media sharing
135+
sharejs:
136+
enable: true
137+
disabled: 'facebook,douban,linkedin,diandian,tencent,google'

Diff for: layout/_partial/head.ejs

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ var description = '';
3535
<% if (theme.favicon){ %><link rel="icon" href="<%- url_for(theme.favicon) %>"> <% } %>
3636
<link href="/font/Rubik-Bold-kern-latin.woff2" as="font" type="font/woff2" crossorigin="">
3737
<link href="/font/Rubik-Regular-kern-latin.woff2" as="font" type="font/woff2" crossorigin="">
38-
<%- css(['//at.alicdn.com/t/font_1429596_7jr8c7mf4wi.css'])%>
38+
<%- css(['//at.alicdn.com/t/font_1429596_nuy6s3evgdk.css'])%>
3939
<%- css(['//cdn.bootcss.com/animate.css/3.7.2/animate.min.css'])%>
40+
<%- css(['//cdnjs.cloudflare.com/ajax/libs/social-share.js/1.0.16/css/share.min.css'])%>
4041
<%- css(['css/obsidian.css'])%>
42+
<%- css(['css/ball-atom.min.css'])%>
4143
</head>

Diff for: layout/_partial/post/header.ejs

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
<div class="scrollbar gradient-bg-rev"></div>
22
<div id="top" style="display: block;">
33
<div class="bar" style="width: 0;"></div>
4-
<a id="home-icon" class="image-icon icon-home iconfont" href="javascript:;" data-url="<%= config.url %>"></a>
5-
<div id="play-icon" title="Play/Pause" class="iconfont icon-play"></div>
4+
<a id="home-icon" class="image-icon icon-home iconfont animated fadeIn" href="javascript:;" data-url="<%= config.url %>"></a>
5+
<div id="play-icon" title="Play/Pause" class="iconfont icon-play animated fadeIn"></div>
66
<h3 class="subtitle"><%- page.title %></h3>
77
<div class="social">
88
<!-- <div class="like-icon">-->
99
<!-- <a href="javascript:;" class="likeThis active"><span class="icon-like"></span><span class="count">76</span></a>-->
1010
<!-- </div>-->
11-
<!-- <div>-->
12-
<!-- <div class="share">-->
13-
<!-- <a title="Get qrcode" id="qr-icon" href="javascript:;" class="iconfont icon-QRcode-o"></a>-->
14-
<!-- </div>-->
15-
<!-- <div id="qr"></div>-->
16-
<!-- </div>-->
11+
<div>
12+
<div class="share animated fadeIn">
13+
<% if (theme.sharejs && theme.sharejs.enable == true) { %>
14+
<a href="javascript:;" class="iconfont icon-share1"></a>
15+
<div class="share-component-cc" data-disabled="<%= theme.sharejs.disabled || '' %>"></div>
16+
<% } %>
17+
</div>
18+
</div>
1719
</div>
1820
</div>

Diff for: layout/_partial/scripts.ejs

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<%- js(['//cdn.bootcss.com/jquery/3.4.1/jquery.min.js', 'js/plugin.js', 'js/obsidian.js', 'js/jquery.truncate.js'])%>
66
<%- js(['//cdn.bootcss.com/typed.js/2.0.10/typed.min.js']) %>
77
<%- js(['//cdn.bootcss.com/blueimp-md5/2.12.0/js/md5.min.js']) %>
8+
<%- js(['//cdnjs.cloudflare.com/ajax/libs/social-share.js/1.0.16/js/social-share.min.js']) %>
89

910
<% if (theme.busuanzi.enable == true) { %>
1011
<%- js(['js/busuanzi.min.js']) %>

Diff for: layout/layout.ejs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
<%- partial('_partial/head') %>
22
<body class="loading">
3+
<div class="la-ball-atom la-2x">
4+
<div></div>
5+
<div></div>
6+
<div></div>
7+
<div></div>
8+
</div>
39
<span id="config-title" style="display:none"><%= config.title %></span>
410
<div id="loader"></div>
511
<%- body %>
@@ -19,8 +25,8 @@
1925
Theme
2026
<span class="gradient-text">
2127
<%- link_to("https://github.com/TriDiamond/hexo-theme-obsidian", "Obsidian", {external: true})%>
22-
<small><%- link_to("https://github.com/TriDiamond/hexo-theme-obsidian/blob/master/CHANGELOG.md", theme.version, {external: true})%></small>
2328
</span>
29+
<small><%- link_to("https://github.com/TriDiamond/hexo-theme-obsidian/blob/master/CHANGELOG.md", 'v'+theme.version, {external: true})%></small>
2430
</p>
2531
</footer>
2632
<%- partial('_partial/scripts', null, {cache: true}) %>

Diff for: source/css/ball-atom.min.css

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)