Skip to content

S
solo-1
Commit 01bed7f5 authored by Vanessa's avatar Vanessa
Browse files
Options

ease skin change

parent 9ba1feb5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 39 deletions
war/src/main/webapp/skins/ease/css/ease.css
View file @ 01bed7f5
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
* skin ease style * skin ease style
* *
* @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a> * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
* @version 1.0.1.5, Jul 20, 2012 * @version 1.0.1.6, Jul 24, 2012
*/ */
/* start base */ /* start base */
html, body, div, ul, li { html, body, div, ul, li {
...@@ -337,7 +337,7 @@ sup { ...@@ -337,7 +337,7 @@ sup {
.article { .article {
border-bottom: 1px solid #f6f6f6; border-bottom: 1px solid #f6f6f6;
padding: 20px 70px 20px; padding: 30px 50px;
} }
.article:hover { .article:hover {
...@@ -403,7 +403,7 @@ sup { ...@@ -403,7 +403,7 @@ sup {
float: left; float: left;
margin: 10px 0; margin: 10px 0;
padding: 0 20px 10px; padding: 0 20px 10px;
width: 365px; width: 385px;
} }
.article-relative:hover { .article-relative:hover {
...@@ -420,14 +420,14 @@ sup { ...@@ -420,14 +420,14 @@ sup {
} }
#externalRelevantArticles { #externalRelevantArticles {
width: 297px; width: 357px;
margin-top: 0; margin-top: 0;
} }
/* end article*/ /* end article*/
/* start comment */ /* start comment */
#comments { #comments {
padding: 20px 70px 20px; padding: 20px 50px;
position: relative; position: relative;
} }
...@@ -443,17 +443,17 @@ sup { ...@@ -443,17 +443,17 @@ sup {
.comment-panel { .comment-panel {
float: left; float: left;
line-height: 16px; line-height: 16px;
margin: 0 10px 20px; margin: 0 0 20px 10px;
min-height: 64px; min-height: 64px;
overflow: hidden; overflow: hidden;
width: 760px; width: 814px;
} }
.comment-body-ref { .comment-body-ref {
background-color: #FCFCFC; background-color: #FCFCFC;
box-shadow: 0 0 2px #D5D5D5; box-shadow: 0 0 2px #D5D5D5;
display: block; display: block;
left: 140px; left: 127px;
padding: 10px; padding: 10px;
opacity: 0.9; opacity: 0.9;
filter: alpha(opacity=90); filter: alpha(opacity=90);
...@@ -471,11 +471,19 @@ sup { ...@@ -471,11 +471,19 @@ sup {
.comment-body-ref > .comment-panel { .comment-body-ref > .comment-panel {
margin: 0 20px 0 0; margin: 0 20px 0 0;
min-height: 48px; min-height: 48px;
width: 756px; width: 725px;
}
.comment-body-ref > .comment-panel > .right {
display: none;
}
#replyForm {
margin-left: 25px;
} }
.form { .form {
padding: 0 70px 20px; padding: 0 50px 20px;
} }
.wrapper > .form { .wrapper > .form {
...@@ -522,7 +530,7 @@ sup { ...@@ -522,7 +530,7 @@ sup {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
padding: 0 12px; padding: 0 12px;
color: #A7A7A7; color: #808080;
} }
.form button:hover { .form button:hover {
...@@ -540,6 +548,11 @@ sup { ...@@ -540,6 +548,11 @@ sup {
/* end comment */ /* end comment */
/* start tags */ /* start tags */
#tags.other-main {
margin: 47px 44px 0;
width: 902px;
}
#tags li { #tags li {
float: left; float: left;
height: 38px; height: 38px;
...@@ -596,7 +609,7 @@ sup { ...@@ -596,7 +609,7 @@ sup {
padding-bottom: 20px; padding-bottom: 20px;
line-height: 20px; line-height: 20px;
margin: 20px; margin: 20px;
width: 276px; width: 270px;
position: absolute; position: absolute;
top: 0; top: 0;
} }
...@@ -611,7 +624,7 @@ sup { ...@@ -611,7 +624,7 @@ sup {
.archives a { .archives a {
display: block; display: block;
margin-left: 80px; margin-left: 77px;
} }
/* end archives */ /* end archives */
...@@ -631,7 +644,7 @@ sup { ...@@ -631,7 +644,7 @@ sup {
line-height: 20px; line-height: 20px;
margin: 20px; margin: 20px;
padding: 10px 20px 20px; padding: 10px 20px 20px;
width: 393px; width: 385px;
} }
.dynamic .module:hover { .dynamic .module:hover {
...@@ -647,27 +660,37 @@ sup { ...@@ -647,27 +660,37 @@ sup {
} }
.dynamic .side-tags { .dynamic .side-tags {
width: 186px; width: 170px;
} }
.dynamic .side-tags li { .dynamic .side-tags li {
float: left; float: left;
margin: 0 5px; margin: 0 5px;
} }
.dynamic .side-most-comment,
.dynamic .side-most-view {
margin-bottom: 0;
}
/* end dynamic */ /* end dynamic */
/* start links */ /* start links */
.other-main.links {
margin-top: 45px;
}
.links li { .links li {
float: left; float: left;
margin: 0 20px 10px; line-height: 22px;
width: 273px; margin: 0 20px;
width: 270px;
} }
/* end links */ /* end links */
/* start not list */ /* start not list */
.other-main { .other-main {
display: inline-block; display: inline-block;
margin: 50px 20px 0; margin: 30px 30px 0;
width: 950px; width: 930px;
} }
/* end not list */ /* end not list */
\ No newline at end of file
war/src/main/webapp/skins/ease/css/ease.min.css
View file @ 01bed7f5
...@@ -54,7 +54,7 @@ sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none;} ...@@ -54,7 +54,7 @@ sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none;}
#goTop{background:url(/skins/ease/images/icons.png) no-repeat scroll 5px -51px #D5D5D5;border-radius:2px 2px 0 0;cursor:pointer;font-size:11px;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:50px;display:none;} #goTop{background:url(/skins/ease/images/icons.png) no-repeat scroll 5px -51px #D5D5D5;border-radius:2px 2px 0 0;cursor:pointer;font-size:11px;height:21px;line-height:21px;padding:0 10px 0 23px;position:absolute;right:50px;display:none;}
#goTop:hover{background-color:#D5D5D5;} #goTop:hover{background-color:#D5D5D5;}
.wrapper > ul{list-style:none;} .wrapper > ul{list-style:none;}
.article{border-bottom:1px solid #f6f6f6;padding:20px 70px;} .article{border-bottom:1px solid #f6f6f6;padding:30px 50px;}
.article:hover{border-bottom-color:#D5D5D5;box-shadow:0 0 1px #f6f6f6 inset;background-color:#FCFCFC;} .article:hover{border-bottom-color:#D5D5D5;box-shadow:0 0 1px #f6f6f6 inset;background-color:#FCFCFC;}
.article-body{line-height:145%;overflow:hidden;word-wrap:break-word;margin-bottom:10px;} .article-body{line-height:145%;overflow:hidden;word-wrap:break-word;margin-bottom:10px;}
.article-body ol,.article-body ul{margin-left:40px;} .article-body ol,.article-body ul{margin-left:40px;}
...@@ -66,26 +66,29 @@ sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none;} ...@@ -66,26 +66,29 @@ sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none;}
.article-title span{cursor:pointer;} .article-title span{cursor:pointer;}
.article-next{background-color:#FCFCFC;box-shadow:0 0 3px #D5D5D5 inset;cursor:pointer;font-size:14px;line-height:36px;text-align:center;} .article-next{background-color:#FCFCFC;box-shadow:0 0 3px #D5D5D5 inset;cursor:pointer;font-size:14px;line-height:36px;text-align:center;}
.article-next:hover{box-shadow:0 0 3px #D5D5D5, 0 0 3px #D5D5D5 inset;} .article-next:hover{box-shadow:0 0 3px #D5D5D5, 0 0 3px #D5D5D5 inset;}
.article-relative{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;margin:10px 0;padding:0 20px 10px;width:365px;} .article-relative{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;margin:10px 0;padding:0 20px 10px;width:385px;}
.article-relative:hover{background-color:#fff;box-shadow:0 0 4px #D5D5D5;} .article-relative:hover{background-color:#fff;box-shadow:0 0 4px #D5D5D5;}
.article-relative ul{list-style:none;} .article-relative ul{list-style:none;}
#relevantArticles{margin-right:40px;} #relevantArticles{margin-right:40px;}
#externalRelevantArticles{width:297px;margin-top:0;} #externalRelevantArticles{width:357px;margin-top:0;}
#comments{padding:20px 70px;position:relative;} #comments{padding:20px 50px;position:relative;}
.comment-header{float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:2px;height:60px;width:60px;} .comment-header{float:left;background-color:#FFF;border:1px solid #DEDEDE;padding:2px;height:60px;width:60px;}
.comment-panel{float:left;line-height:16px;margin:0 10px 20px;min-height:64px;overflow:hidden;width:760px;} .comment-panel{float:left;line-height:16px;margin:0 0 20px 10px;min-height:64px;overflow:hidden;width:814px;}
.comment-body-ref{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;display:block;left:140px;padding:10px;opacity:0.9;filter:alpha(opacity=90);position:absolute;} .comment-body-ref{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;display:block;left:127px;padding:10px;opacity:0.9;filter:alpha(opacity=90);position:absolute;}
.comment-body-ref > .comment-header{border:0 none;float:right;height:48px;width:48px;padding:0;} .comment-body-ref > .comment-header{border:0 none;float:right;height:48px;width:48px;padding:0;}
.comment-body-ref > .comment-panel{margin:0 20px 0 0;min-height:48px;width:756px;} .comment-body-ref > .comment-panel{margin:0 20px 0 0;min-height:48px;width:725px;}
.form{padding:0 70px 20px;} .comment-body-ref > .comment-panel > .right{display:none;}
#replyForm{margin-left:25px;}
.form{padding:0 50px 20px;}
.wrapper > .form{float:left;} .wrapper > .form{float:left;}
.form th{text-align:right;white-space:nowrap;} .form th{text-align:right;white-space:nowrap;}
.form input[type=text],.form input[type=password],.form textarea{background-color:#FCFCFC;border-width:0;box-shadow:0 0 2px #BCBCBC;font-family:Verdana,arial,\5fae\8f6f\96c5\9ed1;font-size:12px;margin:0 5px 10px 0;outline:medium none;padding:0 3px;height:28px;line-height:28px;width:260px;} .form input[type=text],.form input[type=password],.form textarea{background-color:#FCFCFC;border-width:0;box-shadow:0 0 2px #BCBCBC;font-family:Verdana,arial,\5fae\8f6f\96c5\9ed1;font-size:12px;margin:0 5px 10px 0;outline:medium none;padding:0 3px;height:28px;line-height:28px;width:260px;}
.form input:focus,.form textarea:focus{box-shadow:0 0 4px #D5D5D5;} .form input:focus,.form textarea:focus{box-shadow:0 0 4px #D5D5D5;}
.form textarea{height:120px;overflow:auto;width:426px;line-height:16px;} .form textarea{height:120px;overflow:auto;width:426px;line-height:16px;}
.form button{background-color:#F6F6F6;border:0 none;box-shadow:0 0 2px #D5D5D5;height:28px;line-height:28px;padding:0 12px;color:#A7A7A7;} .form button{background-color:#F6F6F6;border:0 none;box-shadow:0 0 2px #D5D5D5;height:28px;line-height:28px;padding:0 12px;color:#808080;}
.form button:hover{box-shadow:0 0 4px #D5D5D5;text-shadow:0 0 2px;} .form button:hover{box-shadow:0 0 4px #D5D5D5;text-shadow:0 0 2px;}
.form img{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;cursor:pointer;height:24px;padding:1px;} .form img{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;cursor:pointer;height:24px;padding:1px;}
#tags.other-main{margin:47px 44px 0;width:902px;}
#tags li{float:left;height:38px;} #tags li{float:left;height:38px;}
#tags a{margin:3px 6px;padding:3px 12px;background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;} #tags a{margin:3px 6px;padding:3px 12px;background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;}
#tags a:hover{text-shadow:0 0 2px;text-decoration:none;box-shadow:0 0 4px #D5D5D5;} #tags a:hover{text-shadow:0 0 2px;text-decoration:none;box-shadow:0 0 4px #D5D5D5;}
...@@ -95,17 +98,19 @@ sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none;} ...@@ -95,17 +98,19 @@ sup{font-size:10px;font-weight:normal;-webkit-text-size-adjust:none;}
.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;}
.archives{position:relative;} .archives{position:relative;}
.archives > div{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;padding-bottom:20px;line-height:20px;margin:20px;width:276px;position:absolute;top:0;} .archives > div{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;padding-bottom:20px;line-height:20px;margin:20px;width:270px;position:absolute;top:0;}
.archives h3{text-align:center;} .archives h3{text-align:center;}
.archives > div:hover{box-shadow:0 0 4px #D5D5D5;} .archives > div:hover{box-shadow:0 0 4px #D5D5D5;}
.archives a{display:block;margin-left:80px;} .archives a{display:block;margin-left:77px;}
.dynamic ul{list-style:none;} .dynamic ul{list-style:none;}
.dynamic h3{text-align:center;} .dynamic h3{text-align:center;}
.dynamic .module{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;line-height:20px;margin:20px;padding:10px 20px 20px;width:393px;} .dynamic .module{background-color:#FCFCFC;box-shadow:0 0 2px #D5D5D5;float:left;line-height:20px;margin:20px;padding:10px 20px 20px;width:385px;}
.dynamic .module:hover{box-shadow:0 0 4px #D5D5D5;} .dynamic .module:hover{box-shadow:0 0 4px #D5D5D5;}
.dynamic .side-comments{width:600px;} .dynamic .side-comments{width:600px;}
.dynamic .side-comments .comment-panel{width:510px;} .dynamic .side-comments .comment-panel{width:510px;}
.dynamic .side-tags{width:186px;} .dynamic .side-tags{width:170px;}
.dynamic .side-tags li{float:left;margin:0 5px;} .dynamic .side-tags li{float:left;margin:0 5px;}
.links li{float:left;margin:0 20px 10px;width:273px;} .dynamic .side-most-comment,.dynamic .side-most-view{margin-bottom:0;}
.other-main{display:inline-block;margin:50px 20px 0;width:950px;} .other-main.links{margin-top:45px;}
\ No newline at end of file .links li{float:left;line-height:22px;margin:0 20px;width:270px;}
.other-main{display:inline-block;margin:30px 30px 0;width:930px;}
\ No newline at end of file
war/src/main/webapp/skins/ease/js/ease.js
View file @ 01bed7f5
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
* @fileoverview ease js. * @fileoverview ease js.
* *
* @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a> * @author <a href="mailto:LLY219@gmail.com">Liyuan Li</a>
* @version 1.0.1.1, Jun 18, 2012 * @version 1.0.1.2, Jul 24, 2012
*/ */
var goTranslate = function () { var goTranslate = function () {
window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href); window.open("http://translate.google.com/translate?sl=auto&tl=auto&u=" + location.href);
...@@ -162,6 +162,7 @@ var ease = { ...@@ -162,6 +162,7 @@ var ease = {
return; return;
} }
$(".footer").css("marginTop", "30px");
var years = [], var years = [],
$archiveList = $archives.find("span").each(function () { $archiveList = $archives.find("span").each(function () {
var year = $(this).data("year"), var year = $(this).data("year"),
...@@ -204,7 +205,7 @@ var ease = { ...@@ -204,7 +205,7 @@ var ease = {
break; break;
} }
$items[m].style.left = (n * 318) + "px"; $items[m].style.left = (n * 310) + "px";
if (line > 0) { if (line > 0) {
if ($items[m - 3].style.top !== "") { if ($items[m - 3].style.top !== "") {
......
war/src/main/webapp/skins/ease/macro-comments.ftl
View file @ 01bed7f5
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<#else> <#else>
<a href="${comment.commentURL}" target="_blank">${comment.commentName}</a> <a href="${comment.commentURL}" target="_blank">${comment.commentName}</a>
</#if> </#if>
<#if comment.isReply>&nbsp;@ <#if comment.isReply>@
<a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}" <a href="${servePath}${article.permalink}#${comment.commentOriginalCommentId}"
onmouseover="page.showComment(this, '${comment.commentOriginalCommentId}', 20);" onmouseover="page.showComment(this, '${comment.commentOriginalCommentId}', 20);"
onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a> onmouseout="page.hideComment('${comment.commentOriginalCommentId}')">${comment.commentOriginalCommentName}</a>
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
} }
var replyTo = function (id) { var replyTo = function (id) {
var commentFormHTML = "<table class='form comment-reply' id='replyForm'>"; var commentFormHTML = "<table class='form' id='replyForm'>";
page.addReplyForm(id, commentFormHTML); page.addReplyForm(id, commentFormHTML);
$("#replyForm label").each(function () { $("#replyForm label").each(function () {
$this = $(this); $this = $(this);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment