皮肤同步

This commit is contained in:
Vanessa 2013-02-05 17:10:19 +08:00
parent a1abd17ae2
commit fcc5d8e2cb
11 changed files with 36 additions and 37 deletions

View File

@ -16,12 +16,12 @@
# #
# Description: ease skin. # Description: ease skin.
# Version: 1.0.0.3, Nov 21, 2012 # Version: 1.0.0.4, Feb 4, 2013
# Author: Liyuan Li # Author: Liyuan Li
# Author: Liang Ding # Author: Liang Ding
# #
name=ease name=ease
version=1.0.3 version=1.0.4
forSolo=0.5.6 forSolo=0.5.6
memo=\u56de\u5f52\u606c\u9759 memo=\u56de\u5f52\u606c\u9759

View File

@ -16,11 +16,11 @@
# #
# Description: Mobile skin. # Description: Mobile skin.
# Version: 1.0.0.5, Nov 21, 2012 # Version: 1.0.0.6, Feb 4, 2013
# Author: Liang Ding # Author: Liang Ding
# #
name=Mobile name=Mobile
version=0.1.4 version=0.1.5
forSolo=0.5.6 forSolo=0.5.6
memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002 memo=\u8bf7\u4e0d\u8981\u4ece\u90e8\u7f72\u76ee\u5f55\u4e2d\u5220\u9664\u8be5\u76ae\u80a4\uff0c\u5426\u5219\u79fb\u52a8\u8bbe\u5907\u8bbf\u95ee\u65f6\u535a\u5ba2\u5c06\u4e0d\u53ef\u7528\u3002

View File

@ -26,9 +26,9 @@
</sup> </sup>
</#if> </#if>
</h3> </h3>
<p> <div class="article-body">
${article.articleAbstract} ${article.articleAbstract}
</p> </div>
<span class="ico-tags ico" title="${tagLabel}"> <span class="ico-tags ico" title="${tagLabel}">
<#list article.articleTags?split(",") as articleTag><a rel="category tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if></#list> <#list article.articleTags?split(",") as articleTag><a rel="category tag" href="${servePath}/tags/${articleTag?url('UTF-8')}">${articleTag}</a><#if articleTag_has_next>,</#if></#list>
</span> </span>

View File

@ -39,9 +39,9 @@
</sup> </sup>
</#if> </#if>
</h2> </h2>
<p> <div class="article-body">
${article.articleContent} ${article.articleContent}
</p> </div>
<#if "" != article.articleSign.signHTML?trim> <#if "" != article.articleSign.signHTML?trim>
<p> <p>
${article.articleSign.signHTML} ${article.articleSign.signHTML}

View File

@ -237,19 +237,19 @@ img {
position: relative; position: relative;
} }
.module > h3 { .module > h3.title {
margin: 0 0 10px 0; margin: 0 0 10px 0;
color: #444; color: #444;
} }
.module > ul { .module > ul.list {
list-style-type: none; list-style-type: none;
padding-left: 0; padding-left: 0;
margin: 0; margin: 0;
overflow: hidden; overflow: hidden;
} }
.module > ul > li { .module > ul.list > li {
border-top: 1px solid #EEEEEE; border-top: 1px solid #EEEEEE;
padding: 6px 0; padding: 6px 0;
} }
@ -467,6 +467,7 @@ a:hover > .ico-pre {
.articles article { .articles article {
width: 50%; width: 50%;
float: left;
} }
.articles article.l > div.module { .articles article.l > div.module {
@ -620,8 +621,9 @@ article .article-title a {
font-style: italic; font-style: italic;
} }
.comments > li > div > p { .comments > li > div > div.article-body {
padding-left: 75px; padding-left: 75px;
margin: 12px 0;
} }
.module > ul > li.comment-body-ref { .module > ul > li.comment-body-ref {

View File

@ -39,9 +39,9 @@ img{max-width:100%;border:0;vertical-align:middle;}
.tags4,.tags4:visited{font-size:18px;color:#323232;} .tags4,.tags4:visited{font-size:18px;color:#323232;}
.tags5,.tags5:visited{font-size:20px;color:#0a0a0a;} .tags5,.tags5:visited{font-size:20px;color:#0a0a0a;}
.module{background-color:#FFFFFF;border:1px solid #BEC3C7;border-radius:5px 5px 5px 5px;box-shadow:0 1px 1px rgba(0, 0, 0, 0.1);margin-bottom:30px;padding:15px;word-wrap:break-word;position:relative;} .module{background-color:#FFFFFF;border:1px solid #BEC3C7;border-radius:5px 5px 5px 5px;box-shadow:0 1px 1px rgba(0, 0, 0, 0.1);margin-bottom:30px;padding:15px;word-wrap:break-word;position:relative;}
.module>h3{margin:0 0 10px 0;color:#444;} .module>h3.title{margin:0 0 10px 0;color:#444;}
.module>ul{list-style-type:none;padding-left:0;margin:0;overflow:hidden;} .module>ul.list{list-style-type:none;padding-left:0;margin:0;overflow:hidden;}
.module>ul>li{border-top:1px solid #EEEEEE;padding:6px 0;} .module>ul.list>li{border-top:1px solid #EEEEEE;padding:6px 0;}
.articles .arrow,.ico-author,.ico-tags,.ico-comment,.ico-top,.ico-view,.ico-reply,.ico-translate,#search{background-repeat:no-repeat;background-image:url("../../timeline/images/icons.png");} .articles .arrow,.ico-author,.ico-tags,.ico-comment,.ico-top,.ico-view,.ico-reply,.ico-translate,#search{background-repeat:no-repeat;background-image:url("../../timeline/images/icons.png");}
.ico-author,.ico-tags,.ico-comment,.ico-view,.ico-reply{padding-left:20px;background-position:-1px -63px;margin-right:10px;} .ico-author,.ico-tags,.ico-comment,.ico-view,.ico-reply{padding-left:20px;background-position:-1px -63px;margin-right:10px;}
.ico-tags{background-position:-1px -83px;} .ico-tags{background-position:-1px -83px;}
@ -71,7 +71,7 @@ a:hover>.ico-next,a:hover>.ico-pre{background-color:#000;}
.articles>div.fn-clear{position:relative;margin-bottom:50px;} .articles>div.fn-clear{position:relative;margin-bottom:50px;}
.articles>div.fn-clear>h2{margin:0;text-align:center;height:28px;} .articles>div.fn-clear>h2{margin:0;text-align:center;height:28px;}
.articles>.vertical{background-color:#9EB5C6;border-radius:20em 20em 20em 20em;box-shadow:0 0 1px 0 rgba(0, 0, 0, 0.5) inset,0 0 1px 0 rgba(255, 255, 255, 0.6);height:100%;left:50%;margin-left:-3px;position:absolute;top:0;width:6px;} .articles>.vertical{background-color:#9EB5C6;border-radius:20em 20em 20em 20em;box-shadow:0 0 1px 0 rgba(0, 0, 0, 0.5) inset,0 0 1px 0 rgba(255, 255, 255, 0.6);height:100%;left:50%;margin-left:-3px;position:absolute;top:0;width:6px;}
.articles article{width:50%;} .articles article{width:50%;float:left;}
.articles article.l>div.module{margin-right:30px;left:0;} .articles article.l>div.module{margin-right:30px;left:0;}
.articles article.r{left:50%;} .articles article.r{left:50%;}
.articles article.r>div{margin-left:30px;position:relative;} .articles article.r>div{margin-left:30px;position:relative;}
@ -95,7 +95,7 @@ article .article-title a{color:#000;text-decoration:none;}
#comments{margin:30px 0 50px;position:relative;} #comments{margin:30px 0 50px;position:relative;}
.comments>li>img{height:60px;width:60px;border-radius:30px;float:left;margin-right:15px;} .comments>li>img{height:60px;width:60px;border-radius:30px;float:left;margin-right:15px;}
.comments .author{font-size:130%;font-style:italic;} .comments .author{font-size:130%;font-style:italic;}
.comments>li>div>p{padding-left:75px;} .comments>li>div>div.article-body{padding-left:75px;margin:12px 0;}
.module>ul>li.comment-body-ref{background-color:#FFFFFF;border:1px solid #ddd;left:76px;opacity:0.8;filter:alpha(opacity=80);padding:10px;position:absolute;width:74%;border-radius:10px;} .module>ul>li.comment-body-ref{background-color:#FFFFFF;border:1px solid #ddd;left:76px;opacity:0.8;filter:alpha(opacity=80);padding:10px;position:absolute;width:74%;border-radius:10px;}
.comment-body-ref .ico-reply{display:none;} .comment-body-ref .ico-reply{display:none;}
.comment-form{width:100%;margin:30px 0;} .comment-form{width:100%;margin:30px 0;}

View File

@ -21,8 +21,8 @@
</#if> </#if>
<#if 0 != recentComments?size> <#if 0 != recentComments?size>
<div class="module"> <div class="module">
<h3>${recentCommentsLabel}</h3> <h3 class="title">${recentCommentsLabel}</h3>
<ul class="comments"> <ul class="comments list">
<#list recentComments as comment> <#list recentComments as comment>
<li> <li>
<img <img
@ -42,9 +42,9 @@
${viewLabel} ${viewLabel}
</a> </a>
</span> </span>
<p> <div class="article-body">
${comment.commentContent} ${comment.commentContent}
</p> </div>
</div> </div>
</li> </li>
</#list> </#list>
@ -55,8 +55,8 @@
<div class="dynamic-r"> <div class="dynamic-r">
<#if 0 != mostCommentArticles?size> <#if 0 != mostCommentArticles?size>
<div class="module"> <div class="module">
<h3>${mostCommentArticlesLabel}</h3> <h3 class="title">${mostCommentArticlesLabel}</h3>
<ul> <ul class="list">
<#list mostCommentArticles as article> <#list mostCommentArticles as article>
<li class="fn-clear"> <li class="fn-clear">
<a class="left" rel="nofollow" title="${article.articleTitle}" <a class="left" rel="nofollow" title="${article.articleTitle}"
@ -79,8 +79,8 @@
</#if> </#if>
<#if 0 != mostViewCountArticles?size> <#if 0 != mostViewCountArticles?size>
<div class="module"> <div class="module">
<h3>${mostViewCountArticlesLabel}</h3> <h3 class="title">${mostViewCountArticlesLabel}</h3>
<ul> <ul class="list">
<#list mostViewCountArticles as article> <#list mostViewCountArticles as article>
<li class="fn-clear"> <li class="fn-clear">
<a rel="nofollow" class="left" title="${article.articleTitle}" href="${servePath}${article.articlePermalink}"> <a rel="nofollow" class="left" title="${article.articleTitle}" href="${servePath}${article.articlePermalink}">
@ -98,7 +98,7 @@
</#if> </#if>
<#if 0 != mostUsedTags?size> <#if 0 != mostUsedTags?size>
<div class="module tags"> <div class="module tags">
<h3>${popTagsLabel}</h3> <h3 class="title">${popTagsLabel}</h3>
<#list mostUsedTags as tag> <#list mostUsedTags as tag>
<a rel="tag" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}" <a rel="tag" href="${servePath}/tags/${tag.tagTitle?url('UTF-8')}"
title="${tag.tagTitle}(${tag.tagPublishedRefCount})"> title="${tag.tagTitle}(${tag.tagPublishedRefCount})">
@ -112,7 +112,7 @@
</div> </div>
<#if 0 != links?size> <#if 0 != links?size>
<div class="module links"> <div class="module links">
<h3>${linkLabel}</h3> <h3 class="title">${linkLabel}</h3>
<#list links as link> <#list links as link>
<span> <span>
<a rel="friend" href="${link.linkAddress}" alt="${link.linkTitle}" target="_blank"> <a rel="friend" href="${link.linkAddress}" alt="${link.linkTitle}" target="_blank">

View File

@ -1,5 +1,5 @@
<#macro comments commentList article> <#macro comments commentList article>
<ul id="comments" class="comments"> <ul id="comments" class="comments list">
<#list commentList as comment> <#list commentList as comment>
<li id="${comment.oId}"> <li id="${comment.oId}">
<img title="${comment.commentName}" <img title="${comment.commentName}"
@ -23,7 +23,7 @@
<a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a> <a rel="nofollow" href="javascript:replyTo('${comment.oId}');">${replyLabel}</a>
</span> </span>
</#if> </#if>
<p>${comment.commentContent}</p> <div class="article-body">${comment.commentContent}</div>
</div> </div>
</li> </li>
</#list> </#list>
@ -126,9 +126,9 @@
commentHTML += '</span>&nbsp;<small><b>' + result.commentDate.substring(2, 16) commentHTML += '</span>&nbsp;<small><b>' + result.commentDate.substring(2, 16)
+ '</b></small><span class="ico-reply ico right"><a rel="nofollow" href="javascript:replyTo(\'' + result.oId + '</b></small><span class="ico-reply ico right"><a rel="nofollow" href="javascript:replyTo(\'' + result.oId
+ '\');">${replyLabel}</a></span><p>' + '\');">${replyLabel}</a></span><div class="article-body">'
+ Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>")) + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+ '</p></div></li>'; + '</div></div></li>';
return commentHTML; return commentHTML;
} }
@ -145,7 +145,7 @@
$(document).ready(function () { $(document).ready(function () {
page.load(); page.load();
// emotions // emotions
page.replaceCommentsEm("#comments li > div > p"); page.replaceCommentsEm("#comments li .article-body");
<#nested> <#nested>
}); });
</script> </script>

View File

@ -8,9 +8,6 @@
<meta name="revised" content="B3log, ${year}" /> <meta name="revised" content="B3log, ${year}" />
<meta http-equiv="Window-target" content="_top" /> <meta http-equiv="Window-target" content="_top" />
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" /> <link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<!--[if IE 8]>
<link type="text/css" rel="stylesheet" href="${staticServePath}/skins/${skinDirName}/css/${skinDirName}-ie8${miniPostfix}.css?${staticResourceVersion}" charset="utf-8" />
<![endif]-->
<link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" /> <link href="${servePath}/blog-articles-feed.do" title="ATOM" type="application/atom+xml" rel="alternate" />
<link rel="icon" type="image/png" href="${staticServePath}/favicon.png" /> <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
${htmlHead} ${htmlHead}

View File

@ -14,7 +14,7 @@
<div class="wrapper"> <div class="wrapper">
<div class="container"> <div class="container">
<div class="module"> <div class="module">
<div> <div class="article-body">
${page.pageContent} ${page.pageContent}
</div> </div>
<@comments commentList=pageComments article=page></@comments> <@comments commentList=pageComments article=page></@comments>