diff --git a/skin-preview/README.md b/skin-preview/README.md new file mode 100644 index 0000000..a3ae8ca --- /dev/null +++ b/skin-preview/README.md @@ -0,0 +1,10 @@ +存放皮肤效果图 +------------------------------------------------------ +命名方式：皮肤名称-页面.png + +---------------------------- +平等，自由，奔放 + +Equality, Freedom, Passion + +;-） diff --git a/skin-preview/favourite.png b/skin-preview/favourite.png index 0eadf25..97a6e40 100644 Binary files a/skin-preview/favourite.png and b/skin-preview/favourite.png differ diff --git a/skin-preview/timeline.png b/skin-preview/timeline.png new file mode 100644 index 0000000..2c49d7a Binary files /dev/null and b/skin-preview/timeline.png differ diff --git a/timeline/article.ftl b/timeline/article.ftl index b9e5df6..aeb8dd5 100644 --- a/timeline/article.ftl +++ b/timeline/article.ftl @@ -92,6 +92,8 @@ <#include "footer.ftl"> - <@comment_script oId=article.oId> + <@comment_script oId=article.oId> + page.tips.externalRelevantArticlesDisplayCount = "${externalRelevantArticlesDisplayCount}"; + diff --git a/timeline/css/timeline.css b/timeline/css/timeline.css index e7bafcf..1722f4b 100644 --- a/timeline/css/timeline.css +++ b/timeline/css/timeline.css @@ -702,18 +702,24 @@ article .article-title a { .nav-abs li { background-color: #DEDDDD; + border: 1px solid #6B6B6B; color: #616161; cursor: pointer; + float: left; height: 20px; list-style-type: none; - min-width: 54px; padding: 3px 5px; + width: 28px; } .nav-abs li.year { - color: #CCCCCC; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); background-color: #6B6B6B; + clear: both; + color: #CCCCCC; + float: none; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.5); + width: auto; + border-width: 0; } .nav-abs li:hover { @@ -721,7 +727,7 @@ article .article-title a { color: #000; } -.nav-abs li.year:hover { +.nav-abs li.year:hover, .nav-abs li.open { background-color: #353535; color: #fff; } diff --git a/timeline/css/timeline.min.css b/timeline/css/timeline.min.css index 1a56467..5e36ce8 100644 --- a/timeline/css/timeline.min.css +++ b/timeline/css/timeline.min.css @@ -105,7 +105,7 @@ article .article-title a{color:#000;text-decoration:none;} #submitCommentButton,#submitCommentButtonReply{background:none repeat scroll 0 0 #868889;border:1px solid #5D6265;border-radius:10em 10em 10em 10em;box-shadow:0 1px 0 rgba(255, 255, 255, 0.3) inset,0 1px 1px rgba(0, 0, 0, 0.3);color:#FFFFFF;cursor:pointer;padding:5px 20px;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.3);} #submitCommentButton:hover,#submitCommentButtonReply:hover{color:#fff;background-color:#444;} .nav-abs{background-color:#6B6B6B;border:1px solid #898989;border-radius:5px 5px 5px 5px;box-shadow:0 1px 3px rgba(0, 0, 0, 0.4) inset,0 1px 0 rgba(255, 255, 255, 0.7),0 -1px 0 rgba(255, 255, 255, 0.6);color:#CCCCCC;padding:5px 10px;position:absolute;right:30px;top:61px;z-index:1;text-align:center;white-space:nowrap;} -.nav-abs li{background-color:#DEDDDD;color:#616161;cursor:pointer;height:20px;list-style-type:none;min-width:54px;padding:3px 5px;} -.nav-abs li.year{color:#CCCCCC;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.5);background-color:#6B6B6B;} +.nav-abs li{background-color:#DEDDDD;border:1px solid #6B6B6B;color:#616161;cursor:pointer;float:left;height:20px;list-style-type:none;padding:3px 5px;width:28px;} +.nav-abs li.year{background-color:#6B6B6B;clear:both;color:#CCCCCC;float:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.5);width:auto;border-width:0;} .nav-abs li:hover{background-color:#EFEEEE;color:#000;} -.nav-abs li.year:hover{background-color:#353535;color:#fff;} +.nav-abs li.year:hover,.nav-abs li.open{background-color:#353535;color:#fff;} diff --git a/timeline/index.ftl b/timeline/index.ftl index 2aaa74e..63a4e9c 100644 --- a/timeline/index.ftl +++ b/timeline/index.ftl @@ -4,20 +4,20 @@ <@head title="${blogTitle}"> - + ${topBarReplacement} <#include "header.ftl"> -