Skip to content

Commit

Permalink
1.1.12
Browse files Browse the repository at this point in the history
  • Loading branch information
yscoder committed Nov 18, 2016
1 parent 83e302b commit 5018c9c
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# hexo-theme-indigo
# https://github.com/yscoder/hexo-theme-indigo
version: 1.1.11
version: 1.1.12

#添加新菜单项遵循以下规则
# menu:
Expand Down
3 changes: 1 addition & 2 deletions layout/_partial/after-footer.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
<script>var BLOG = { ROOT: '<%= config.root %>' };
BLOG.SHARE = {
title: "<%-(page.title || config.title) %>",
pic: "<%=theme.avatar %>",

This comment has been minimized.

Copy link
@xdcxdc

xdcxdc Nov 20, 2016

Contributor

删掉 pic 后,分享的 jiathis 链接内pic的值会出现undefined
最好是,如果 post 内有图片,就用第一张图片的链接(或者是在md文件的头部指定一个 pic 值),其他情况就用avatar。

This comment has been minimized.

Copy link
@yscoder

yscoder Nov 20, 2016

Author Owner

这里是测试不设值时,分享的图片会是什么,提交时忘了还原了。

summary: document.getElementsByName('summary')[0].content,
url: "<%=url.replace(/index\.html$/, '') %>" }
</script>
<%- partial('post/share', {className: 'global-share'}) %>
<% } %>
<% } %>
4 changes: 2 additions & 2 deletions layout/_partial/post/duoshuo.ejs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div class="duoshuo">
<div class="duoshuo" id="comments">
<div class="ds-thread" data-thread-key="<%=key%>" data-title="<%=title%>" data-url="<%=url.replace(/index\.html$/, '')%>"></div>
</div>
<script src="<%= url_for('/js/embed' + (cache ? '.min': '') + '.js?v=' + theme.version) %>"></script>
<script src="//cdn.bootcss.com/marked/0.3.6/marked.min.js" async="async"></script>
<script>
var duoshuoQuery = {short_name:'<%=theme.duoshuo %>', theme: 'none'}
</script>
</script>
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "hexo-theme-material-indigo",
"version": "1.1.11",
"version": "1.1.12",
"private": true
}
}
5 changes: 2 additions & 3 deletions source/css/_partial/layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@
#main {
padding-left: 240px;
min-height: 100%;
background: @backColor;
.transition(.4s);
}

Expand Down Expand Up @@ -174,7 +173,7 @@
filter: alpha(opacity=0);
pointer-events: none;
.transition(.3s);

&.in {
visibility: visible;
pointer-events: auto;
Expand Down Expand Up @@ -211,7 +210,7 @@ a[title="站长统计"] {
}


@media screen and (max-width:1040px) {
@media screen and (max-width:1040px) {
.container {
width: 100%;
padding: 20px 16px;
Expand Down
2 changes: 1 addition & 1 deletion source/css/_partial/postlist.less
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,4 @@
padding: 0;
margin-bottom: 16px;
}
}
}
2 changes: 1 addition & 1 deletion source/css/_partial/variable.less
Original file line number Diff line number Diff line change
Expand Up @@ -155,4 +155,4 @@
background: #fff;
border-radius: @radius;
box-shadow: 0 1px 2px rgba(151, 151, 151, 0.58);
}
}
18 changes: 10 additions & 8 deletions source/css/style.less
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,26 @@
}

::-webkit-scrollbar {
width: 5px;
height: 5px;
-webkit-appearance: none;
width: 8px;
height: 8px;

&-track { background-color: transparent; }
&-track { background-color: inherit; }
&-thumb {
background-color: @dividerColor ;

background-color: @dividerColor;
border: 1px solid #fff;
border-radius: 10px;
&:hover {
background-color: @secondaryTextColor
background-color: darken(@dividerColor, 10%)
}
&:active {
background-color: @secondaryTextColor
background-color: darken(@dividerColor, 20%)
}
}
}

html {
background-color: #fff;
background-color: @backColor;
color: @primaryTextColor;
font-size: @font-size;
line-height: 1.5;
Expand Down

0 comments on commit 5018c9c

Please sign in to comment.