diff --git a/pom.xml b/pom.xml index 723d3f91..26745247 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,7 @@ + zblog org.apache.maven.plugins @@ -257,7 +258,7 @@ 3.0 false - zblog + ${project.build.finalName} log/**,post/** true @@ -272,7 +273,7 @@ 9080 - 10 + 20 / diff --git a/src/main/java/com/zblog/service/freemarker/ftl/header.html b/src/main/java/com/zblog/service/freemarker/ftl/header.html index 6ac7dea1..cb5c675d 100644 --- a/src/main/java/com/zblog/service/freemarker/ftl/header.html +++ b/src/main/java/com/zblog/service/freemarker/ftl/header.html @@ -42,4 +42,5 @@

${title} - zhouhaocheng.cn

${subtitle}

+ \ No newline at end of file diff --git a/src/main/resources/config/spring-base.xml b/src/main/resources/config/spring-base.xml index 907e69a1..7a216873 100644 --- a/src/main/resources/config/spring-base.xml +++ b/src/main/resources/config/spring-base.xml @@ -29,6 +29,7 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/404.jsp b/src/main/webapp/WEB-INF/jsp/404.jsp index d25249a9..15d0703f 100644 --- a/src/main/webapp/WEB-INF/jsp/404.jsp +++ b/src/main/webapp/WEB-INF/jsp/404.jsp @@ -8,7 +8,7 @@ <%@include file="common/header.html" %>
-
+

404

diff --git a/src/main/webapp/WEB-INF/jsp/common/content.jsp b/src/main/webapp/WEB-INF/jsp/common/content.jsp index 0c63a1ef..bc688686 100644 --- a/src/main/webapp/WEB-INF/jsp/common/content.jsp +++ b/src/main/webapp/WEB-INF/jsp/common/content.jsp @@ -33,7 +33,7 @@ -
  • ${post.rcount}人阅读
    • +
  • ${post.rcount}人阅读
  • ${post.category.name}
    •  diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp index 2d176f45..e7209d60 100644 --- a/src/main/webapp/WEB-INF/jsp/index.jsp +++ b/src/main/webapp/WEB-INF/jsp/index.jsp @@ -11,7 +11,7 @@ <%@include file="common/header.html" %>
    -
    +

    @@ -49,7 +49,7 @@ -
  • ${post.rcount}人阅读
    • +
  • ${post.rcount}人阅读
    • diff --git a/src/main/webapp/WEB-INF/jsp/post.jsp b/src/main/webapp/WEB-INF/jsp/post.jsp index 8d603b1e..0b5bf44e 100644 --- a/src/main/webapp/WEB-INF/jsp/post.jsp +++ b/src/main/webapp/WEB-INF/jsp/post.jsp @@ -9,7 +9,7 @@ <%@include file="common/header.html" %>
    -
    +
    diff --git a/src/main/webapp/resource/css/responsive.css b/src/main/webapp/resource/css/responsive.css index d4520413..1a778e75 100644 --- a/src/main/webapp/resource/css/responsive.css +++ b/src/main/webapp/resource/css/responsive.css @@ -1,28 +1,49 @@ -#right_col{ display: none;} -#left_col{margin-right: 0;} -.post .title a, -.post .title span, -.post_content, -#archive_headline h2, -.post .post_tags, +#header{width: 100%;box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);height: auto;} +#menu{position: absolute;top: 0;right: -70%;display: none;width: 70%;background-color: #fff;border-left:1px solid #ccc;} +#menu ul{float: none;margin: 0;background-color: #fff;} +#menu ul li{float: none;} +#menu ul li a{display: block;text-align: left;height: 46px;line-height: 46px;border-width: 0 0 1px 0;border-color:#ccc;border-style: solid;} +#menu ul ul li a{width: auto;padding-left:3em;border-width:0 0 1px 0;} +#menu ul ul{position: relative;display: block;top: 0;margin: 0;padding: 0;} +#header #logo{margin: 12px 0 12px 4%;font-size: 22px;position: relative;left: 0;top: 0;} +#tagline{display: none;} + +#menu_button{border-left: 1px solid #ddd;color: #bbb;display: block;height: 100%;margin: 0;position: absolute;right: 0;text-decoration: none;top: 0;width: 50px;} +#menu_button:hover{background-color: #009dc4;color:#fff;} +#icon_menu:after{font-family: "icomoon-zblog";content: "\e601"; font-size: 34px;font-style: normal;position: relative;right: -7px;top: 7px;} + +#left_col{margin-right: 0;width: auto;float: none;box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);margin:75px 10px 30px 10px;} +#post_mask{display: none;} +#right_col{width: auto;float:none;padding: 20px;background-color: #fff;border-top: 1px solid #ccc;} +#right_col .side_widget{display: none;} +#right_col #introduction_widget{display: block;} +#archive_headline h2, #bread_crumb ul, +.post .title a, .post .title span, +.post_content, .post .post_tags, #page_nav .page, -#bread_crumb ul, -#comment_header, -#comments, -#previous_next_post div{margin-right: 0;} -#post_mask{background-color: #fff;background-image: none;} +#comment_header, #comments, +#previous_next_post div{margin-right: 0;border-right: 0;} + +.post .title a, .post .title span{margin-left: 0;} +.post .title{background-color: #fff;background-image: none;margin:0;} +.post_content p.excerpt{overflow: hidden;} .meta{width: 22%;} -#header, #post_mask, #bread_crumb, #comments_wrapper, -.post, #page_nav, #previous_next_post, #footer{width: 78%;} +.meta:first-of-type{border-top: none;} +#post_mask, .post{width: 78%;} +#comment_header{margin-left:22%;background-color: #fff;} +#archive_headline, #bread_crumb, #page_nav, #comments_wrapper, #previous_next_post, #footer{width: 100%;} +#archive_headline, #page_nav, #comments, #previous_next_post{background-color: #fff;} +#footer{height: 60px;} +#footer #copyright{margin-top: 20px;text-align: left;padding-left: 15px;} +#return_top{height: 60px;width: 60px;right: 0;bottom: 0;position: absolute;border-left: 1px solid #aaa; +border-radius:0;background-image:url(../img/return_top1.gif);background-color: #fff;} @media screen and (max-width:480px) { - #header{width: 100%;} .meta{width: 0;display: none;} - #header, #post_mask, #bread_crumb, #comments_wrapper, - .post, #page_nav, #previous_next_post, #footer{width: 100%;} + .post{width: 100%;} + #comment_header{margin-left:0}; - .post .title{background-image: none;} #previous_next_post{display: none;} } diff --git a/src/main/webapp/resource/css/style.css b/src/main/webapp/resource/css/style.css index 919b4a01..3859d915 100644 --- a/src/main/webapp/resource/css/style.css +++ b/src/main/webapp/resource/css/style.css @@ -75,14 +75,14 @@ a:hover{color: #009dc4;} /*************** menu ***************/ #menu{background:#fff;border-bottom: 1px solid #ccc;height: 35px;width: 100%;} #menu ul{float:right;list-style:none;margin:0 20px 0 0;} -#menu ul ul{float:none;display:none;position:absolute; top:35px; right:0px;margin:0;} +#menu ul ul{float:none;display:none;position:absolute; top:36px; right:0px;margin:0;} #menu ul li{float:left; font-size:10px; position:relative; } #menu ul ul li{float:none; height:auto;text-align:left; } #menu ul li a{font-size:10px; padding:0 20px; text-align:center; color:#888; display:inline-block; height:35px; line-height:36px; overflow:hidden; } -#menu ul ul li a{font-size:11px; background:#fff; border:1px solid #ccc;margin-bottom:-1px; padding:10px 20px 8px; - display:block;position:relative;width:180px;height:auto; line-height:180%; text-align:left; } -#menu ul li:hover > a ,#menu ul li li a:hover{background:#eee; color:#333;} +#menu ul ul li a{font-size:11px; background:#fff; border:1px solid #ccc; border-width:0 1px 1px 1px; + display:block;position:relative;width:180px; text-align:left; } +#menu ul li:hover > a{background:#eee; color:#333;} #menu ul li:hover ul{display: block;} #content{min-height: 100%;position: absolute;top: 0;width: 100%;} @@ -159,9 +159,10 @@ a:hover{color: #009dc4;} .meta li span.date{font-size:40px; float:right; display:block; line-height:40px; margin:0 0 0 5px; } .meta li span.month{text-transform:uppercase; padding:13px 0 0px 0; display:block; font-size:10px; } .meta li span.year{display:block; font-size:10px; } +.meta li.post_read:after{content: "\e613";} .meta li.post_author:after{content: "\e609";} .meta li.post_category:after{content: "\e608";} -.meta li.post_comment:after{content: "\e61a";} +.meta li.post_comment:after{content: "\e606";} .post_tags{background: url("../img/meta_bg.gif") repeat scroll 0 0 rgb(0, 0, 0);font-size: 11px;margin: 0 340px 0 0;padding: 9px 3% 8px 4%} .post_tags ul{float: right; margin: 0;} @@ -256,7 +257,7 @@ ul.comment-name-date li{padding: 0 0 5px;} #social_link li a{display: block;width: 20px;height: 20px;text-decoration: none;} #social_link li a:after{color: #aaa;display: inline-block;font-family: "icomoon-zblog";font-size: 18px;} #social_link li.rss_button a:after{content:"\e603"; } -#social_link li.github_button a:after{content:"\eab1"; } +#social_link li.github_button a:after{content:"\e604"; } #social_link li.rss_button a:hover:after{color:#ffcc00;} #social_link li.github_button a:hover:after{color:#16b9dc;} @@ -287,7 +288,7 @@ ul.comment-name-date li{padding: 0 0 5px;} /* return top */ #return_top{position:fixed; bottom:15px; right:20px; display:block; text-indent:100%;white-space:nowrap; width:45px; height:45px; margin:0; padding:0; - background:url(../img/return_top2.gif) no-repeat center center #555; + background:url(../img/return_top2.gif) no-repeat center center #555;overflow:hidden; -moz-border-radius:4px; -khtml-border-radius:4px; -webkit-border-radius:4px; border-radius:4px; opacity:0.5; } #return_top:hover{opacity:1;background-color: #009dc4; } \ No newline at end of file diff --git a/src/main/webapp/resource/font/icomoon-zblog.eot b/src/main/webapp/resource/font/icomoon-zblog.eot index f0231122..2774893b 100644 Binary files a/src/main/webapp/resource/font/icomoon-zblog.eot and b/src/main/webapp/resource/font/icomoon-zblog.eot differ diff --git a/src/main/webapp/resource/font/icomoon-zblog.svg b/src/main/webapp/resource/font/icomoon-zblog.svg index 3cc26e97..4d7ba00b 100644 --- a/src/main/webapp/resource/font/icomoon-zblog.svg +++ b/src/main/webapp/resource/font/icomoon-zblog.svg @@ -1,16 +1,33 @@ -Generated by IcoMoon + + +{ + "fontFamily": "icomoon-zblog", + "majorVersion": 1, + "minorVersion": 0, + "version": "Version 1.0", + "fontId": "icomoon-zblog", + "psName": "icomoon-zblog", + "subFamily": "Regular", + "fullName": "icomoon-zblog", + "description": "Font generated by IcoMoon." +} + + + + + @@ -19,29 +36,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/resource/font/icomoon-zblog.ttf b/src/main/webapp/resource/font/icomoon-zblog.ttf index e85a4a20..6186e000 100644 Binary files a/src/main/webapp/resource/font/icomoon-zblog.ttf and b/src/main/webapp/resource/font/icomoon-zblog.ttf differ diff --git a/src/main/webapp/resource/font/icomoon-zblog.woff b/src/main/webapp/resource/font/icomoon-zblog.woff index 08d6b2df..d2c19dc2 100644 Binary files a/src/main/webapp/resource/font/icomoon-zblog.woff and b/src/main/webapp/resource/font/icomoon-zblog.woff differ diff --git a/src/main/webapp/resource/img/return_top1.gif b/src/main/webapp/resource/img/return_top1.gif new file mode 100644 index 00000000..35a97e6e Binary files /dev/null and b/src/main/webapp/resource/img/return_top1.gif differ diff --git a/src/main/webapp/resource/js/jscript.js b/src/main/webapp/resource/js/jscript.js index d013c045..80faec71 100644 --- a/src/main/webapp/resource/js/jscript.js +++ b/src/main/webapp/resource/js/jscript.js @@ -1,4 +1,30 @@ $(function(){ + var menu_show=false; + $("#menu_button").click(function(){ + if(menu_show){ + $("#header").animate({"right":0},500); + $("#content").animate({"right":0},500,function(){ + $("#menu").hide(); + }); + }else{ + $("#menu").css("height",$(document).height()).show(); + $("#header").animate({"right":"70%"},500); + $("#content").animate({"right":"70%"},500); + } + + menu_show = !menu_show; + + return false; + }); + + $(window).bind('resize', function() { + if($(window).width()>770&&menu_show){ + $("#header").css("right", 0); + $("#content").css("right", 0); + $("#menu").css("height","auto").show(); + } + }); + jQuery.easing.easeOutExpo = function (x, t, b, c, d) { return -c * ((t=t/d-1)*t*t*t - 1) + b; };