diff --git a/ease/skin.properties b/ease/skin.properties index a9d4b7f..987291b 100644 --- a/ease/skin.properties +++ b/ease/skin.properties @@ -16,12 +16,12 @@ # # Description: ease skin. -# Version: 1.0.0.3, Nov 21, 2012 +# Version: 1.0.0.4, Feb 4, 2013 # Author: Liyuan Li # Author: Liang Ding # name=ease -version=1.0.3 +version=1.0.4 forSolo=0.5.6 memo=\u56de\u5f52\u606c\u9759 diff --git a/mobile/skin.properties b/mobile/skin.properties index 85ed39f..b59bde9 100644 --- a/mobile/skin.properties +++ b/mobile/skin.properties @@ -16,11 +16,11 @@ # # Description: Mobile skin. -# Version: 1.0.0.5, Nov 21, 2012 +# Version: 1.0.0.6, Feb 4, 2013 # Author: Liang Ding # name=Mobile -version=0.1.4 +version=0.1.5 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 diff --git a/timeline/article-list.ftl b/timeline/article-list.ftl index 1b9d3e7..6a92778 100644 --- a/timeline/article-list.ftl +++ b/timeline/article-list.ftl @@ -26,9 +26,9 @@ #if> -
+
+
${article.articleSign.signHTML} diff --git a/timeline/css/timeline.css b/timeline/css/timeline.css index 1722f4b..d159125 100644 --- a/timeline/css/timeline.css +++ b/timeline/css/timeline.css @@ -237,19 +237,19 @@ img { position: relative; } -.module > h3 { +.module > h3.title { margin: 0 0 10px 0; color: #444; } -.module > ul { +.module > ul.list { list-style-type: none; padding-left: 0; margin: 0; overflow: hidden; } -.module > ul > li { +.module > ul.list > li { border-top: 1px solid #EEEEEE; padding: 6px 0; } @@ -467,6 +467,7 @@ a:hover > .ico-pre { .articles article { width: 50%; + float: left; } .articles article.l > div.module { @@ -620,8 +621,9 @@ article .article-title a { font-style: italic; } -.comments > li > div > p { +.comments > li > div > div.article-body { padding-left: 75px; + margin: 12px 0; } .module > ul > li.comment-body-ref { diff --git a/timeline/css/timeline.min.css b/timeline/css/timeline.min.css index 5e36ce8..02e60f6 100644 --- a/timeline/css/timeline.min.css +++ b/timeline/css/timeline.min.css @@ -39,9 +39,9 @@ img{max-width:100%;border:0;vertical-align:middle;} .tags4,.tags4:visited{font-size:18px;color:#323232;} .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>h3{margin:0 0 10px 0;color:#444;} -.module>ul{list-style-type:none;padding-left:0;margin:0;overflow:hidden;} -.module>ul>li{border-top:1px solid #EEEEEE;padding:6px 0;} +.module>h3.title{margin:0 0 10px 0;color:#444;} +.module>ul.list{list-style-type:none;padding-left:0;margin:0;overflow:hidden;} +.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");} .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;} @@ -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>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 article{width:50%;} +.articles article{width:50%;float:left;} .articles article.l>div.module{margin-right:30px;left:0;} .articles article.r{left:50%;} .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>li>img{height:60px;width:60px;border-radius:30px;float:left;margin-right:15px;} .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;} .comment-body-ref .ico-reply{display:none;} .comment-form{width:100%;margin:30px 0;} diff --git a/timeline/dynamic.ftl b/timeline/dynamic.ftl index e73d44c..197c958 100644 --- a/timeline/dynamic.ftl +++ b/timeline/dynamic.ftl @@ -21,8 +21,8 @@ #if> <#if 0 != recentComments?size>
${comment.commentContent}
+' + + '\');">${replyLabel}
${recentCommentsLabel}
+<#list recentComments as comment>-
-
${comment.commentContent}
-
+
+