diff --git a/.gitignore b/.gitignore index 455b4b0..ee3b21b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **/node_modules/** -**/.DS_Store \ No newline at end of file +**/.DS_Store +.idea \ No newline at end of file diff --git a/andrea/side.ftl b/andrea/side.ftl index 0f7054b..33d38a3 100644 --- a/andrea/side.ftl +++ b/andrea/side.ftl @@ -33,7 +33,7 @@ ${comment.commentName} : - + ${comment.commentContent} diff --git a/classic/side.ftl b/classic/side.ftl index 2eaa665..6cd65f0 100644 --- a/classic/side.ftl +++ b/classic/side.ftl @@ -21,7 +21,7 @@ ${comment.commentName}<#else> ${comment.commentName}: - + ${comment.commentContent} diff --git a/classic/skin.properties b/classic/skin.properties index 09e5b4a..3ea6e41 100644 --- a/classic/skin.properties +++ b/classic/skin.properties @@ -21,5 +21,5 @@ # Author: Liyuan Li # -name=\u7ecf\u5178\u6de1\u84dd -memo=\u8fd9\u4e2a\u76ae\u80a4\u5f88\u4e11\u4e48\uff1f\u6211\u52d2\u4e2a\u53bb\u3002 +name=classic +memo=\u8FD9\u4E2A\u76AE\u80A4\u5F88\u4E11\u4E48\uFF1F\u6211\u52D2\u4E2A\u53BB\u3002 diff --git a/i-nove/css/i-nove.css b/i-nove/css/i-nove.css index c6772ed..e17bad8 100644 --- a/i-nove/css/i-nove.css +++ b/i-nove/css/i-nove.css @@ -18,7 +18,7 @@ * skin i-nove style * * @author Liyuan Li - * @version 1.0.2.3, Nov 27, 2016 + * @version 1.0.3.0, Aug 30, 2017 */ img { max-width: 100%; @@ -346,7 +346,7 @@ h5 { color: #555; } -.side-navi .navi-comments img { +.side-navi .navi-comments li > img { border: 1px solid #999999; height: 32px; margin-right: 7px; diff --git a/i-nove/css/i-nove.min.css b/i-nove/css/i-nove.min.css index 1fac21f..5a2adeb 100644 --- a/i-nove/css/i-nove.min.css +++ b/i-nove/css/i-nove.min.css @@ -13,4 +13,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@charset "utf-8";#header-navi,.header{border-bottom:1px solid #A6A6A6}.side-navi .navi-comments li div,.side-navi li{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.comment-form img,.footer .goTop{cursor:pointer}img{max-width:100%;height:auto}.bg{background:url(../images/bg.jpg) repeat-x #BEC3C6;color:#555}a,a:active,a:link,a:visited{color:#2970A6;text-decoration:none}a:hover{text-decoration:underline}#header-navi li a,#logoTitle,#tagsPanel .tagPanel,.article-title a,.error-panel a{text-decoration:none}h1{font-size:200%}h4{font-size:160%}h5{font-size:12px}.margin5R{margin-right:5px}.margin5{margin:5px}.wrapper{background:url(../images/light.gif) 50% 0 no-repeat;padding:20px 0}.content{margin:0 auto;width:936px}.header{background:url(../images/header.jpg) no-repeat;height:65px;padding:25px 30px 0}.body{background:url(../images/sidesep.gif) right center repeat-y #FFF;min-height:400px}.side-navi{background:url(../images/sidebar_shadow.gif) 50% 0 repeat-x #F7F7F7;font-size:95%;line-height:145%;padding-top:8px;width:300px}.main{background:url(../images/main_shadow.gif) center top repeat-x #FFF;padding:13px 15px 15px;width:605px}.footer{background:url(../images/footer.jpg) no-repeat;border-top:1px solid #CCC;font-size:11px;height:88px;line-height:145%;padding:0}#logoTitle{color:#FFF;display:block;font-family:"Trajan Pro";height:30px;outline:0}.sub-title{border-top:1px solid #FFF;color:#FFF;font-size:10px;padding:0 3px}#header-navi li a,#statistic{font-size:11px;line-height:31px}#header-navi{background:#FFF}.article-title,.comments{border-bottom:1px solid #CCC}#header-navi li{float:left;list-style:none;margin-left:0}#header-navi li a{background:url(../images/menu.gif) no-repeat;color:#382E1F;display:block;height:31px;margin-left:-10px;outline:0;padding:0 20px}#header-navi li a:hover{background-position:0 -31px}#header-navi li a.home{background-position:0 -93px;margin-left:0;padding:0;text-indent:-999em;width:45px}#header-navi li a.home:hover{background-position:0 -124px}#header-navi li a.lastNavi:hover{background-position:0 0}#header-navi li.selected a{background-position:0 -62px}#header-navi li.selected a.home{background-position:0 -155px}#statistic{margin-right:15px}.footer .copyright{padding:12px;width:857px}.footer .copyright span{margin:0}.footer .goTop{background:url(../images/icons.gif) 0 -304px no-repeat;color:#2A2A2A;line-height:18px;margin:5px 17px 0 0;padding-left:16px;width:22px;white-space:nowrap}.article{padding-bottom:15px;overflow:hidden}.article-title{font-size:16px;margin-top:10px;padding:0 5px 3px}.article-relative h4,.article-title sup,.comment-content,.comment-form button,.comment-info{font-size:12px}.article-title a{color:#4C4C4C}.article-title a:hover{color:#2970A6}.article-abstract{line-height:145%;margin:10px 0 10px 5px;word-wrap:break-word}.article-browserIcon,.articles-commentIcon,.authorIcon,.dateIcon,.tagsIcon{background:url(../images/icons.gif) 0 -400px no-repeat;float:left;height:16px;margin-right:6px;width:16px}.tagsIcon{background-position:0 -400px;margin-left:15px}.dateIcon{background-position:0 -48px;margin-left:15px}.authorIcon{background-position:0 0}.articles-commentIcon{background-position:0 -96px}.article-browserIcon{background-position:0 -480px}.article-body{line-height:145%;padding:5px 0 0 5px}.article-footer{margin:0 5px 10px}.article-relative{line-height:22px;margin-top:24px}.comments{background:#FCFCFC;border-top:1px solid #CCC;margin:15px -15px;padding:0 15px 15px;position:relative}.comment-title{background-color:#E3E9FF;border-top:1px solid #36C;padding:3px 12px;position:relative}.comment-body-ref{background-color:#FFF;filter:alpha(opacity=90);left:217px;opacity:.9;padding:6px;position:absolute;width:605px;z-index:10}.comment-body{margin-top:15px}.comment-author{float:left;text-align:center;width:81px}.comment-author div{background:url(../images/commentpoint.png) 100% 33% no-repeat;margin-top:10px;padding-right:14px}.comment-author img{border:1px solid #999;height:32px;padding:1px;width:32px}.comment-author a{font-weight:700;white-space:nowrap;margin-right:14px}.comment-info{background:url(../images/comment.gif) no-repeat #EDEFF0;padding:10px 15px 0;width:494px}.comment-content{background:url(../images/comment.gif) 100% 100% no-repeat;line-height:145%;margin:0 -15px;overflow:hidden;padding:9px 15px 10px;word-wrap:break-word}.comment-form input,.comment-form textarea{background:url(../images/textfield.gif) 50% 0 repeat-x #FFF;border:1px solid #A6A6A6;color:#555;font-family:Helvetica,Arial,sans-serif;height:16px;outline:0;padding:2px 1px;width:200px}.comment-form textarea{font-size:12px;height:auto;width:601px}.comment-form button{background:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-radius:0;border-style:solid;border-width:1px;color:#2970A6;height:24px;line-height:24px;padding:0 6px}.comment-form button:hover{background:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.error-msg{color:#36C}.side-navi ul{list-style:none;margin-top:10px}.side-navi .item{padding:15px}.side-navi sup{margin-right:3px;color:#555}.side-navi .navi-comments img{border:1px solid #999;height:32px;margin-right:7px;padding:1px;width:32px}.side-navi .navi-comments a{font-weight:700}.side-navi .navi-comments .side-comment{color:#555;font-weight:400;height:18px}.side-navi .navi-comments div.left>div>div{display:none}.side-navi .navi-comments .side-comment img{border:0;height:16px;margin-right:0;padding:0;width:16px}.side-navi .navi-comments li{padding:2px 0}.side-navi .navi-comments li div{width:227px}.side-navi a.selected{color:#555;text-decoration:none}.side-navi .navi-comments li,.side-navi ul.navi-tags li{background-image:none;padding-left:0}.side-navi ul.navi-tags li img{height:16px;padding-right:6px;width:16px}.side-navi li{background:url(../images/icons.gif) 0 -623px no-repeat;margin:5px 0 0;padding-left:20px;white-space:nowrap}.side-navi li.aboutMe{white-space:normal}.side-navi .line{background:url(../images/widgetsep.png) center bottom no-repeat;height:6px;width:300px}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px}.error-panel a,.pagination a.selected{color:#000;font-weight:700}#tagsPanel .tagPanel{border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:#EEE;border:2px dashed}.error-body{background:url(../images/main_shadow.gif) center top repeat-x #FFF;height:400px;padding:12px}.error-title{line-height:72px}.error-panel{margin-left:35px;width:201px}.error-panel a{background-color:#9CD941;border-color:#D0F29D #398A38 #398A38 #D0F29D;border-style:solid;border-width:1px;font-size:14px;margin-right:3px;padding:10px 15px}.error-panel a:hover{background-color:#ADEb51}.kind-panel{background:url(../images/box.gif) 100% 100% no-repeat #F4F5F7;margin-bottom:10px;padding:8px 12px}.kind-title{background:url(../images/box.gif) no-repeat #E3E4E6;border-bottom:1px solid #CCC;font-weight:700;padding:6px 12px} \ No newline at end of file +@charset "utf-8";#header-navi,.header{border-bottom:1px solid #A6A6A6}.side-navi .navi-comments li div,.side-navi li{overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.comment-form img,.footer .goTop{cursor:pointer}img{max-width:100%;height:auto}.bg{background:url(../images/bg.jpg) repeat-x #BEC3C6;color:#555}a,a:active,a:link,a:visited{color:#2970A6;text-decoration:none}a:hover{text-decoration:underline}#header-navi li a,#logoTitle,#tagsPanel .tagPanel,.article-title a,.error-panel a{text-decoration:none}h1{font-size:200%}h4{font-size:160%}h5{font-size:12px}.margin5R{margin-right:5px}.margin5{margin:5px}.wrapper{background:url(../images/light.gif) 50% 0 no-repeat;padding:20px 0}.content{margin:0 auto;width:936px}.header{background:url(../images/header.jpg) no-repeat;height:65px;padding:25px 30px 0}.body{background:url(../images/sidesep.gif) right center repeat-y #FFF;min-height:400px}.side-navi{background:url(../images/sidebar_shadow.gif) 50% 0 repeat-x #F7F7F7;font-size:95%;line-height:145%;padding-top:8px;width:300px}.main{background:url(../images/main_shadow.gif) center top repeat-x #FFF;padding:13px 15px 15px;width:605px}.footer{background:url(../images/footer.jpg) no-repeat;border-top:1px solid #CCC;font-size:11px;height:88px;line-height:145%;padding:0}#logoTitle{color:#FFF;display:block;font-family:"Trajan Pro";height:30px;outline:0}.sub-title{border-top:1px solid #FFF;color:#FFF;font-size:10px;padding:0 3px}#header-navi li a,#statistic{font-size:11px;line-height:31px}#header-navi{background:#FFF}.article-title,.comments{border-bottom:1px solid #CCC}#header-navi li{float:left;list-style:none;margin-left:0}#header-navi li a{background:url(../images/menu.gif) no-repeat;color:#382E1F;display:block;height:31px;margin-left:-10px;outline:0;padding:0 20px}#header-navi li a:hover{background-position:0 -31px}#header-navi li a.home{background-position:0 -93px;margin-left:0;padding:0;text-indent:-999em;width:45px}#header-navi li a.home:hover{background-position:0 -124px}#header-navi li a.lastNavi:hover{background-position:0 0}#header-navi li.selected a{background-position:0 -62px}#header-navi li.selected a.home{background-position:0 -155px}#statistic{margin-right:15px}.footer .copyright{padding:12px;width:857px}.footer .copyright span{margin:0}.footer .goTop{background:url(../images/icons.gif) 0 -304px no-repeat;color:#2A2A2A;line-height:18px;margin:5px 17px 0 0;padding-left:16px;width:22px;white-space:nowrap}.article{padding-bottom:15px;overflow:hidden}.article-title{font-size:16px;margin-top:10px;padding:0 5px 3px}.article-relative h4,.article-title sup,.comment-content,.comment-form button,.comment-info{font-size:12px}.article-title a{color:#4C4C4C}.article-title a:hover{color:#2970A6}.article-abstract{line-height:145%;margin:10px 0 10px 5px;word-wrap:break-word}.article-browserIcon,.articles-commentIcon,.authorIcon,.dateIcon,.tagsIcon{background:url(../images/icons.gif) 0 -400px no-repeat;float:left;height:16px;margin-right:6px;width:16px}.tagsIcon{background-position:0 -400px;margin-left:15px}.dateIcon{background-position:0 -48px;margin-left:15px}.authorIcon{background-position:0 0}.articles-commentIcon{background-position:0 -96px}.article-browserIcon{background-position:0 -480px}.article-body{line-height:145%;padding:5px 0 0 5px}.article-footer{margin:0 5px 10px}.article-relative{line-height:22px;margin-top:24px}.comments{background:#FCFCFC;border-top:1px solid #CCC;margin:15px -15px;padding:0 15px 15px;position:relative}.comment-title{background-color:#E3E9FF;border-top:1px solid #36C;padding:3px 12px;position:relative}.comment-body-ref{background-color:#FFF;filter:alpha(opacity=90);left:217px;opacity:.9;padding:6px;position:absolute;width:605px;z-index:10}.comment-body{margin-top:15px}.comment-author{float:left;text-align:center;width:81px}.comment-author div{background:url(../images/commentpoint.png) 100% 33% no-repeat;margin-top:10px;padding-right:14px}.comment-author img{border:1px solid #999;height:32px;padding:1px;width:32px}.comment-author a{font-weight:700;white-space:nowrap;margin-right:14px}.comment-info{background:url(../images/comment.gif) no-repeat #EDEFF0;padding:10px 15px 0;width:494px}.comment-content{background:url(../images/comment.gif) 100% 100% no-repeat;line-height:145%;margin:0 -15px;overflow:hidden;padding:9px 15px 10px;word-wrap:break-word}.comment-form input,.comment-form textarea{background:url(../images/textfield.gif) 50% 0 repeat-x #FFF;border:1px solid #A6A6A6;color:#555;font-family:Helvetica,Arial,sans-serif;height:16px;outline:0;padding:2px 1px;width:200px}.comment-form textarea{font-size:12px;height:auto;width:601px}.comment-form button{background:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-radius:0;border-style:solid;border-width:1px;color:#2970A6;height:24px;line-height:24px;padding:0 6px}.comment-form button:hover{background:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}.error-msg{color:#36C}.side-navi ul{list-style:none;margin-top:10px}.side-navi .item{padding:15px}.side-navi sup{margin-right:3px;color:#555}.side-navi .navi-comments li>img{border:1px solid #999;height:32px;margin-right:7px;padding:1px;width:32px}.side-navi .navi-comments a{font-weight:700}.side-navi .navi-comments .side-comment{color:#555;font-weight:400;height:18px}.side-navi .navi-comments div.left>div>div{display:none}.side-navi .navi-comments .side-comment img{border:0;height:16px;margin-right:0;padding:0;width:16px}.side-navi .navi-comments li{padding:2px 0}.side-navi .navi-comments li div{width:227px}.side-navi a.selected{color:#555;text-decoration:none}.side-navi .navi-comments li,.side-navi ul.navi-tags li{background-image:none;padding-left:0}.side-navi ul.navi-tags li img{height:16px;padding-right:6px;width:16px}.side-navi li{background:url(../images/icons.gif) 0 -623px no-repeat;margin:5px 0 0;padding-left:20px;white-space:nowrap}.side-navi li.aboutMe{white-space:normal}.side-navi .line{background:url(../images/widgetsep.png) center bottom no-repeat;height:6px;width:300px}.pagination{margin:16px;text-align:center}.pagination a,.pagination a:visited{color:#4272DB;padding:0 3px}.error-panel a,.pagination a.selected{color:#000;font-weight:700}#tagsPanel .tagPanel{border:2px solid;border-radius:6px;cursor:pointer;float:left;margin:3px}#tagsPanel .tagPanel:hover{background-color:#EEE;border:2px dashed}.error-body{background:url(../images/main_shadow.gif) center top repeat-x #FFF;height:400px;padding:12px}.error-title{line-height:72px}.error-panel{margin-left:35px;width:201px}.error-panel a{background-color:#9CD941;border-color:#D0F29D #398A38 #398A38 #D0F29D;border-style:solid;border-width:1px;font-size:14px;margin-right:3px;padding:10px 15px}.error-panel a:hover{background-color:#ADEb51}.kind-panel{background:url(../images/box.gif) 100% 100% no-repeat #F4F5F7;margin-bottom:10px;padding:8px 12px}.kind-title{background:url(../images/box.gif) no-repeat #E3E4E6;border-bottom:1px solid #CCC;font-weight:700;padding:6px 12px} \ No newline at end of file diff --git a/i-nove/side.ftl b/i-nove/side.ftl index d88c538..e9861d1 100644 --- a/i-nove/side.ftl +++ b/i-nove/side.ftl @@ -24,7 +24,7 @@
- + ${comment.commentContent}
diff --git a/metro-hot/article.ftl b/metro-hot/article.ftl index c233df3..139d7f8 100644 --- a/metro-hot/article.ftl +++ b/metro-hot/article.ftl @@ -68,7 +68,6 @@ ${article.articleSign.signHTML} -
<@comments commentList=articleComments article=article> <#include "copyright.ftl"/> @@ -77,9 +76,18 @@ <#include "footer.ftl"> <@comment_script oId=article.oId> - page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; + MetroHot.tips = { + externalRelevantArticlesDisplayCount: "${externalRelevantArticlesDisplayCount}", + blogHost: "${blogHost}" + } + <#if 0 != randomArticlesDisplayCount> + MetroHot.loadRandomArticles(); + + <#if 0 != relevantArticlesDisplayCount> + MetroHot.loadRelevantArticles('${article.oId}', '

${relevantArticles1Label}

'); + <#if 0 != externalRelevantArticlesDisplayCount> - page.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,"); + MetroHot.loadExternalRelevantArticles("<#list article.articleTags?split(",") as articleTag>${articleTag}<#if articleTag_has_next>,"); diff --git a/metro-hot/lang/lang_zh_CN.properties b/metro-hot/lang/lang_zh_CN.properties index 02f64a3..aab4135 100644 --- a/metro-hot/lang/lang_zh_CN.properties +++ b/metro-hot/lang/lang_zh_CN.properties @@ -76,7 +76,7 @@ captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01 loadingLabel=\u8F7D\u5165\u4E2D.... relevantArticlesLabel=\u76F8\u5173\u9605\u8BFB randomArticlesLabel=\u968F\u673A\u9605\u8BFB -externalRelevantArticlesLabel=\u7AD9\u5916\u76F8\u5173\u9605\u8BFB +externalRelevantArticlesLabel=\u7AD9\u5916\u9605\u8BFB captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF b3logLabel=B3LOG killBrowserLabel=

\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u5427\uFF01

\u4E3A\u4E86\u8BA9\u6D4F\u89C8\u5668\u66F4\u597D\u7684\u53D1\u5C55\uFF0C\u4EBA\u7C7B\u66F4\u52A0\u7684\u8FDB\u6B65\uFF0C\u62E5\u6709\u66F4\u597D\u7684\u4F53\u9A8C\uFF0C\u8BA9\u6211\u4EEC\u653E\u5F03\u4F7F\u7528\u90A3\u4E9B\u8FC7\u65F6\u3001\u4E0D\u5B89\u5168\u7684\u6D4F\u89C8\u5668\u3002

\u60A8\u53EF\u4EE5\u4E0B\u8F7D diff --git a/mobile/side.ftl b/mobile/side.ftl index 0ece614..fb618ae 100644 --- a/mobile/side.ftl +++ b/mobile/side.ftl @@ -21,7 +21,7 @@ ${comment.commentName}<#else> ${comment.commentName}: - + ${comment.commentContent} diff --git a/mobile/skin.properties b/mobile/skin.properties index fcdc194..2424056 100644 --- a/mobile/skin.properties +++ b/mobile/skin.properties @@ -20,5 +20,5 @@ # Author: Liang Ding # -name=Mobile -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 +name=mobile +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/neoease/css/neoease.css b/neoease/css/neoease.css index a3a6f2c..cd5cf62 100644 --- a/neoease/css/neoease.css +++ b/neoease/css/neoease.css @@ -17,7 +17,7 @@ * skin neoease style * * @author Liyuan Li - * @version 1.0.2.8, Mar 27, 2017 + * @version 1.0.2.9, Aug 30, 2017 */ /* start base */ html, body, div, ul, li, h1, h2, h3, h4, h5, h6 { @@ -498,6 +498,10 @@ textarea, input { .recent-comments-content a:hover { text-decoration: none; } + +.recent-comments-content p { + margin: 0; +} /* end side */ /* start article list */ diff --git a/neoease/css/neoease.min.css b/neoease/css/neoease.min.css index 6c13272..301a225 100644 --- a/neoease/css/neoease.min.css +++ b/neoease/css/neoease.min.css @@ -13,4 +13,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -a:active,body{color:#333}.nav ul,.side ul{list-style:none}.recent-comments-content,.side .side-li li{text-overflow:ellipsis;-o-text-overflow:ellipsis;overflow:hidden}.article-body,.clear,.main,.side,.side .side-li li{overflow:hidden}#goTop,.form img,.translate-ico{cursor:pointer}a:link,input,textarea{outline:0}#tagsSide li a,.form th,.side .side-li a{white-space:nowrap}body,div,h1,h2,h3,h4,h5,h6,html,li,ul{margin:0;padding:0}::selection{background-color:#ccc;color:#fff}::-moz-selection{background-color:#ccc;color:#fff}body{font-family:"Lucida Grande",Verdana,"\5fae\8f6f\96c5\9ed1";font-size:12px;background-color:#F9F9F9}a:link{color:#21759B;text-decoration:none}a:visited{color:#555777}a:hover{color:#D54E21}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0}.em-br,.em-span{line-height:24px}.none{display:none}.logo{padding:0 5px;text-shadow:0 0 1px #EEE}.tip{color:#D54E21;font-size:11px}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{background-image:url(../../../images/emotions/emotions.png);background-size:120px;float:left;height:24px;margin-right:5px;width:24px}.collapse-ico,.date-ico,.expand-ico,.tag-ico,.translate-ico,.user-ico{background-repeat:no-repeat;height:16px}.em01{background-position:-24px 0}.em02{background-position:-48px 0}.em03{background-position:-72px 0}.em04{background-position:-96px 0}.em05{background-position:0 -24px}.em06{background-position:-24px -24px}.em07{background-position:-48px -24px}.em08{background-position:-72px -24px}.em09{background-position:-96px -24px}.em10{background-position:0 -48px}.em11{background-position:-24px -48px}.em12{background-position:-48px -48px}.em13{background-position:-72px -48px}.em14{background-position:-96px -48px}.em-span{float:left}#search,.collapse-ico,.date-ico,.expand-ico,.feed-ico,.tag-ico,.translate-ico,.user-ico{background-image:url(../images/icons.png)}.feed-ico{background-position:right -146px;background-repeat:no-repeat;color:#333;padding-right:24px}.translate-ico{background-position:1px -125px;border:1px solid #999;border-radius:3px;float:right;margin:6px 0 0 18px;padding:1px;width:16px}.translate-ico:hover{border-color:#D54E21;box-shadow:0 0 1px #999;background-color:#F2F2F2}.collapse-ico,.expand-ico{background-position:54px -84px;cursor:pointer}.collapse-ico{background-position:54px -69px}.date-ico,.tag-ico,.user-ico{display:block;padding-left:20px}.tag-ico{margin:6px 6px 0 0}.date-ico{float:left;background-position:0 -16px}.user-ico{background-position:0 -32px;float:left;margin-left:12px}.wrapper{margin:0 auto;width:960px}.body{border-top:2px solid #DDD}.main{float:left;margin:16px 0 50px;width:667px}.header{background:url(../images/icons.png) 0 -220px repeat-x #F2F2F2;padding:20px 0}.header .title{border-bottom:1px solid #242424;color:#000;font-size:26px;font-weight:400}.header .sub-title{color:#242424;font-size:11px}#search,.nav a{font-size:14px}#search{background-position:7px -99px;background-repeat:no-repeat;background-color:#FFF;border:1px solid #DDD;border-radius:2px;box-shadow:0 1px 1px rgba(0,0,0,.1) inset;color:#888;float:right;height:20px;line-height:145%;padding:3px 10px 3px 28px;width:24px;-moz-transition:width .4s ease,background .4s ease;-webkit-transition:width .4s ease,background .4s ease;transition:width .4s ease,background .4s ease}.nav a,.nav li,.nav ul{float:left}#search:focus{background-color:#F9F9F9;width:196px}.nav{background-color:#E9E9E9;border-bottom:1px solid #CCC}.nav a{color:#666;display:block;height:30px;line-height:30px;padding:0 15px;text-shadow:0 1px 0 #EEE}#goTop,.footer{font-size:11px}.nav a:hover{color:#D54E21;background-color:#DDD}.nav .current{background-color:#DDD;margin:-1px 0;padding-right:2px}.nav .current a{background-color:#F9F9F9;border-color:#CCC #CCC #F9F9F9;border-style:solid;border-width:1px 1px 3px;font-weight:700;height:33px;line-height:33px;margin:-2px 0 -3px;color:#333;text-shadow:1px 1px 1px #C6D9E9}.nav img{margin-left:3px}.nav .right{line-height:29px}.footer{background-color:#E9E9E9;border-top:3px solid #DDD;color:#999;padding:12px 0}.footer a{color:#787878}.footer a:hover{color:#D54E21}#goTop{background:url(../images/icons.png) 5px -51px no-repeat #DDD;border-radius:2px 2px 0 0;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:56px;display:none}#goTop:hover{background-color:#EAEAEA}.side{float:right;width:278px;margin-bottom:50px}.side>div{border-bottom:1px solid #DEDEDE;padding:10px 5px 15px}.side h4{font-size:14px;line-height:32px}#archiveSide{list-style:square;margin-left:18px}#archiveSide .archive-year{color:#D54E21;font-weight:700;height:18px;line-height:18px;list-style:none}.side a{line-height:18px;color:#21759B}.side a:hover{text-decoration:underline}.article-element a,.pagination a,.recent-comments-content a:hover{text-decoration:none}.side sup{color:#333}.side .side-li li{width:268px}.recent-comments li>img{background-color:#FFF;border:1px solid #999;padding:1px;width:32px;height:32px;margin-top:1px}.recent-comments-main{float:left;margin:0 0 9px 3px;width:229px}.recent-comments-main .collapse-ico,.recent-comments-main .expand-ico{background-position:0 -86px;float:right;width:16px;-moz-transition:opacity .4s ease;-webkit-transition:opacity .4s ease;transition:opacity .4s ease;opacity:0;filter:alpha(opacity=0)}.recent-comments li:hover .collapse-ico,.recent-comments li:hover .expand-ico{opacity:1;filter:alpha(opacity=100)}.recent-comments-main .collapse-ico{background-position:0 -70px}.recent-comments-content{height:18px}.recent-comments-content img{width:16px}.recent-comments-content a{color:#555777}.article{border-bottom:1px solid #CCC;padding:0 5px 10px;margin-top:20px}.article-element{font-size:11px;line-height:16px;margin:12px 0}.article-element a{border-bottom:1px solid #DFDFDF;color:#555;padding-bottom:1px}.article-element a:hover{color:#D54E21;border-bottom-color:#D54E21}.article-title{color:#21759B;font-size:20px;font-weight:400}.article-title:hover{color:#D54E21}.article .collapse-ico,.article .expand-ico{float:right;margin-top:9px;padding-right:6px;width:15px;background-position:0 -86px}.article .collapse-ico{background-position:0 -70px}.article-body{line-height:145%;word-wrap:break-word}.article-body h1{font-size:2em;margin:.67em 0}.article-body h2{font-size:1.5em;margin:.75em 0}.article-body h3{font-size:1.17em;margin:.83em 0}.article-body h4{font-size:.83em;margin:1.5em 0}.article-body h6{font-size:.75em;margin:1.67em 0}.article-body ol,.article-body ul{margin-left:40px}.article-body a{border-bottom:1px solid #DFDFDF}.article-body a:hover{color:#D54E21;border-bottom:1px solid #D54E21}.article-body p{line-height:18px}.pagination{margin-top:30px;line-height:21px}.pagination a{border:1px solid #C5C3C2;font-size:10px;margin:2px;padding:1px 5px;background-color:#F2F2F2}.pagination a.current{background-color:#FFF;font-weight:700;padding:2px 6px;color:#000}.pagination a:hover{background-color:#F3DEDD;color:#D54E21;border:1px solid #D54E21}#comments>div,.share{border-bottom:1px solid #DEDEDE}.page{margin-top:20px;padding:0 5px 5px}.article-panel1{background-color:#F2F2F2;padding:5px 10px}.article-panel2{background-color:#FFF;margin-top:12px;padding:5px 10px}.article-panel2 ul{line-height:18px;list-style:square;margin-left:18px}.share{margin-top:15px}.share-comment{background-color:#DDD;border-radius:2px 2px 0 0;float:right;font-size:11px;height:21px;line-height:21px;margin-right:16px;padding:0 10px}.share-comment:hover{background-color:#EAEAEA}#comments{position:relative}#comments>div{padding:10px;width:647px;background-color:#F5F5F5}#comments>div:nth-child(2n){background-color:#F8F8F8}#comments .comment-panel>.right{-moz-transition:opacity .4s ease;-webkit-transition:opacity .4s ease;transition:opacity .4s ease;opacity:0;filter:alpha(opacity=0)}#comments>div:hover .comment-panel>.right{opacity:1;filter:alpha(opacity=100)}.comment-header{height:50px;width:50px;float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:1px}.comment-panel{float:left;margin:0 10px;width:573px;line-height:16px}.comment-panel .article-body{margin-top:5px}#comments .comment-body-ref{border-bottom:0;background-color:#FFF;border-radius:5px;left:73px;position:absolute;box-shadow:1px 0 3px #DEDEDE;width:560px}.comment-body-ref .comment-panel{width:486px}.comment-body-ref .arrow{border-color:#F5F5F5 #FFF #F5F5F5 #F5F5F5;border-style:solid;border-width:6px 8px 10px 0;display:block;left:-8px;position:absolute;top:5px}.form{margin:10px}.form h4{margin:10px 0 5px 5px}.form th{text-align:right}.form input[type=text],.form input[type=password],.form textarea{border-color:silver #D9D9D9 #D9D9D9;border-style:solid;border-width:1px;font-family:"Lucida Grande",Verdana,'微软雅黑';font-size:12px;outline:0;padding:0 3px}.form input:focus,.form textarea:focus{box-shadow:0 1px 2px rgba(0,0,0,.3) inset}.form textarea{overflow:auto;resize:vertical;padding:3px;width:634px}.form input{height:24px;line-height:16px;width:260px}.form button{background-color:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;height:28px;line-height:28px;padding:0 12px}.form button:hover{background-color:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}#tags li{float:left;list-style:none;height:38px}#tags a:hover{text-shadow:0 0 2px}#tags a{border-radius:3px;box-shadow:1px 1px 3px #333;float:left;margin:3px 6px;padding:3px 12px}#tagsSide li a{float:left;line-height:145%;margin-right:7px}.tags1{font-size:12px;color:#A1A1A1}.tags2{font-size:14px;color:#687F95}.tags3{font-size:16px;color:#4C6E90}.tags4{font-size:18px;color:#258}.tags5{font-size:20px}#tagsSide .tags2{font-size:14px}#tagsSide .tags3{font-size:16px}#tagsSide .tags4{font-size:18px}#tagsSide .tags5{font-size:20px}.main>h2{margin-top:16px}.error{background-image:url(../images/404.png);float:left;height:536px;margin:50px 80px;position:relative;width:363px}.error h2{left:-68px;position:absolute;top:-20px}.error a{background-color:#9CD941;border:265px;bottom:12px;color:#333555;float:left;padding:10px 15px;position:absolute;right:-106px}.error a:hover{background-color:#ADEb51} \ No newline at end of file +a:active,body{color:#333}.nav ul,.side ul{list-style:none}.recent-comments-content,.side .side-li li{text-overflow:ellipsis;-o-text-overflow:ellipsis;overflow:hidden}.article-body,.clear,.main,.side,.side .side-li li{overflow:hidden}#goTop,.form img,.translate-ico{cursor:pointer}a:link,input,textarea{outline:0}#tagsSide li a,.form th,.side .side-li a{white-space:nowrap}body,div,h1,h2,h3,h4,h5,h6,html,li,ul{margin:0;padding:0}::selection{background-color:#ccc;color:#fff}::-moz-selection{background-color:#ccc;color:#fff}body{font-family:"Lucida Grande",Verdana,"\5fae\8f6f\96c5\9ed1";font-size:12px;background-color:#F9F9F9}a:link{color:#21759B;text-decoration:none}a:visited{color:#555777}a:hover{color:#D54E21}img{max-width:100%;vertical-align:middle;border:0;height:auto;-ms-interpolation-mode:bicubic}.left{float:left}.right{float:right}.clear{background-color:transparent;border:0;clear:both;display:block;font-size:0;height:0;line-height:0}.em-br,.em-span{line-height:24px}.none{display:none}.logo{padding:0 5px;text-shadow:0 0 1px #EEE}.tip{color:#D54E21;font-size:11px}.em00,.em01,.em02,.em03,.em04,.em05,.em06,.em07,.em08,.em09,.em10,.em11,.em12,.em13,.em14{background-image:url(../../../images/emotions/emotions.png);background-size:120px;float:left;height:24px;margin-right:5px;width:24px}.collapse-ico,.date-ico,.expand-ico,.tag-ico,.translate-ico,.user-ico{background-repeat:no-repeat;height:16px}.em01{background-position:-24px 0}.em02{background-position:-48px 0}.em03{background-position:-72px 0}.em04{background-position:-96px 0}.em05{background-position:0 -24px}.em06{background-position:-24px -24px}.em07{background-position:-48px -24px}.em08{background-position:-72px -24px}.em09{background-position:-96px -24px}.em10{background-position:0 -48px}.em11{background-position:-24px -48px}.em12{background-position:-48px -48px}.em13{background-position:-72px -48px}.em14{background-position:-96px -48px}.em-span{float:left}#search,.collapse-ico,.date-ico,.expand-ico,.feed-ico,.tag-ico,.translate-ico,.user-ico{background-image:url(../../neoease/images/icons.png)}.feed-ico{background-position:right -146px;background-repeat:no-repeat;color:#333;padding-right:24px}.translate-ico{background-position:1px -125px;border:1px solid #999;border-radius:3px;float:right;margin:6px 0 0 18px;padding:1px;width:16px}.translate-ico:hover{border-color:#D54E21;box-shadow:0 0 1px #999;background-color:#F2F2F2}.collapse-ico,.expand-ico{background-position:54px -84px;cursor:pointer}.collapse-ico{background-position:54px -69px}.date-ico,.tag-ico,.user-ico{display:block;padding-left:20px}.tag-ico{margin:6px 6px 0 0}.date-ico{float:left;background-position:0 -16px}.user-ico{background-position:0 -32px;float:left;margin-left:12px}.wrapper{margin:0 auto;width:960px}.body{border-top:2px solid #DDD}.main{float:left;margin:16px 0 50px;width:667px}.header{background:url(../../neoease/images/icons.png) 0 -220px repeat-x #F2F2F2;padding:20px 0}.header .title{border-bottom:1px solid #242424;color:#000;font-size:26px;font-weight:400}.header .sub-title{color:#242424;font-size:11px}#search,.nav a{font-size:14px}#search{background-position:7px -99px;background-repeat:no-repeat;background-color:#FFF;border:1px solid #DDD;border-radius:2px;box-shadow:0 1px 1px rgba(0,0,0,.1) inset;color:#888;float:right;height:20px;line-height:145%;padding:3px 10px 3px 28px;width:24px;-moz-transition:width .4s ease,background .4s ease;-webkit-transition:width .4s ease,background .4s ease;transition:width .4s ease,background .4s ease}.nav a,.nav li,.nav ul{float:left}#search:focus{background-color:#F9F9F9;width:196px}.nav{background-color:#E9E9E9;border-bottom:1px solid #CCC}.nav a{color:#666;display:block;height:30px;line-height:30px;padding:0 15px;text-shadow:0 1px 0 #EEE}#goTop,.footer{font-size:11px}.nav a:hover{color:#D54E21;background-color:#DDD}.nav .current{background-color:#DDD;margin:-1px 0;padding-right:2px}.nav .current a{background-color:#F9F9F9;border-color:#CCC #CCC #F9F9F9;border-style:solid;border-width:1px 1px 3px;font-weight:700;height:33px;line-height:33px;margin:-2px 0 -3px;color:#333;text-shadow:1px 1px 1px #C6D9E9}.nav img{margin-left:3px}.nav .right{line-height:29px}.footer{background-color:#E9E9E9;border-top:3px solid #DDD;color:#999;padding:12px 0}.footer a{color:#787878}.footer a:hover{color:#D54E21}#goTop{background:url(../../neoease/images/icons.png) 5px -51px no-repeat #DDD;border-radius:2px 2px 0 0;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:56px;display:none}#goTop:hover{background-color:#EAEAEA}.side{float:right;width:278px;margin-bottom:50px}.side>div{border-bottom:1px solid #DEDEDE;padding:10px 5px 15px}.side h4{font-size:14px;line-height:32px}#archiveSide{list-style:square;margin-left:18px}#archiveSide .archive-year{color:#D54E21;font-weight:700;height:18px;line-height:18px;list-style:none}.side a{line-height:18px;color:#21759B}.side a:hover{text-decoration:underline}.article-element a,.pagination a,.recent-comments-content a:hover{text-decoration:none}.side sup{color:#333}.side .side-li li{width:268px}.recent-comments li>img{background-color:#FFF;border:1px solid #999;padding:1px;width:32px;height:32px;margin-top:1px}.recent-comments-main{float:left;margin:0 0 9px 3px;width:229px}.recent-comments-main .collapse-ico,.recent-comments-main .expand-ico{background-position:0 -86px;float:right;width:16px;-moz-transition:opacity .4s ease;-webkit-transition:opacity .4s ease;transition:opacity .4s ease;opacity:0;filter:alpha(opacity=0)}.recent-comments li:hover .collapse-ico,.recent-comments li:hover .expand-ico{opacity:1;filter:alpha(opacity=100)}.recent-comments-main .collapse-ico{background-position:0 -70px}.recent-comments-content{height:18px}.recent-comments-content img{width:16px}.recent-comments-content a{color:#555777}.recent-comments-content p{margin:0}.article{border-bottom:1px solid #CCC;padding:0 5px 10px;margin-top:20px}.article-element{font-size:11px;line-height:16px;margin:12px 0}.article-element a{border-bottom:1px solid #DFDFDF;color:#555;padding-bottom:1px}.article-element a:hover{color:#D54E21;border-bottom-color:#D54E21}.article-title{color:#21759B;font-size:20px;font-weight:400}.article-title:hover{color:#D54E21}.article .collapse-ico,.article .expand-ico{float:right;margin-top:9px;padding-right:6px;width:15px;background-position:0 -86px}.article .collapse-ico{background-position:0 -70px}.article-body{line-height:145%;word-wrap:break-word}.article-body h1{font-size:2em;margin:.67em 0}.article-body h2{font-size:1.5em;margin:.75em 0}.article-body h3{font-size:1.17em;margin:.83em 0}.article-body h4{font-size:.83em;margin:1.5em 0}.article-body h6{font-size:.75em;margin:1.67em 0}.article-body ol,.article-body ul{margin-left:40px}.article-body a{border-bottom:1px solid #DFDFDF}.article-body a:hover{color:#D54E21;border-bottom:1px solid #D54E21}.article-body p{line-height:18px}.pagination{margin-top:30px;line-height:21px}.pagination a{border:1px solid #C5C3C2;font-size:10px;margin:2px;padding:1px 5px;background-color:#F2F2F2}.pagination a.current{background-color:#FFF;font-weight:700;padding:2px 6px;color:#000}.pagination a:hover{background-color:#F3DEDD;color:#D54E21;border:1px solid #D54E21}#comments>div,.share{border-bottom:1px solid #DEDEDE}.page{margin-top:20px;padding:0 5px 5px}.article-panel1{background-color:#F2F2F2;padding:5px 10px}.article-panel2{background-color:#FFF;margin-top:12px;padding:5px 10px}.article-panel2 ul{line-height:18px;list-style:square;margin-left:18px}.share{margin-top:15px}.share-comment{background-color:#DDD;border-radius:2px 2px 0 0;float:right;font-size:11px;height:21px;line-height:21px;margin-right:16px;padding:0 10px}.share-comment:hover{background-color:#EAEAEA}#comments{position:relative}#comments>div{padding:10px;width:647px;background-color:#F5F5F5}#comments>div:nth-child(2n){background-color:#F8F8F8}#comments .comment-panel>.right{-moz-transition:opacity .4s ease;-webkit-transition:opacity .4s ease;transition:opacity .4s ease;opacity:0;filter:alpha(opacity=0)}#comments>div:hover .comment-panel>.right{opacity:1;filter:alpha(opacity=100)}.comment-header{height:50px;width:50px;float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:1px}.comment-panel{float:left;margin:0 10px;width:573px;line-height:16px}.comment-panel .article-body{margin-top:5px}#comments .comment-body-ref{border-bottom:0;background-color:#FFF;border-radius:5px;left:73px;position:absolute;box-shadow:1px 0 3px #DEDEDE;width:560px}.comment-body-ref .comment-panel{width:486px}.comment-body-ref .arrow{border-color:#F5F5F5 #FFF #F5F5F5 #F5F5F5;border-style:solid;border-width:6px 8px 10px 0;display:block;left:-8px;position:absolute;top:5px}.form{margin:10px}.form h4{margin:10px 0 5px 5px}.form th{text-align:right}.form input[type=text],.form input[type=password],.form textarea{border-color:silver #D9D9D9 #D9D9D9;border-style:solid;border-width:1px;font-family:"Lucida Grande",Verdana,'微软雅黑';font-size:12px;outline:0;padding:0 3px}.form input:focus,.form textarea:focus{box-shadow:0 1px 2px rgba(0,0,0,.3) inset}.form textarea{overflow:auto;resize:vertical;padding:3px;width:634px}.form input{height:24px;line-height:16px;width:260px}.form button{background-color:#B4D666;border-color:#B4D666 #81B840 #81B840 #B4D666;border-style:solid;border-width:1px;color:#2970A6;height:28px;line-height:28px;padding:0 12px}.form button:hover{background-color:#98C64C;border-color:#76B33A #98C64C #98C64C #76B33A;color:#074A7E}#tags li{float:left;list-style:none;height:38px}#tags a:hover{text-shadow:0 0 2px}#tags a{border-radius:3px;box-shadow:1px 1px 3px #333;float:left;margin:3px 6px;padding:3px 12px}#tagsSide li a{float:left;line-height:145%;margin-right:7px}.tags1{font-size:12px;color:#A1A1A1}.tags2{font-size:14px;color:#687F95}.tags3{font-size:16px;color:#4C6E90}.tags4{font-size:18px;color:#258}.tags5{font-size:20px}#tagsSide .tags2{font-size:14px}#tagsSide .tags3{font-size:16px}#tagsSide .tags4{font-size:18px}#tagsSide .tags5{font-size:20px}.main>h2{margin-top:16px}.error{background-image:url(../../neoease/images/404.png);float:left;height:536px;margin:50px 80px;position:relative;width:363px}.error h2{left:-68px;position:absolute;top:-20px}.error a{background-color:#9CD941;border:265px;bottom:12px;color:#333555;float:left;padding:10px 15px;position:absolute;right:-106px}.error a:hover{background-color:#ADEb51} \ No newline at end of file diff --git a/tree-house/header.ftl b/tree-house/header.ftl index cef1a94..b22f46a 100644 --- a/tree-house/header.ftl +++ b/tree-house/header.ftl @@ -22,9 +22,4 @@
${blogSubtitle}
- \ No newline at end of file diff --git a/tree-house/images/fan.swf b/tree-house/images/fan.swf deleted file mode 100644 index 95d6573..0000000 Binary files a/tree-house/images/fan.swf and /dev/null differ diff --git a/tree-house/side.ftl b/tree-house/side.ftl index fb50206..9c39e20 100644 --- a/tree-house/side.ftl +++ b/tree-house/side.ftl @@ -32,7 +32,7 @@