yexuejc/solo-skins
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #11 from b3log/0.6.7

Browse Source 
0.6.7
This commit is contained in:
Liang Ding 2014-10-16 17:57:45 +08:00
commit d9608f148f
9 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
community/article.ftl
View File

@ -30,7 +30,7 @@
<span class="left">
by&nbsp;
</span>
<a rel="nofollow" class="left" title="${article.authorName}" href="${servePath}/authors/${article.authorId}}">
<a rel="nofollow" class="left" title="${article.authorName}" href="${servePath}/authors/${article.authorId}">
${article.authorName}
</a>
<span class="clear"></span>

2
community/macro-comments.ftl
View File

@ -136,7 +136,7 @@
</#macro>
<#macro comment_script oId>
<script type="text/javascript" src="/js/page${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
<script type="text/javascript" src="${staticServePath}/js/page${miniPostfix}.js?${staticResourceVersion}" charset="utf-8"></script>
<script type="text/javascript">
var page = new Page({
"nameTooLongLabel": "${nameTooLongLabel}",

8
ease/css/ease.css
View File

@ -1,5 +1,5 @@
/**
* Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, B3log Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -13,11 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* skin ease style
* Skin ease style.
*
* @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
* @version 1.0.1.8, Aug 6, 2012
* @version 1.0.2.8, Jun 3, 2014
*/
/* start base */
html, body, div, ul, li {
@ -378,6 +379,7 @@ sup {
.article-body ol, .article-body ul {
margin-left: 40px;
padding-left: 0;
}
.article-body a {

2
ease/css/ease.min.css vendored
View File

File diff suppressed because one or more lines are too long

30
ease/js/ease.js
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2010, 2011, 2012, 2013, B3log Team
* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, B3log Team
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,7 +17,7 @@
* @fileoverview ease js.
*
* @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
* @version 1.0.1.5, Jan 29, 2013
* @version 1.0.1.6, Nov 28, 2013
*/
var goTranslate = function () {
window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href);
@ -147,7 +147,7 @@ var ease = {
setNavCurrent: function () {
$(".nav ul a").each(function () {
var $this = $(this);
if ($this.attr("href") === latkeConfig.servePath + location.pathname) {
if ($this.attr("href") === location.href) {
$this.addClass("current");
} else if (/\/[0-9]+$/.test(location.pathname)) {
$(".nav ul li")[0].className = "current";
@ -237,20 +237,7 @@ var ease = {
scrollEvent: function () {
var _it = this;
$(window).scroll(function () {
var y = $(window).scrollTop(),
topH = 0;
if ($("#top").css("display") === "block") {
topH = $("#top").height();
}
// header event
if (y >= _it.headerH + topH) {
_it.$nav.css("position", "fixed");
_it.$body.css("marginTop", "55px");
} else {
_it.$nav.css("position" ,"inherit");
_it.$body.css("marginTop", "0");
}
var y = $(window).scrollTop();
// go top icon show or hide
if (y > _it.headerH) {
@ -293,15 +280,6 @@ var ease = {
$(".article-body").each(function () {
this.innerHTML = Util.replaceEmString($(this).html());
});
},
/**
* @description 纠正评论滚动位置偏差
*/
scrollToCmt: function () {
if ($(window.location.hash).length == 1) {
$(window).scrollTop($(window.location.hash).offset().top - 60);
}
}
};

2
ease/js/ease.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
ease/macro-comments.ftl
View File

@ -158,7 +158,6 @@
$(document).ready(function() {
page.load();
ease.scrollToCmt();
// emotions
page.replaceCommentsEm("#comments .article-body");
<#nested>

2
ease/skin.properties
View File

@ -16,7 +16,7 @@
#
# Description: ease skin.
# Version: 1.0.0.5, Apr 26, 2013
# Version: 1.0.0.7, Apr 24, 2014
# Author: Liyuan Li
# Author: Liang Ding
#

4
owmx-3.0/css/owmx-3.0.css
View File

@ -22,7 +22,7 @@ Date: 2010-09-13
Editor: Jonas Jacek
License: CC Attribution-Share Alike 3.0 Unported
Update: Dongxu Wang 2011-02-24
@ http://lightdian.b3log.org/
@ http://dx.b3log.org/
==================================================*/
/*
* skin owmx-3.0 style
@ -553,4 +553,4 @@ nav ul ul {
}
::-webkit-scrollbar-thumb:hover {
background-color: #888;
}
}