diff --git a/README.md b/README.md
index 744fbc1..ca34585 100755
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
一个简约的卡片式Hexo博客主题。
+[![](https://data.jsdelivr.com/v1/package/gh/xaoxuu/cdn-material-x/badge)](https://www.jsdelivr.com/package/gh/xaoxuu/cdn-material-x)
+
## 示例
diff --git a/_config.yml b/_config.yml
index 1fae93c..cd0c951 100755
--- a/_config.yml
+++ b/_config.yml
@@ -2,10 +2,10 @@
############################## 主题基本信息 ################################
theme_info:
name: Material X
- version: 1.0-beta10
+ version: 1.0-beta11
docs: https://xaoxuu.com/wiki/material-x/
# 主题的CDN地址,如果你的源码托管到国内CDN可以更改此链接。如需启用CDN,请在主目录的config中设置import,详见文档。
- cdn: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@18.12.32/
+ cdn: https://cdn.jsdelivr.net/gh/xaoxuu/cdn-material-x@18.12.33/
##########################################################################
# 请务必阅读官方文档!!!
# 请务必阅读官方文档!!!
diff --git a/layout/_partial/head.ejs b/layout/_partial/head.ejs
index 09a0f2f..f3ba48d 100755
--- a/layout/_partial/head.ejs
+++ b/layout/_partial/head.ejs
@@ -60,21 +60,13 @@
<%- css('style.css') %>
<% } %>
-
- <% if (config.import && config.import.fontawesome == true) { %>
- <%- css('https://cdn.jsdelivr.net/gh/xaoxuu/cdn-fontawesome@5.6.3/css/all.min.css') %>
- <% } else if (config.import && config.import.fontawesome && config.import.fontawesome.length > 0){ %>
- <%- css(config.import.fontawesome) %>
- <% } else { %>
- <%- css('fontawesome-free-5.6.3-web/css/all.min.css') %>
- <% } %>
-
<% if (config.import && config.import.google_fonts && config.import.google_fonts.length > 0){ %>
<% } %>
-
+
+
-
+
@@ -70,7 +70,7 @@
<% if (config.valine.enable && config.valine.app_id && config.valine.app_key){ %>
<% if (config.import && config.import.js == true) { %>
-
+
<% } else { %>
<%- js('js/volantis.js') %>
<% } %>
diff --git a/source/js/volantis.js b/source/js/volantis.js
index 64b9208..b31d6b3 100644
--- a/source/js/volantis.js
+++ b/source/js/volantis.js
@@ -678,10 +678,6 @@ function(e, t) {
alert('请输入昵称!');
return void _.nick.focus();
}
- if (h.mail == "") {
- alert('请输入邮箱!');
- return void _.mail.focus();
- }
if ("" == h.comment) {
alert('请输入内容!');
return void _.comment.focus();
@@ -1779,44 +1775,61 @@ function(e, t) {
}
e.exports = n
}, function(e, t) {
+ function aru(index){
+ return "
";
+ }
+ function tieba(str){
+ return "
";
+ }
+ function qq(str) {
+ return "
";
+ }
e.exports = {
- aru1: "
",
- aru3: "
",
- aru7: "
",
- aru9: "
",
- aru12: "
",
- aru15: "
",
- aru19: "
",
- aru22: "
",
- aru39: "
",
- aru40: "
",
- aru46: "
",
- aru51: "
",
- aru53: "
",
- aru59: "
",
- aru77: "
",
- aru151: "
",
- 贴吧捂嘴笑: "
",
- 贴吧乖: "
",
- 贴吧OK: "
",
- 贴吧太开心: "
",
- 贴吧滑稽: "
",
- 贴吧泪: "
",
- 贴吧真棒: "
",
- 贴吧喷: "
",
- 贴吧疑问: "
",
- 贴吧胜利: "
",
- qqOK: "
",
- qq嗅大了: "
",
- qq尴尬: "
",
- qq强: "
",
- qq得意: "
",
- qq憨笑: "
",
- qq抱拳: "
",
- qq握手: "
",
- qq疑问: "
",
- qq阴险: "
",
- qq鼓掌: "
",
+ aru151: aru(151),
+ 贴吧what: tieba('what'),
+ 贴吧乖: tieba('乖'),
+ 贴吧喷: tieba('喷'),
+ 贴吧太开心: tieba('太开心'),
+ 贴吧委屈: tieba('委屈'),
+ 贴吧小乖: tieba('小乖'),
+ 贴吧捂嘴笑: tieba('捂嘴笑'),
+ 贴吧泪: tieba('泪'),
+ 贴吧滑稽: tieba('滑稽'),
+ 贴吧爱心: tieba('爱心'),
+ 贴吧玫瑰: tieba('玫瑰'),
+ 贴吧真棒: tieba('真棒'),
+ 贴吧疑问: tieba('疑问'),
+ qqOK: qq('OK'),
+ qq亲亲: qq('亲亲'),
+ qq便便: qq('便便'),
+ qq偷笑: qq('偷笑'),
+ qq冷汗: qq('冷汗'),
+ qq发呆: qq('发呆'),
+ qq发怒: qq('发怒'),
+ qq可怜: qq('可怜'),
+ qq可爱: qq('可爱'),
+ qq左哼哼: qq('左哼哼'),
+ qq右哼哼: qq('右哼哼'),
+ qq吓: qq('吓'),
+ qq呲牙: qq('呲牙'),
+ qq嗅大了: qq('嗅大了'),
+ qq坏笑: qq('坏笑'),
+ qq奋斗: qq('奋斗'),
+ qq委屈: qq('委屈'),
+ qq害羞: qq('害羞'),
+ qq尴尬: qq('尴尬'),
+ qq强: qq('强'),
+ qq得意: qq('得意'),
+ qq快哭了: qq('快哭了'),
+ qq惊恐: qq('惊恐'),
+ qq憨笑: qq('憨笑'),
+ qq抓狂: qq('抓狂'),
+ qq抱拳: qq('抱拳'),
+ qq握手: qq('握手'),
+ qq晕: qq('晕'),
+ qq疑问: qq('疑问'),
+ qq阴险: qq('阴险'),
+ qq鼓掌: qq('鼓掌'),
grinning: "😀",
smiley: "😃",
diff --git a/source/less/_main.less b/source/less/_main.less
index 8343bce..4e26127 100755
--- a/source/less/_main.less
+++ b/source/less/_main.less
@@ -140,7 +140,6 @@
}
.vemojis{
- display: flex;
justify-content: space-between;
i{
width: auto;
@@ -149,6 +148,10 @@
margin: 8px 8px 0 8px;
.emoji{
height: 24px;
+ // &.aru{
+ // height: 18px;
+ // margin-top: 3px;
+ // }
}
}
}
@@ -156,6 +159,7 @@
.emoji{
display: inline;
height: 28px;
+
}
}
}