From 66b2210287e30cc9d4bab4c3d221837ae514ef26 Mon Sep 17 00:00:00 2001 From: zhou Date: Fri, 19 Jun 2015 21:17:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=93=8D=E5=BA=94=E5=BC=8F?= =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 5 +- .../zblog/service/freemarker/ftl/header.html | 1 + src/main/resources/config/spring-base.xml | 1 + src/main/webapp/WEB-INF/jsp/404.jsp | 2 +- .../webapp/WEB-INF/jsp/common/content.jsp | 2 +- src/main/webapp/WEB-INF/jsp/index.jsp | 4 +- src/main/webapp/WEB-INF/jsp/post.jsp | 2 +- src/main/webapp/resource/css/responsive.css | 57 +++++++++----- src/main/webapp/resource/css/style.css | 15 ++-- .../webapp/resource/font/icomoon-zblog.eot | Bin 9208 -> 9944 bytes .../webapp/resource/font/icomoon-zblog.svg | 72 +++++++++++------- .../webapp/resource/font/icomoon-zblog.ttf | Bin 9020 -> 9756 bytes .../webapp/resource/font/icomoon-zblog.woff | Bin 9096 -> 9836 bytes src/main/webapp/resource/img/return_top1.gif | Bin 0 -> 1100 bytes src/main/webapp/resource/js/jscript.js | 26 +++++++ 15 files changed, 129 insertions(+), 58 deletions(-) create mode 100644 src/main/webapp/resource/img/return_top1.gif 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 f0231122b3987570357307d97cb1fa7c72aa0632..2774893b2dcf53b713e3590cc6376ad4ab9c84e5 100644 GIT binary patch delta 1204 zcmb7DZD?Cn7=F$`Ky!Ja%FZ!*_ab73>ikmxe1-9Kcp@CqcDU)#Sv6QWlY%*o9lbp4u=0c@ZR@4 z&-32*yzlwA-*xMtdaE7?)X%ALTP%%^x#X#77jh6tb{&3k-w!X`{sX`=+2!XCKN<1t z6q5iOBiz?NVvMb(S8o&kj_|v~#<=9Y0MC$j3}>c>t_-AdgeQRAcT$7KfO_|vmw}od z(&H&29M9UO2+tC(O^r-UUdoAIriu83h&!3leq*j_{#76}Pk3U)m>feVld&%PRA-Hm z!HD<6F9HmTB(3d^L24dS*DX;NjFc5XU1 z!74nB=g>!_6cwmw+niUUjOHrr*u%D5;>I8Fkc;L8LK?S1?s@7xY4Pp~u>= zEQ$iD#-^IVIH@RjN$uWLne~(PzIDmEV7+H8SnpKrsPa~M9$BZX%sj<+nIG^DbB$~N z$MS1Dz@`Njup)-|3U#!Lwizr~qxv*|G#H7;TIxe}+kTtk`uYTC+CkGnLoML z{Jg9xKcyZO(;RW@rubGY(SZagdrLeT@%uED(#I<58kA6-UD+Wj%A@72f?aG2hufsB zvjdgIY_gcGWCuDC4ResSq{nLv8;v+7p&o(C6S zvYZaR)|}<#0b;wz7Nq)+?UZxV8w|0y*&KY_JRYnxUkmE=Fy(vF=tYGQK?0rVMlS}C z#Ux(Gn>dGytd^zNeV*W-ih6NWoD(05g3W1bvh~=mDo&+cxvc!Ey3`JJ+1_rSw14UF vI(i*%IIfl)D*4FiC{2{U?Mk|Cl-0QRyH`Cwd+yS$2lk*y+l~CappE|vQJV}8 delta 704 zcmX|8Pe>GD6o210voqsv{#n`Cm>tWRo!xRnDmUFk1t$&cV06%KLA#o*ftwRbY$wNK zmq5l#LLd@khoYDc9V#d35ENpaBnYHGlRI?ikCBAy_ExP2?|a|x_kQntkMFIV-ss^r zG=L6mic7HzP1(YfJ~l$FfG6nb!Cc1Z4tHJ$Aa#geXES34#u~(H z7=`S}wTpop@7oZ61K77VJe0Y>y}eHW>Q^wI8b(6sW-kFKSOc-)+<1P*WF*ARh;NUK z4rYwyyxEFGxu8Fn$s3TudQcnjP%dY3L&=)?r-*y8$&xWTHjaa$Y2|?wtC4n5uV5Lp zec}NU4WIxE0uWGKa2eOIm0(WV zS6G4AgqtVUEn(FzRGee%dzItt1Pf4dSYRAf^B@E6f~cYzL?>#L6N8~}I}zh*GSw1n zKA -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 e85a4a201a4e445b07417fcd7b73e8201a136940..6186e0008188d54a50c15cf5b8640af450750f2c 100644 GIT binary patch delta 1193 zcmb7DZ)j6j6#w0K-%HXYO`?5C+bq7OP19zq>s->Lbql4s(hhOh>E^nktdIUnB~2^M zM*1mX?voDDz2Ul`DC&n5#*k$UL}hi1fntk(6$*t(n1gK~bL@l7+qr24*|*)tx%d8l zzw^#J=ic*f44m7S2Ls?l0UUjU2jAWE;O(_PiMdO5W&gofqVDZH2e3K9qhmAr-0Jk| z8sU3{&rRv`g7*MYnpWFXdSUYG@l=6u7HE2yn$X8BkAHq2Xc;Cwks`wOhP*)dG~w3N zOg5jpRN#+@_>PE&>De*;Oy}Z9KxmP0c1F+5VL)Wq>ZB={(Pt*2p092a?w}-A=Vs@# zlsJv>Q=wOju|q=#SX$3!V1q1F8X^cwPfzK@Z6VU+d==QMvx^8nUc)|&k~@h|U_noH zA4DzfEwIvBOCc1p8ZsAEFMR7sa}%o&Yu#e3bgp)KtZFPRt2^JdZf!oSV$@w*$>DJnB=u^q-E)^9XQ>i@A)qZD9yjv`k0q_je%?4a`n zYi_Z4RbQ+*nuvF`g~D6w7W*HS$2N*yP4h~VV%{h|TQ|AqH3^zmuwHFa^NEd5tE^~V z+a?E;y7&?^!gYTcYx4R5x>a*o1}`8)8AUb8tGc96OIy2(TjRZq5^L||@vdGeCgJGy zlS4x%uOC$->Wd>sMt8>EVyt7})fWWE3%idk9y+vmY`0Ny`b#&J!#pn`Vcz0*_%dBc zfTDLLVo{%0wNUtYeYjl-g{{gqUSAih>*nlYPbAVKY@O|GsAT#onFhA^c=B4{TJks_ z-IRJF>!*?@P9#s6sJ!Q67b?1sErHsC2G!696)$5C2I*U>CY5&99Fa?kE2xwj)t?;3 z6Q(v%x&4@qf8b6&fn&3??=LO?Ap(fic-qwM+V!mC1uM~|M~r*S9Uyj)tSHpyY`fSS z?*v0EVPu0Z8JB|%#t%VF{1()?D*Z|kM3KY*hA@J0WRSzh_!MVxk+rfE`$tMj-}5$p zn4jg}^0I7~JLO^ds$y4ql`G0`7N@1(a@X2x%~^l6d2A!LPi$9f4%B>Ow>grI&z*hF h8?`O2H(jglU)_(X>w#UU&~aBY6uH-x_Ba2|{ss3P{UrbZ delta 705 zcmX|8T}TvB6h8OP?996B-`dW?>{!n1IOT?AEoz{KgZB3zM7WQEyP9d>=73Tg1kOtj zz4S7^Bt3`(`4q(%^k6wk4?!W-Qv`wiP41A8Wf0-Iol)z;x#xc0`R+a6z4uPf{HX~b z01yTf7&vmaw<%Rs6D&h!9wRf5%NpIW&YJ+F7V*oW?3jVM8u2RT;Lymmi{V@E+Yo;T z*tJ>`GQprDPTS-yLyHQliZt}nKski8T*;SI# zr#KsD;xtagP4Tz*Q~V*W$6mzl38TV*&@bqm(2357wU|g+IeNl=!~}_bGB8W55B!RK zsO&srua}Rr6D&Zp9K^U#!czt_r>0h?4Cypt}9e%rrT>xJgPW#+$)L2nfwc6DN zt52=9uBwT?5JX`g%#akhLR>1-4r{K8Tm<%j)Aui3$aNqbC v-^G6p>cOe9Xy{C6I@}X}UVgYDUGc7R1HTg>iPtaR_CT$3bdTLszefH7yfed} diff --git a/src/main/webapp/resource/font/icomoon-zblog.woff b/src/main/webapp/resource/font/icomoon-zblog.woff index 08d6b2df73ea00092856322c65c1f885a327002f..d2c19dc2b337897b50c327626944fb12ecd967ed 100644 GIT binary patch delta 1237 zcmb7EZ)jUp6hHUg_a}eamvnteYs}tWn>NjGR!y2T(@?rv(orhwHa2VNu#YxvI?{Bd zRZ|!wxP6dK2J&Qga#YvAwYUaNbzq+|Ov0rmbGZ+|pjQ%ReC%x+0~uI=C3p|k>PlU!>-7n1 z$FeXAP&I5d2P>#T-HYnDtrF`O>r3mpbN`&+IPu zyhcIuan`5JX?{NOYmF_<=h)={DkZi_%;nZU&4Xg?1U{Zs6@Zl>gcU_K>QfaO>J0ZN zOpXr_EUc%O#rpD)Ps{}reBS{MaZG_YcFz+m5wa0pFX|5e8e1W z4pf}d6f06lSl_ZASQQ^6h}ruRv8dmtN|-+0*4-n9x@ED2wYA1t`x)6tMj}a$8X0YG zuxOdz6r_JggJOQ`nQN3R|{H)D6OYzaW zOr5p{ksU#lx%wRT@wvI7he*P#>Mxm3^mfzTp%wXJ7Z#*J1fr0FG>pR}%t9Ut@F9E* zS7C#6ku3R}rsy3OW>f4cyUpr?OXw9Qgj=FZ91w4aze!Efu=JxmAQ$BC9A3wywHI=0ffD0I;*D^2>a5gHq4(YTPz zvLd*d3ffgIf?fF_E?ihU7D2&MRB$5*#m8udx=<^KG>zw`)e9eY&VT-ybIzT+(Kpj8 zUF`4a0Rp(R8Sq#3I1uv|mGb=q$6^4)i(-;d*Wj%h$)vKVr7>P*bW5FA##2+M(H4xE zmr*}Hap^2-ae#ea8UAbU+tXvIQGie*=Gz$VH+M-IMbri{W_qKyn?IM%Oy^KLW1w)G zF=ue{#N-GXRc1;svafPRCY8g&Dw-iwp^d=#RAvmd8`$I;BUZn-l%1TK#`##&J3bD; zv`80qiY8Ax^7k>(gee|-ClIp1=4_W;Ym0W!K4c%Zj}!-rIp=}1?5sFnoMO3DF5?^c zF?3RNdh7r?Lw5AP^NI7+`Mm2S<&Qx=$OUPT$XoJn`KSCt{w}?g?ue7(h&U|jZm|-M3j=QL@X6!lk0Vs|)FAvqle}Nxc!}a>+!!Y#3Q(W~w5=#5%__*n4QdyVXRDM^Qc_^0uU}qXu2*iX zmtT~wZ)j<02{OaTNEfI=x41H|B(Xv_uUHvof=g;~a#3bMNoIbY0?5R~r2NtnTP2`N zAzsKWfE$}vtOxdvUUGh}ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;NpiyW z)Z+ZoqU2Pda%GTJ1y;^Qsfi`|MIrh5Ij~R+$jC3rFV4s>P;d@5Q_u*{%uC5HFV+OB z_w}{%%quQQ%u7!7bg@+enxL1NnPO#N;^<`J;^buMYUE^S=xS_X=4$S0=H%w)X5wt( zW@G@<>yn>bnwy$e0@Is<(Cds-FDNPG765H_NiE7OOHFYr%Fk5*d)X=zw_7Z6ng`XJ zg4->QIQ8lS9itD5Sfq%C2?0|NhzU=&Kn^_Nr{)1udl4{MGyebg_s{QNKYx7x_Vvr> zPai+LfA{vy>sK#dJb(7|$>T>4AKbrp_s;EGH*Z|OcJ<2TOBXMkKX>-b=~E|996xsS z$l*f=5A5H!chBx!J9li~wsp(qO&d3?U$=J6>QyUOEMK;C$>K!|7tEhGch2ltGiOYn zHg(G6NfRgZ_x1L4cXf8Ox3#u3H#IiY*VWckS5;P&mz9*?xfYiVkztEs9eD=8|-%gM?}OG!$Ii;0Q|3keGF^YQX770&&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; };