From 12a6a5c76bd0deb8ecb565729e49640005f7007d Mon Sep 17 00:00:00 2001 From: longhe1314 Date: Fri, 15 Jun 2012 14:45:28 +0800 Subject: [PATCH] =?utf8?q?1=E3=80=81=E6=9B=BF=E6=8D=A2=E5=AD=97=E4=BD=93?= =?utf8?q?=E9=A2=9C=E8=89=B2~~=E8=93=9D=E8=89=B2=E6=94=B9=E4=B8=BA?= =?utf8?q?=E7=BB=BF=E8=89=B2~=202=E3=80=81=E4=B8=8E=E6=88=91=E6=9C=89?= =?utf8?q?=E5=85=B3=E3=80=81=E8=AF=84=E8=AE=BA=E5=9B=9E=E5=A4=8D=E3=80=81?= =?utf8?q?=E9=80=9A=E7=9F=A5~~3=E4=B8=AA=E9=A1=B5=E9=9D=A2~?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: longhe1314 --- PumpkinHouseWeb/500.aspx | 2 +- PumpkinHouseWeb/Aboutus/AboutUs.aspx | 2 +- PumpkinHouseWeb/Account/ExternalAuth.Master | 2 +- .../Account/ExternalAuth.Master.designer.cs | 28 +++--- PumpkinHouseWeb/Default.aspx | 4 +- PumpkinHouseWeb/Guide/Step1.aspx | 2 +- PumpkinHouseWeb/Guide/Step2.aspx | 2 +- PumpkinHouseWeb/Guide/Step3.aspx | 2 +- PumpkinHouseWeb/Notice/Notice.master | 17 ++-- PumpkinHouseWeb/Notice/NoticeAboutMe.aspx | 4 +- PumpkinHouseWeb/Notice/NoticeAnnouncement.aspx | 4 +- PumpkinHouseWeb/Notice/NoticeReply.aspx | 4 +- PumpkinHouseWeb/Scripts/collect.js | 4 +- PumpkinHouseWeb/Site.Master | 2 +- PumpkinHouseWeb/Styles/common.css | 95 +++++++++++---------- PumpkinHouseWeb/User/Dashboard.aspx | 4 +- PumpkinHouseWeb/User/Profile.aspx | 8 +- PumpkinHouseWeb/User/Profile.aspx.designer.cs | 10 +-- PumpkinHouseWeb/User/UserAlbum.aspx | 4 +- PumpkinHouseWeb/User/UserCollect.aspx | 4 +- PumpkinHouseWeb/User/UserCollect.aspx.designer.cs | 10 +-- PumpkinHouseWeb/User/UserLikeAlbum.aspx | 4 +- PumpkinHouseWeb/img/GzYesNo.png | Bin 1877 -> 3031 bytes PumpkinHouseWeb/template/albumTemplate.html | 2 +- .../template/albumThumbnailTemplate.html | 2 +- PumpkinHouseWeb/template/discussionTemplate.html | 4 +- PumpkinHouseWeb/template/messageTemplate.html | 4 +- PumpkinHouseWeb/template/noticeTemplate.html | 31 +++---- PumpkinHouseWeb/template/replyTemplate.html | 4 +- PumpkinHouseWeb/template/uploadTemplate.html | 8 +- PumpkinHouseWeb/template/userProfileTemplate.html | 2 +- PumpkinHouseWeb/template/userTemplate.html | 8 +- PumpkinHouseWeb/zt/20120504/index.html | 2 +- 33 files changed, 144 insertions(+), 141 deletions(-) rewrite PumpkinHouseWeb/img/GzYesNo.png (99%) diff --git a/PumpkinHouseWeb/500.aspx b/PumpkinHouseWeb/500.aspx index 32a6f02..ddf6f40 100644 --- a/PumpkinHouseWeb/500.aspx +++ b/PumpkinHouseWeb/500.aspx @@ -9,7 +9,7 @@
- 回到首页 + 回到首页
diff --git a/PumpkinHouseWeb/Aboutus/AboutUs.aspx b/PumpkinHouseWeb/Aboutus/AboutUs.aspx index 191cca5..df5dc99 100644 --- a/PumpkinHouseWeb/Aboutus/AboutUs.aspx +++ b/PumpkinHouseWeb/Aboutus/AboutUs.aspx @@ -28,7 +28,7 @@ 一个收纳、分享、发现美好家居生活的图微博社区。利用木头小工具,可以让你在上网时,将所喜欢的家居信息一键收纳到专属木头盒子里。


我们的口号…

-

木头盒子 —“分享家的地方”

+

木头盒子 —“分享家的地方”

所有跟家有关的美好,
只要你喜欢,只要你看到,
都可以一键收纳进盒子,马上分享!


diff --git a/PumpkinHouseWeb/Account/ExternalAuth.Master b/PumpkinHouseWeb/Account/ExternalAuth.Master index 32cc7f6..2ea183a 100644 --- a/PumpkinHouseWeb/Account/ExternalAuth.Master +++ b/PumpkinHouseWeb/Account/ExternalAuth.Master @@ -74,7 +74,7 @@
  • 密码:
  • diff --git a/PumpkinHouseWeb/Account/ExternalAuth.Master.designer.cs b/PumpkinHouseWeb/Account/ExternalAuth.Master.designer.cs index 77d1d3b..187248c 100644 --- a/PumpkinHouseWeb/Account/ExternalAuth.Master.designer.cs +++ b/PumpkinHouseWeb/Account/ExternalAuth.Master.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// <自动生成> +// 此代码由工具生成。 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 +// //------------------------------------------------------------------------------ namespace PumpkinHouse.Account { @@ -13,29 +13,29 @@ namespace PumpkinHouse.Account { public partial class ExternalAuth { /// - /// headHolder control. + /// headHolder 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.ContentPlaceHolder headHolder; /// - /// ScriptManager1 control. + /// ScriptManager1 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.ScriptManager ScriptManager1; /// - /// ContentHolder control. + /// ContentHolder 控件。 /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.ContentPlaceHolder ContentHolder; } diff --git a/PumpkinHouseWeb/Default.aspx b/PumpkinHouseWeb/Default.aspx index d4eeb93..09db15b 100644 --- a/PumpkinHouseWeb/Default.aspx +++ b/PumpkinHouseWeb/Default.aspx @@ -86,9 +86,9 @@ var globalAllPictures; if (globalOrderMode == 1) { - $(".HotNew .c a").css("color", "#28a7ff"); + $(".HotNew .c a").css("color", "#aacd60"); }else if(globalOrderMode == 2) { - $(".HotNew .span2 a").css("color", "#28a7ff"); + $(".HotNew .span2 a").css("color", "#aacd60"); }else{ } diff --git a/PumpkinHouseWeb/Guide/Step1.aspx b/PumpkinHouseWeb/Guide/Step1.aspx index 1e72dac..02f4ac9 100644 --- a/PumpkinHouseWeb/Guide/Step1.aspx +++ b/PumpkinHouseWeb/Guide/Step1.aspx @@ -62,7 +62,7 @@
      -
    • 1
      关注你可能感兴趣的
    • +
    • 1
      关注你可能感兴趣的
    • 2
      学习使用木头盒子
    • 3
      添加我的盒子
    diff --git a/PumpkinHouseWeb/Guide/Step2.aspx b/PumpkinHouseWeb/Guide/Step2.aspx index 4515d89..1507bc9 100644 --- a/PumpkinHouseWeb/Guide/Step2.aspx +++ b/PumpkinHouseWeb/Guide/Step2.aspx @@ -24,7 +24,7 @@
    • 1
      ¹Ø×¢Äã¿ÉÄܸÐÐËȤµÄ
    • -
    • 2
      ѧϰʹÓÃľͷºÐ×Ó
    • +
    • 2
      ѧϰʹÓÃľͷºÐ×Ó
    • 3
      Ìí¼ÓÎҵĺÐ×Ó
    diff --git a/PumpkinHouseWeb/Guide/Step3.aspx b/PumpkinHouseWeb/Guide/Step3.aspx index 731bd84..302b15a 100644 --- a/PumpkinHouseWeb/Guide/Step3.aspx +++ b/PumpkinHouseWeb/Guide/Step3.aspx @@ -52,7 +52,7 @@
    • 1
      ¹Ø×¢Äã¿ÉÄܸÐÐËȤµÄ
    • 2
      ѧϰʹÓÃľͷºÐ×Ó
    • -
    • 3
      Ìí¼ÓÎҵĺÐ×Ó
    • +
    • 3
      Ìí¼ÓÎҵĺÐ×Ó
    diff --git a/PumpkinHouseWeb/Notice/Notice.master b/PumpkinHouseWeb/Notice/Notice.master index c794923..45001c3 100644 --- a/PumpkinHouseWeb/Notice/Notice.master +++ b/PumpkinHouseWeb/Notice/Notice.master @@ -6,15 +6,16 @@ - -
    - +
    + +
    -
    diff --git a/PumpkinHouseWeb/Notice/NoticeAboutMe.aspx b/PumpkinHouseWeb/Notice/NoticeAboutMe.aspx index f3b8310..9ce5b97 100644 --- a/PumpkinHouseWeb/Notice/NoticeAboutMe.aspx +++ b/PumpkinHouseWeb/Notice/NoticeAboutMe.aspx @@ -31,7 +31,7 @@ \ No newline at end of file diff --git a/PumpkinHouseWeb/Notice/NoticeAnnouncement.aspx b/PumpkinHouseWeb/Notice/NoticeAnnouncement.aspx index 34e4af3..7333f7d 100644 --- a/PumpkinHouseWeb/Notice/NoticeAnnouncement.aspx +++ b/PumpkinHouseWeb/Notice/NoticeAnnouncement.aspx @@ -29,7 +29,7 @@ \ No newline at end of file diff --git a/PumpkinHouseWeb/Notice/NoticeReply.aspx b/PumpkinHouseWeb/Notice/NoticeReply.aspx index b84435c..f8dff27 100644 --- a/PumpkinHouseWeb/Notice/NoticeReply.aspx +++ b/PumpkinHouseWeb/Notice/NoticeReply.aspx @@ -32,7 +32,7 @@ \ No newline at end of file diff --git a/PumpkinHouseWeb/Scripts/collect.js b/PumpkinHouseWeb/Scripts/collect.js index e2bee48..3130bb3 100644 --- a/PumpkinHouseWeb/Scripts/collect.js +++ b/PumpkinHouseWeb/Scripts/collect.js @@ -68,8 +68,8 @@ } var albumId = buttonTarget.attr('data-album-id'); - dialog.find('a').removeClass('FontColor28a7ff'); - dialog.find('a[data-album-id=' + albumId + ']').addClass('FontColor28a7ff'); + dialog.find('a').removeClass('ColorAacd60'); + dialog.find('a[data-album-id=' + albumId + ']').addClass('ColorAacd60'); $('#btnCreateAlbum', dialog).off('click').on('click', function () { var name = $.trim($('#newAlbumName', dialog).val()); diff --git a/PumpkinHouseWeb/Site.Master b/PumpkinHouseWeb/Site.Master index 98fb5d3..dc98eeb 100644 --- a/PumpkinHouseWeb/Site.Master +++ b/PumpkinHouseWeb/Site.Master @@ -297,7 +297,7 @@
    -
    +
    木头盒子登录
    diff --git a/PumpkinHouseWeb/Styles/common.css b/PumpkinHouseWeb/Styles/common.css index b00cf72..8ec4e05 100644 --- a/PumpkinHouseWeb/Styles/common.css +++ b/PumpkinHouseWeb/Styles/common.css @@ -6,7 +6,7 @@ h1,h2,h3,h4,h5,h6,ul,li,dl,dt,dd,form,p,img {border:none;list-style-type:none;ma textarea{resize:none;} input{vertical-align:middle;} a{ color:#666; text-decoration:none} -a:hover{ color:#28a7ff; text-decoration:underline} +a:hover{ color:#aacd60; text-decoration:underline} .float_r{ float:right; display:inline} .float_l{ float:left; display:inline} .clear{width:100%; height:0px; clear:both;} @@ -39,8 +39,8 @@ visibility:hidden; .LineDD{width:100%; height:1px; background:#dddddd; clear:both; overflow:hidden} .LineFB{width:100%; height:1px; background:#fbfbfb; clear:both; overflow:hidden} .Line630{width:630px; height:1px; border-bottom:1px dashed #666666; clear:both; overflow:hidden} -/*蓝色*/ -.FontColor28a7ff{color:#28a7ff} +/*绿色*/ +.ColorAacd60{color:#aacd60} /*公用按钮*/ .WebSure{width:80px; height:30px; background:url(/img/DialogWebSure.jpg) no-repeat center top; border:none; cursor:pointer;} .AddGz{width:108px; height:27px; background:url(/img/GzYesNo.png) no-repeat center 0px; border:none; cursor:pointer} @@ -72,7 +72,7 @@ visibility:hidden; @-moz-document url-prefix(){.sucErrorMessageBoxCon .close{right:15px; top:15px;}} .sucErrorMessageBoxCon .close:hover{background:url(/img/closeSucErrMsgHover.png)} .sucErrorMessageBoxCon .content{ font-size:13px; color:#5d5d5d; font-family:'微软雅黑'; text-align:center; vertical-align:middle; display:table-cell;} - .sucErrorMessageBox .content a{ color:#28a7ff; text-decoration:underline;} + .sucErrorMessageBox .content a{ color:#aacd60; text-decoration:underline;} .sucErrorMessageBox .sucContent{ width:230px; height:71px; line-height:56px; background:url(/img/user_suc.jpg) no-repeat left 0; color:#5d5d5d; font-family:'微软雅黑'; text-indent:56px; text-align:left;} .sucErrorMessageBoxCon .titleinfo{font-size:14px; font-family:'微软雅黑'; font-weight:100; width:180px; height:71px; margin-left:50px; line-height:21px; text-align:left; overflow:hidden;} @@ -226,21 +226,21 @@ visibility:hidden; .TopLeft ul li .TopLogo{ width:160px; height:65px; display:block; margin-top:5px;} .TopLeft ul li span a{color:#666666; font-family:'微软雅黑'; display:block; float:left; display:inline; width:80px; height:75px; margin-left:7px;} .TopLeft ul li span a.around{color:#666666; text-decoration:none; background:url(/img/topMenuHref-around-a.png) repeat-x 0 0;} - .TopLeft ul li span a.around:hover{color:#28a7ff; text-decoration:none; background:url(/img/topMenuHref-around-aHover.png) repeat-x 0 0;} + .TopLeft ul li span a.around:hover{color:#aacd60; text-decoration:none; background:url(/img/topMenuHref-around-aHover.png) repeat-x 0 0;} .aroundPanel{width:450px; height:224px; background:url(/img/aroundPanelBg.png) no-repeat center top; position:absolute; left:3px; top:75px; overflow:hidden;} .aroundPanel ul{ width:410px; height:33px; line-height:33px; font-size:12px; padding:10px 15px; border-bottom:1px solid #e5e5e5; margin-left:5px;} .aroundPanel ul li a.keyword{width:auto; height:22px; font-size:12px; color:#5d5d5d; float:left; line-height: 22px; margin: 6px 0px 5px 0; overflow: hidden; padding: 0 5px; white-space: nowrap; font-family:'微软雅黑';} - .aroundPanel ul li a:hover{background:#28a7ff; color:#FFFFFF; text-decoration: none;} - .aroundPanel ul li a.Title{width:auto; height:33px; color:#28a7ff; font-size:18px; margin-right:20px;} - .aroundPanel ul li a.Title:hover{width:auto; height:33px; color:#28a7ff; background:none;} + .aroundPanel ul li a:hover{background:#aacd60; color:#FFFFFF; text-decoration: none;} + .aroundPanel ul li a.Title{width:auto; height:33px; color:#aacd60; font-size:18px; margin-right:20px;} + .aroundPanel ul li a.Title:hover{width:auto; height:33px; color:#aacd60; background:none;} - .TopLeft ul li span a.myHouse:hover{color:#28a7ff; text-decoration:none; background:url(/img/topMenuHref.png) repeat-x 0 0;} - .TopLeft ul li span a.aroundSelected{color:#28a7ff; text-decoration:none; background:url(/img/topMenuHref-around-aHover.png) repeat-x 0 0;} + .TopLeft ul li span a.myHouse:hover{color:#aacd60; text-decoration:none; background:url(/img/topMenuHref.png) repeat-x 0 0;} + .TopLeft ul li span a.aroundSelected{color:#aacd60; text-decoration:none; background:url(/img/topMenuHref-around-aHover.png) repeat-x 0 0;} .TopRight{width:340px; height:30px; line-height:30px; font-size:14px; padding:21px 0px 24px 0px; font-family:'微软雅黑';} .TopRight ul li{float:left; margin-left:10px; display:inline} .TopRight ul li a{color:#333333; text-decoration:underline;} - .TopRight ul li a:hover{color:#28a7ff;} + .TopRight ul li a:hover{color:#aacd60;} .TopSearch{width:220px; height:30px; background-color:#FFFFFF; margin-top:22px; margin-left:10px;} .TopSearch .TopSearchInput{position:relative; width:185px; height:24px; line-height:24px; left:2px; top:3px; border:none; color:#c1c1c1; background:none;} .TopSearch .float_r{margin-right:3px;} @@ -305,7 +305,7 @@ visibility:hidden; .HotNew{width:960px; height:50px; line-height:50px; font-size:18px; font-family:'微软雅黑'; color:#aeaeae;} .HotNew span{float:left; display:block; width:85px; height:50px; text-align:center; cursor:pointer; background:url(/img/Lines38.jpg) no-repeat 84px 6px;} .HotNew .span2{background:none;} - .HotNew .c{color:#28a7ff} + .HotNew .c{color:#aacd60} .HotNew span a{ text-decoration:none;} .HotNew .onlyShow{width:111px; height:25px; margin-top:12px; margin-left:10px; line-height:25px; font-size:14px; background:#F1F1F1 url(/img/onlyShow.png) no-repeat center top; text-align:left; color:#666; margin-right:10px;} .HotNew .onlyShow:hover{background:#F1F1F1 url(/img/onlyShow.png) no-repeat 0 -24px;}*/ @@ -353,7 +353,7 @@ visibility:hidden; .PublicList li .comments{width:199px; height:20px; margin:10px auto 0px; line-height:20px;} .PublicList li .comments a{display:block; cursor:pointer; color:#5d5d5d;} - .PublicList li .comments a:hover{color:#28a7ff} + .PublicList li .comments a:hover{color:#aacd60} .PublicList li .comments a.x{background:url(/img/icon-list.png) no-repeat 0px -72px; width:89px; height:14px; line-height:12px; cursor:auto; text-indent:20px; text-align:left; font-family:'微软雅黑'; font-size:14px;} .PublicList li .comments a.x:hover{background:url(/img/icon-list.png) no-repeat 0px -117px; width:89px; height:14px; text-decoration:none; color:#AACD06;} .PublicList li .comments a.x span.collectCount{color:#c1c1c1; font-family:'宋体';} @@ -368,7 +368,7 @@ visibility:hidden; .PublicList li .f ul .li1{width:25px; height:25px; margin-right:12px;} .PublicList li .f ul .li2{width:143px; height:auto;} .PublicList li .f ul .li2 a{color:#5d5d5d;} - .PublicList li .f ul .li2 a:hover{color:#28a7ff;} + .PublicList li .f ul .li2 a:hover{color:#aacd60;} .PublicList li .ft{ width:219px; height:3px; background:url(/img/LinesListBottom219.jpg) no-repeat center top; margin-bottom:-3px; _margin-bottom:-11px;} /*点击评论*/ .replyDialogInPage{ width:200px; height:120px;} @@ -418,8 +418,8 @@ visibility:hidden; .myLoveBoxPic{width:668px; height:240px; padding:20px; padding-left:16px; background:#F6F6F6; border:1px solid #eaeaea; margin-top:30px; margin-left:0px;} .myLoveBoxPic .topTitle{width:672px; height:26px; margin-bottom:10px; font-family:'微软雅黑';} .myLoveBoxPic .topTitle ul li{float:left; display:inline; line-height:26px; margin-right:20px; font-size:13px; color:#c1c1c1; font-family:'宋体'; } - .myLoveBoxPic .topTitle ul li span.FontColor28a7ff{ height:20px; line-height:20px; padding-bottom:6px;} - .myLoveBoxPic .topTitle ul li span.FontColor28a7ff a.AlbumLinkName{color:#5d5d5d; font-size:20px; font-family:'微软雅黑'; font-weight:100; line-height:22px;} + .myLoveBoxPic .topTitle ul li span.ColorAacd60{ height:20px; line-height:20px; padding-bottom:6px;} + .myLoveBoxPic .topTitle ul li span.ColorAacd60 a.AlbumLinkName{color:#5d5d5d; font-size:20px; font-family:'微软雅黑'; font-weight:100; line-height:22px;} .toLike{background:url(/img/loveOnOffBtn.png) no-repeat center top; border:none; cursor:pointer; width:61px; height:24px;} .like{background:url(/img/loveOnOffBtn.png) no-repeat center -24px; border:none; cursor:pointer; width:61px; height:24px;} .picList{width:672px; height:171px; overflow:hidden;} @@ -443,7 +443,7 @@ visibility:hidden; .CreateBox .float_r .tagPanel{width:210px; height:25px; line-height:25px;} /* .CreateBox .float_r .tag{height:22px; font-size:14px; color:#666666; -moz-border-radius:20px; -webkit-border-radius:20px; border-radius:20px; border:1px solid #666666; float:left; line-height: 22px; margin: 0 10px 10px 0; padding: 0 11px; white-space: nowrap; background-color:#FFFFFF;font-family:'微软雅黑'; cursor:pointer;}*/ .CreateBox .float_r .tag{height:22px; font-size:12px; color:#5d5d5d; background:#e1e1e1; float:left; line-height: 22px; margin: 0 5px 10px 0; overflow: hidden; padding: 0 5px; white-space: nowrap; font-family:'微软雅黑'; cursor:pointer;} - .CreateBox .float_r .tag:hover{background:#28a7ff; color:#FFFFFF; text-decoration: none;} + .CreateBox .float_r .tag:hover{background:#aacd60; color:#FFFFFF; text-decoration: none;} /*修改删除盒子 弹出层*/ .deleteAlbumConfirmMessage{ text-align:left; width:275px; height:90px; margin-left:20px; margin-top:10px; margin-bottom:-30px; color:#666666;} @@ -468,8 +468,8 @@ visibility:hidden; .favDail .favDailCon{width:420px; height:110px; margin-top:8px; overflow:auto} .favDail .favDailCon ul li{float:left; margin-right:10px; margin-bottom:10px;} .favDail .favDailCon ul li a{ display:block; padding:0px 5px; height:26px; line-height:26px; font-family:'微软雅黑'; background-color:#f6f6f6; color:#666666; text-decoration:none; float:left; _white-space:nowrap;} - .favDail .favDailCon ul li a.FontColor28a7ff{ background:#28a7ff; color:#fff;} - .favDail .favDailCon ul li a:hover{background-color:#28a7ff; color:#FFFFFF;} + .favDail .favDailCon ul li a.ColorAacd60{ background:#aacd60; color:#fff;} + .favDail .favDailCon ul li a:hover{background-color:#aacd60; color:#FFFFFF;} .favDail .favDailWeibo{width:420px; height:20px; line-height:20px; margin-top:8px; text-align:right;} .favDail .favDailAlbum{width:420px; height:30px; line-height:30px; margin-top:8px;} .favDail .favDailAlbum ul li{float:left; height:30px;} @@ -484,8 +484,8 @@ visibility:hidden; .tabSearMenu ul li{float:left; line-height:40px; color:#c1c1c1; font-family:'微软雅黑'; padding:0px 20px; cursor:pointer; } .tabSearMenu ul li a{ text-decoration:none;} - .tabSearMenu ul .liSelected{color: #28A7FF;border-top: 2px solid #28A7FF;margin-top: -1px; background:#F6F6F6} - .tabSearMenu ul .liSelected a {color: #28A7FF;} + .tabSearMenu ul .liSelected{color: #aacd60;border-top: 2px solid #aacd60;margin-top: -1px; background:#F6F6F6} + .tabSearMenu ul .liSelected a {color: #aacd60;} /*搜索页*/ .SearchBtnBox{ width:940px; height:35px; padding:12px 0 13px 20px; background:#F6F6F6;} .SearchBtnBox .SearchBox{width:345px; height:20px; padding:5px;} @@ -504,30 +504,31 @@ visibility:hidden; .searchPanel{ background:#F8F8F8; width:220px; height:auto; margin-left:38px; position:absolute; left:-135px; top:28px;} .searchPanel div a{ display:block; width:220px; height:20px; text-decoration:none;} - .searchPanel div a:hover{ background:#28a7ff; color:#fff;} + .searchPanel div a:hover{ background:#aacd60; color:#fff;} .searchPanel div a strong{ color:#000;} /*无搜索结果*/ .searchNullBox{width:840px; height:auto; text-align:center; font-size:30px; font-family:'微软雅黑'; color:#333; padding:60px; line-height:70px;} .searchNullBox .searchNullBtn{ width:264px; height:61px; background:url(/img/searchNullBtn.png) no-repeat center top; display:block; margin:0px auto;} -/*Notice*/ + +/*与我有关-评论回复-通知*/ .NoticeBox{width:800px; height:auto; margin-top:0px; height: auto!important;height: 400px;min-height: 400px;_height: auto;} - .NoticeAboutMe{padding:30px 40px; width:720px; height:auto; border-bottom:1px dashed #c1c1c1} + .NoticeAboutMe{padding:30px 25px; width:750px; height:auto; border-bottom:1px dashed #c1c1c1} .NoticeAboutMe .float_l{width:550px;} - .NoticeAboutMe .float_l ul li{float:left; display:inline; margin-right:20px;} + .NoticeAboutMe .float_l ul li{float:left; display:inline; margin-right:10px; color:#999} .NoticeAboutMe .float_l ul .li1{width:50px;} .NoticeAboutMe .float_l ul .li2{width:450px; line-height:25px;} - .NoticeAboutMe .float_l ul li .FontColor28a7ff a{color:#28a7ff} + .NoticeAboutMe .float_l ul li .ColorAacd60 a{color:#38383c; margin:0 3px; text-decoration:none;} + .NoticeAboutMe .float_l ul li .ColorAacd60 a:hover{color:#accd60;} .NoticeAboutMe .float_r{width:80px;} - - .announcementBox{padding:30px 40px; width:720px; height:auto; line-height:20px; font-size:13px; color:#666; border-bottom:1px dashed #c1c1c1;} + .NoticeAboutMe .noticeImg{width:100px; height:100px;} /*消息 页面*/ /*私信*/ -.MessageBox{width:800px; height:auto; border-top:1px solid #c1c1c1; margin-top:50px;height:auto!important;height:400px;min-height:400px;} +.MessageBox{width:800px; height:auto; border-top:1px solid #c1c1c1; margin-top:30px; height:auto!important;height:400px;min-height:400px;} .MessageBox .siteMap{width:800px; height:20px; line-height:20px; margin:20px 0px;} .MessageBox .tagMenu{width:800px; height:48px; line-height:48px; background:#fff; border-bottom:1px solid #e1e1e1;} .MessageBox .tagMenu ul li{float:left; font-size:18px; font-family:'微软雅黑'; margin-left:0px; position:relative;} - .MessageBox .tagMenu ul li a{display:block; width:88px; height:48px; margin-top:0px; line-height:48px; text-align:center; padding:0px; cursor:pointer; text-decoration:none; color:#c1c1c1} + .MessageBox .tagMenu ul li a{display:block; width:88px; height:48px; margin-top:0px; line-height:48px; text-align:center; padding:0px; cursor:pointer; text-decoration:none;} .MessageBox .tagMenu ul li .cl{height:47px; background:#fff; color:#92b006; border:1px solid #e1e1e1; border-bottom:none; margin-top:1px;} @@ -569,8 +570,8 @@ visibility:hidden; .DialogTop ul{width:666px; height:75px; line-height:75px; font-family:'微软雅黑'; color:#666666; font-weight:300; display:block; float:left; display:inline; overflow:hidden; position:absolute; z-index:11} .DialogTop ul li{width:175px; height:75px; float:left; text-align:center;} .DialogTop ul li a{width:175px; height:65px; font-size:24px; color:#c1c1c1; font-family:'微软雅黑'; margin-top:10px; border:1px solid #F8F8F8; display:block; text-decoration:none;} -.DialogTop ul li a:hover{color:#28a7ff;} -.DialogTop ul li a.click{width:175px; height:65px; background:#fff; color:#28a7ff; border:1px solid #c1c1c1; border-bottom:none;} +.DialogTop ul li a:hover{color:#aacd60;} +.DialogTop ul li a.click{width:175px; height:65px; background:#fff; color:#aacd60; border:1px solid #c1c1c1; border-bottom:none;} .DialogTop .Dialog_close{width:25px; height:25px; display:block; float:right; margin-right:13px; margin-top:13px; background:url(/img/DialogClose.png) no-repeat center top;} .DialogTop .Dialog_close:hover{background:url(/img/DialogCloseHover.png) no-repeat center top;} @@ -593,7 +594,7 @@ visibility:hidden; .webUrlBox ul li{ width:200px; height:140px; background:#f8f8f8; float:left; overflow:hidden; margin:5px; text-align:center;} .uploadFont{ font-size:18px; font-family:'微软雅黑'; color:red; margin-top:100px;} .linkImage{ border:2px solid #c1c1c1; cursor: pointer;} - .linkImage:hover{ border:2px solid #28a7ff; filter:alpha(opacity:100); opacity:10;} + .linkImage:hover{ border:2px solid #aacd60; filter:alpha(opacity:100); opacity:10;} .selectedImg{ border:2px solid red; filter:alpha(opacity:70); opacity:0.7;} .Dialog_description{width:643px; height:70px;} @@ -609,13 +610,13 @@ visibility:hidden; .Dialog_right .ConmmonLabel{width:210px; height:315px; overflow:hidden;} /*.Dialog_right .ConmmonLabel .tag{height:22px; font-size:14px; color:#666666; -moz-border-radius:20px; -webkit-border-radius:20px; border-radius:20px; border:1px solid #666666; float:left; line-height: 22px; margin: 0 10px 10px 0; padding: 0 11px; white-space: nowrap; background-color:#FFFFFF;font-family:'微软雅黑'; cursor:pointer; overflow: hidden;}*/ .Dialog_right .ConmmonLabel .tag{height:22px; font-size:12px; color:#5d5d5d; background:#e1e1e1; float:left; line-height: 22px; margin: 0 5px 10px 0; overflow: hidden; padding: 0 5px; white-space: nowrap; font-family:'微软雅黑'; cursor:pointer;} - .Dialog_right .ConmmonLabel .tag:hover {background:#28a7ff; color:#FFFFFF; text-decoration: none;} + .Dialog_right .ConmmonLabel .tag:hover {background:#aacd60; color:#FFFFFF; text-decoration: none;} /*albumNameList*/ .albumNameList{width:320px; height:175px; border:1px solid #c1c1c1; background-color:#FFFFFF;} .albumNameList .list{width:320px; height:115px; overflow:auto} .albumNameList .list ul li{width:250px; height:28px; line-height:28px; padding:0px 15px; font-size:14px; font-family:'微软雅黑';} - .albumNameList .list ul li:hover{color:#28a7ff; background:#F6F6F6; cursor:pointer;} + .albumNameList .list ul li:hover{color:#aacd60; background:#F6F6F6; cursor:pointer;} .albumNameList .createAlbumBox{width:296px; height:30px; padding:15px 12px;} .albumNameList .createAlbumBox ul li{float:left; margin:0px;} .albumNameList .createAlbumBox ul li .newAlbumBox{width:200px; height:25px;} @@ -636,7 +637,7 @@ visibility:hidden; .AddLabelDialog .sureButton{width:80px; height:30px; background:url(/img/DialogWebSure.jpg) no-repeat center top; border:none; cursor:pointer;} .AddLabelDialog .AddTag{width:320px;} .AddLabelDialog .tag{height:22px; font-size:12px; color:#5d5d5d; background:#e1e1e1; float:left; line-height: 22px; margin: 0 5px 10px 0; overflow: hidden; padding: 0 5px; white-space: nowrap; font-family:'微软雅黑'; cursor:pointer;} - .AddLabelDialog .tag:hover {background:#28a7ff; color:#FFFFFF; text-decoration: none;} + .AddLabelDialog .tag:hover {background:#aacd60; color:#FFFFFF; text-decoration: none;} @@ -651,7 +652,7 @@ visibility:hidden; /*错误页面 404/500*/ .Box_404{width:759px; height:346px; background:url(/img/404_bgpic.jpg) no-repeat center top; border:1px solid #fff; margin:100px auto;} .Box_404 .context{ width:320px; height:80px; margin:215px 70px 70px 350px; font-size:18px; font-family:'微软雅黑';} - .Box_404 .context a{ text-decoration:underline; color:#28a7ff;} + .Box_404 .context a{ text-decoration:underline; color:#aacd60;} /*关于我们*/ .AboutBox{ width:960px; height:auto; margin-top:45px; height: auto!important;height: 400px;min-height: 400px;_height: auto;} @@ -660,7 +661,7 @@ visibility:hidden; .AboutBox .AboutLeft ul li{width:170px; height:35px; line-height:35px; text-indent:10px; font-size:16px; font-family:'微软雅黑';} .AboutBox .AboutLeft ul li a{width:170px; height:35px; line-height:35px; text-indent:10px; display:block; color:#a9a9a9;} .AboutBox .AboutLeft ul li a:hover{color:#5d5d5d; text-decoration:none;} - .AboutBox .AboutLeft ul li a.selected{ background:#fff; color:#28a7ff;} + .AboutBox .AboutLeft ul li a.selected{ background:#fff; color:#aacd60;} .AboutBox .AboutRight{ width:710px; height:auto; color:#666; font-size:14px; line-height:24px; font-family:'微软雅黑'} .AboutBox .AboutRight .Con{ width:600px; float:left; text-align:left;} @@ -690,7 +691,7 @@ visibility:hidden; /* 首页关键字 */ .keyword {color: Blue;border: 1 solid Blue;float: left;padding: 0.2em;margin: 0.2em;cursor: pointer;} -a.selectedKeyword {background-color: #28A7FF} +a.selectedKeyword {background-color: #aacd60} #imageArea{position: relative;} #background {width: 100%; height: 100%; position: absolute; left: 0px; top: 0px; z-index: 0;} @@ -898,7 +899,7 @@ a.selectedKeyword {background-color: #28A7FF} .head{width:960px; height:60px; line-height:60px; font-family:'微软雅黑'; padding-top:10px;} .head span{display:block; height:40px; margin:15px 0px;} .head h1{font-size:18px; font-family:'微软雅黑'; margin-left:10px; color:#666666} - .head h2{font-size:16px; font-family:'微软雅黑'; color:#28a7ff; margin-right:30px; height:20px; line-height:20px; margin-top:20px;} + .head h2{font-size:16px; font-family:'微软雅黑'; color:#aacd60; margin-right:30px; height:20px; line-height:20px; margin-top:20px;} .head h2 input{ margin-top:-2px;} .loveBox{width:960px; height:auto; min-height: 571px; padding-bottom:20px; border-bottom:1px dashed #c1c1c1;} @@ -922,7 +923,7 @@ a.selectedKeyword {background-color: #28A7FF} .tabStepMenu{width:750px; height:40px; background:#F6F6F6; margin:50px auto; font-size:16px;} .tabStepMenu ul{width:740px; height:40px; padding-left:10px;} .tabStepMenu ul li{float:left; margin-top:6px; line-height:34px; color:#c1c1c1; font-family:'微软雅黑'; padding:0px 15px; cursor:pointer;} - .tabStepMenu ul .liSelected{background-color:#FFFFFF; color:#28a7ff;} + .tabStepMenu ul .liSelected{background-color:#FFFFFF; color:#aacd60;} .tabStepMenu ul li a{ text-decoration:none;} @@ -949,7 +950,7 @@ a.selectedKeyword {background-color: #28A7FF} .pagination {font-size: 80%;font-family:'微软雅黑';width:600px;height:auto;margin-top:20px;} .pagination a {text-decoration: none;border: solid 1px #7A7A7A;color: #15B;font-family:'微软雅黑';} .pagination a, .pagination span {display: block;float: left;padding: 0.3em 0.5em;margin-right: 5px;margin-bottom: 5px;min-width:1em;text-align:center;font-family:'微软雅黑';} -.pagination .current {background: #28a7ff;color: #fff;border: solid 1px #28a7ff;} +.pagination .current {background: #aacd60;color: #fff;border: solid 1px #aacd60;} .pagination .current.prev, .pagination .current.next{display:block;height:20px;color:#999;border: solid 1px #7A7A7A;background:#fff;font-family:'微软雅黑';} @@ -965,7 +966,7 @@ a.selectedKeyword {background-color: #28A7FF} .UserHeaderPic{width:124px; height:124px; margin-right:10px; border:1px solid #c1c1c1; background:#fff; position:relative;} .UserHeaderPic img{margin:2px; position:absolute; z-index:10;} .UserHeaderPic a.changePhotoBtn{width:120px; height:30px; display:block; background:#000; filter:alpha(opacity=50); opacity:0.5; position:absolute; bottom:2px; left:2px; z-index:11; text-align:center; line-height:30px; color:#fff; text-decoration:none;} - .FontColor28a7ff{color:#28a7ff} + .ColorAacd60{color:#aacd60} .PictureLeft .UserDescription{width:180px; height:auto; margin-top:20px; padding:5px; line-height:19px; border:1px solid #d3d3d3;} .PictureLeft .UserDescription .Hd{width:16px; height:8px; background:url(/img/PictureViewUser-sj.jpg) no-repeat center top; margin-top:-13px; margin-left:50px; margin-bottom:5px;} .PictureLeft .UserDescription .con{ background:#f8f8f8; padding:5px; overflow:hidden;} @@ -975,7 +976,7 @@ a.selectedKeyword {background-color: #28A7FF} .PictureLeft .UserGzEmail .UserGz{width:108px; height:27px;} .PictureLeft .UserGzEmail .UserEmail{width:56px; height:27px;} .PictureLeft .UserGzEmail .UserEmail .sendMsgButton{width:56px; height:27px; background:url(/img/sendMsgButton.jpg) no-repeat center top; border:none; cursor:pointer;} - .PictureLeft h2{font-size:16px; height:16px; line-height:30px; font-family:'微软雅黑'; margin:10px; color:#28a7ff} + .PictureLeft h2{font-size:16px; height:16px; line-height:30px; font-family:'微软雅黑'; margin:10px; color:#aacd60} .PictureLeft h3{font-size:14px; height:16px; line-height:30px; font-family:'微软雅黑'; margin:25px 10px 0px; _margin:10px 10px -10px;} .PictureLeft h3 span{ display:block; float:left; display:inline;} .PictureLeft h3 span.AlbumTitle{width:130px;} @@ -1014,7 +1015,7 @@ a.selectedKeyword {background-color: #28A7FF} .PictureBiaoq div{float:left; margin-right:5px; height:auto; line-height:22px;} .PictureBiaoq .bq a.b{height:22px; font-size:12px; color:#5d5d5d; background:#e1e1e1; float:left; line-height: 22px; margin: 0 10px 0px 0; padding: 0 5px; white-space: nowrap; font-family:'微软雅黑'; cursor:pointer; position:relative;} - .PictureBiaoq .bq a.b:hover {background:#28a7ff; color:#FFFFFF; text-decoration: none;} + .PictureBiaoq .bq a.b:hover {background:#aacd60; color:#FFFFFF; text-decoration: none;} .PictureBiaoq .bq a .canDelete{ position:absolute; right:-7px; top:-7px; width:12px; height:12px; background:url(/img/webIcon.png) no-repeat 0 -346px; display:block;} .PictureBiaoq #showTagDialogButton{ text-decoration:none;} @@ -1022,7 +1023,7 @@ a.selectedKeyword {background-color: #28A7FF} .PictureRight .PictureTjFx{width:670px; height:25px; margin-top:10px;} .collectBtn{width:61px; height:24px; background:url(/img/collectBtn.png) no-repeat center top; border:none; cursor:pointer} .PictureRight .PictureTjFx .fa a{ text-decoration:none;} - .PictureRight .PictureTjFx .fa a:hover{ color:#28a7ff;} + .PictureRight .PictureTjFx .fa a:hover{ color:#aacd60;} .PictureRight .PictureTjFx .float_l{ width:380px; height:25px;} .PictureRight .PictureTjFx .float_l a{color:#c1c1c1;} .PictureRight .PictureTjFx .float_l .AlbumLinkName{color:#333;} @@ -1059,7 +1060,7 @@ a.selectedKeyword {background-color: #28A7FF} .editPictureDescCon .WebSure{ margin-top:5px;} .editPictureDescBtn{ font-size:13px; font-family:'宋体'; margin-left:8px; color:#c1c1c1} .editPictureDescBtn a{ font-size:13px; font-family:'宋体'; color:#c1c1c1; text-decoration:none;} - .editPictureDescBtn a:hover{color:#28a7ff} + .editPictureDescBtn a:hover{color:#aacd60} /******************************* BoardList.css ************************************************************/ diff --git a/PumpkinHouseWeb/User/Dashboard.aspx b/PumpkinHouseWeb/User/Dashboard.aspx index 255f5e0..8b3c202 100644 --- a/PumpkinHouseWeb/User/Dashboard.aspx +++ b/PumpkinHouseWeb/User/Dashboard.aspx @@ -81,8 +81,8 @@
    diff --git a/PumpkinHouseWeb/User/Profile.aspx b/PumpkinHouseWeb/User/Profile.aspx index bc61cea..2f31198 100644 --- a/PumpkinHouseWeb/User/Profile.aspx +++ b/PumpkinHouseWeb/User/Profile.aspx @@ -386,19 +386,19 @@ border: none; background: none; font-family: '微软雅黑'; - color: #28a7ff; + color: #aacd60; font-size: 16px; } .ui-state-default a:hover { - color: #28a7ff; + color: #aacd60; font-size: 16px; background: none; } .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { - color: #28a7ff; - border-top: 2px solid #28a7ff; + color: #aacd60; + border-top: 2px solid #aacd60; text-decoration: none; cursor: pointer; margin-top: -2px; diff --git a/PumpkinHouseWeb/User/Profile.aspx.designer.cs b/PumpkinHouseWeb/User/Profile.aspx.designer.cs index e4b0a9d..377a685 100644 --- a/PumpkinHouseWeb/User/Profile.aspx.designer.cs +++ b/PumpkinHouseWeb/User/Profile.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// <自动生成> +// 此代码由工具生成。 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 +// //------------------------------------------------------------------------------ namespace PumpkinHouse.User { diff --git a/PumpkinHouseWeb/User/UserAlbum.aspx b/PumpkinHouseWeb/User/UserAlbum.aspx index a6666ed..94fd050 100644 --- a/PumpkinHouseWeb/User/UserAlbum.aspx +++ b/PumpkinHouseWeb/User/UserAlbum.aspx @@ -13,8 +13,8 @@
    diff --git a/PumpkinHouseWeb/User/UserCollect.aspx b/PumpkinHouseWeb/User/UserCollect.aspx index 0aaeae4..2f99849 100644 --- a/PumpkinHouseWeb/User/UserCollect.aspx +++ b/PumpkinHouseWeb/User/UserCollect.aspx @@ -56,8 +56,8 @@
    diff --git a/PumpkinHouseWeb/User/UserCollect.aspx.designer.cs b/PumpkinHouseWeb/User/UserCollect.aspx.designer.cs index 44325b0..5d6616d 100644 --- a/PumpkinHouseWeb/User/UserCollect.aspx.designer.cs +++ b/PumpkinHouseWeb/User/UserCollect.aspx.designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// <自动生成> +// 此代码由工具生成。 // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// 对此文件的更改可能会导致不正确的行为,并且如果 +// 重新生成代码,这些更改将会丢失。 +// //------------------------------------------------------------------------------ namespace PumpkinHouse.User { diff --git a/PumpkinHouseWeb/User/UserLikeAlbum.aspx b/PumpkinHouseWeb/User/UserLikeAlbum.aspx index b00bc44..7e7812a 100644 --- a/PumpkinHouseWeb/User/UserLikeAlbum.aspx +++ b/PumpkinHouseWeb/User/UserLikeAlbum.aspx @@ -11,8 +11,8 @@
    diff --git a/PumpkinHouseWeb/img/GzYesNo.png b/PumpkinHouseWeb/img/GzYesNo.png dissimilarity index 99% index 9c957d1b69e297860c51c0b800a2589ef062edad..dcad2ce4c5cace7ac7e6bb388480643f9208505b 100644 GIT binary patch delta 2990 zcwPan3sLmd4%ZiuBn<>-K}|sb0I$e51&ZmBAt!$eX-PyuRCwC#U43jEM-_kP*lB%k zZJ#U0AuixrMRg*#qIO!*B3!Al0|L<^iv0&rsg=NyDgi}M*;R_fSE;Rn1gIonkord< zf}}!iKozQwP#dZU@Fl96v_W=kC&-aWYP(M2y8b-ot=~j*b2IyKyL-Nm`AJWAw>vv~ zJHLPZz4vDJogGOgldu_xpSfp=y=;Zz!hCzv@oGOElz>5A!4PH$Gcbf17{Ux;Iga}3 z&ndUpRNQ5mAuI&2lo(n*_;b(4RbJl&x7I!ex7R#mPMMV4>fq1=ZGLUOJVwR|C^ZzObe{R(Wm@%}X8WQ<)p z0FyH>gg$XDEp&CEB1*SZN^b4T7CDnMzfIY`x^~%mMK`&)a={`2Aro=mM_z?9(|v#N zzbnVGemwU3l$KO# z&!I{xR@X0EG4I6rZ&;*ZA1iBD3}M*-#volfUte9X+=r@rd%EAc3H~+t=(Ws{Cny}4 zDc(-+kc_c&biRAU9O?D(1}9VhD2d(;$(5)drT~F-i3dp;b$I~ z&~2ij0#&OTV$#9e^CZP29X?zjl67wO1uOfri$|z5RM|N;Nyfns3BHq#NTJts!;C;5!rnuh|V4ua{5_dB@ zN@OAK)3loAma?@4byQN;IU0cV5L|bHOazZj1Daz7NNtVe zO0zM2ND2y*2~7q;nvSqfGJ8>Qhf(_cSvuxLNm&@TzQXK+i*vTB20+O6toYU5bbKTh zZLwkz+t*>!U!!8%91+|>N{cBJ8kCxJ?og+;P+Z~xMeMqX6jpztIPQBMQtAXtFj{px zm)GXtrFDGS+iRiLKMwX?f_?dg`RD_Bd+`1(eV+40lMyQHot)#HslnwT07{hc5 zbIb^XR+uhJ#MOU_$6Xwc1NGIA;#QxKwT(-L2?yL9dx&R=@_tTOyH8iB8faCVaym|z zQ3jgU|IC53WoB48c`>9pqRwr05|O=4b>9XdW!J5Y!~-NrR!q``dLojAy3%1s+IMhn z>G6DX16miNduC}$>(Try}HJ3BCuBzllZb#H>qr#$UY*hc=USx zvWg|7h>L%vDmU*lm%OS7$7WUi2Xq%Y{thQgtKP|MxS?D^zE@2Z9bu+Kzz~*Q4`B#1 zFoYQx!VF;shA@K=Q0igQ>h2~!@t1B zbE~U-&|fTr zzQpHdypGUI~J3Qq78RZDdlNQSwI7uB(?NQijd0+da9zgz`O5F z*j4_H3(Av~RB)BQ97B*^4y{8K#V`DOs+X8yt=e$~VPd_Y>=IQmM>VKD)zL;c2gmFx ze-G15(BactYBLvWtgCEs-QnNfexe36mA`MC{|$hB?SnW5fU14`@0ZJ^97mY(kL`()O4_RfDL;_g8Eye;bLE4k+--UrvA4 zgXHEO@zCd0hyA-Dy|^-h6V^vRapHB2dy^}BF*8imRo%(6L|x@?X8`UHG%;vXDt~nf zTVwWlx(m_09Rz(Pu4?|35#C#Vr%aeb>Ci)oMAzQt1A{EJZzor$Dr4&ee}$w@B&j|- zWsIT3FjUDDkyQm5*7bP~fXnZcIwXG=eVi=JD66AZ6&0{^=S~U2AW@g6IU9a1x8fYgs>Scg388lt|^O7BMHy>II z!=z$yaZ$N%YHG?-UTJA5l$4af%F2o-m*ds7WTKX!$nxq^oz9_)VY-{pHDSxk%P=u9 z5nB4|6pQ?1a$zJZL0nrVZa?Q&I{Xk7wyNB^U%Tmu*W_qZ33GpYQJD^=mx*fFivqgX z8(Pwljg=1ZqPz^OZdF4*hx|Thx9H@)=F5gbU>8DJ1MI*!YWU_@&A8+o kriq(7*c9Zg{|go{0A{#V71Spa761SM07*qoM6N<$f@EQ~rvLx| delta 1829 zcwPY|2io}87u61sB#|^Ee+KtSL_t(|+U#A)P9#SV&1T;>iA~G_#KB_G9DT4QF8&FB zh9w_8S0Cmu|KWrGz>+19FZLN>BtQs>7FcX*i5;4DMKXoj<;<*zT&gOk<4HwBb#--C zyokuitd~Wt)oO{du=0y|m%MyRwr`VdK`>OPC)*#%_T%5*i+Zgrf5H;7zDi#HOtx|6 z1cgSjebZH913ofYB!I0xmPy!m%mLkIWfC^R_9tVoi)|1Wm@p=+dPvG)@1M!OZ#v%Q z`#Hks!w#*XVL!aDI$re|)48bV=~O~=hE*B5eZPt<6)~#wXZPvOV?vn&=N8q#)C<&k zbsiCvXlVb8seLx>fA6>mQyCLOhRU#c23I)&7afr}i0?upng}yhVxc_QrrOK4C5^NY z?eB@nV?(DKlOeI+-+o+(_H#-k6g+v+$9lNj^syLuV zXFF-8{tmO>#tA!Srb9JOQkCJDN-jI5Q;`}9(adx(xJqQge;8jjVGTAv8P{bJ_B-33 zjNi&6>_f6$G6!gYtv=K?H#grZ#?KoT-J1O^#JQUANn^9bJw16N zR%K9|{VMW(k*0G%iepjR;uK*+LqlR^WkuZG-ATei11^dZN$K%A<7W3!3Cy-9{oQol z_RrXmXH8gdZ?7Z^NV~qi7T6o1HlCd|fa&k7@zTFtf4th(xpa==lB%r;>+0$f%gf6$ z9m-mBa8Pu2cZ=ue=b#r)xj3B%m)SR~A}gB#yhYf+z<}(dn$4z|o}LynGc$7k)zy_a zJUkSSkB>o$4_`!wB+nF0x)g0HuB;=hR;x*(78Vx7?Ch-A-QAT0EiNv~_s`DG#NOT> zIkNH$f7jk<(*$0d=T3V9i0d8+^gOO$17f?$2ko_2@Z7$sdYNn&n zXo#Ji9r+3XvK}5DDmBoirri)EsiHXVdeTa^f4!phQYAuBad2=TQ({V7nbB2rB}j1! z)!0l|bOfE6g476G706O`;(6)O_rMv`Myyj|iFBTt3YqG%9*MnZm3MzBD1|VFJ^1zt z6UGQl7)z$(fs|^qWI7&5sWwZdk#Hjquwgnr3!KB(LCMG7N{B3)C zn=H)1rjx2Ge<}U5tNIsB7>G($Y47Fbe?>~RL1zzYDu_0lq9TOX7p45oizZ!~Hrc@` z!eGHes`ky21u81Q*w~m@Utbsd`}^YJ;-V1Gt%~xOS^>MLe^G=%Q2|SeQ~;qVL|#u% zk5mU^)`(HOJqG2kDZ+fKe~pBVj*g1)@o^bRKp3P&AVr0vqa%47))QUyc~w;Yf2#VR z5b9qeVIw0WG8LvILG*wwF-sam*!lT6s_4iYpZFdElueTAZ%hieBJAYkM3Mw+!C(Od zkOJyoRg}5v>}^wA*|Qc!tABI*Fdzv?TU%R`DG|~hCiN9HJ5n{}uda{srT#@vO~C@b zzP>(je0*HkTp}f%s`{;tR{p}0e^{7?y1%~{jPigUIKx^o*cj!4?}ssAjL?L!R68E9 zR68=TR68QDR67!|R68=TR6A0zR68=TR69bjR68=TR68~>VN6&)^6rbdJ}*&stV;h^ z{`FYlPjY3p?=BY=&rK7~$a5$Yx#2ss8X!*_=
      -
    • ${name}

    • +
    • ${name}

    • (${numberOfPic}个收纳)
      diff --git a/PumpkinHouseWeb/template/albumThumbnailTemplate.html b/PumpkinHouseWeb/template/albumThumbnailTemplate.html index cd59fae..b0112f6 100644 --- a/PumpkinHouseWeb/template/albumThumbnailTemplate.html +++ b/PumpkinHouseWeb/template/albumThumbnailTemplate.html @@ -25,7 +25,7 @@
        -
      • {{tmpl({id: id, username: username, name: name}) "#albumLinkTemplate"}}
      • +
      • {{tmpl({id: id, username: username, name: name}) "#albumLinkTemplate"}}
      • ${numberOfPic}个收纳
        diff --git a/PumpkinHouseWeb/template/discussionTemplate.html b/PumpkinHouseWeb/template/discussionTemplate.html index a3ee435..98a6212 100644 --- a/PumpkinHouseWeb/template/discussionTemplate.html +++ b/PumpkinHouseWeb/template/discussionTemplate.html @@ -3,7 +3,7 @@
        •  
        • -

          ${name}话题:${numOfDisc}帖/${numOfNew}新

          +

          ${name}话题:${numOfDisc}帖/${numOfNew}新

        {{/each}} @@ -63,7 +63,7 @@ {{tmpl({username: discussion.username, dd: 50, pd: 50}) '#userProfilePhotoTemplate'}}
      • - ${discussion.displayName}
        + ${discussion.displayName}
        ${discussion.text}
        ${discussion.time}
      • diff --git a/PumpkinHouseWeb/template/messageTemplate.html b/PumpkinHouseWeb/template/messageTemplate.html index bce6283..5021d19 100644 --- a/PumpkinHouseWeb/template/messageTemplate.html +++ b/PumpkinHouseWeb/template/messageTemplate.html @@ -14,11 +14,11 @@ {{tmpl({username: target, dd: 50, pd: 50}) '#userProfilePhotoTemplate'}}
      • - ${targetDisplay}
        + ${targetDisplay}
        ${text}
        ${formattedTime}
      • -
      • ${count}条私信{{if newNumber > 0}}(${newNumber}){{/if}}
      • +
      • ${count}条私信{{if newNumber > 0}}(${newNumber}){{/if}}
      {{/each}}
      diff --git a/PumpkinHouseWeb/template/noticeTemplate.html b/PumpkinHouseWeb/template/noticeTemplate.html index 0fdbc35..bf177ae 100644 --- a/PumpkinHouseWeb/template/noticeTemplate.html +++ b/PumpkinHouseWeb/template/noticeTemplate.html @@ -6,7 +6,7 @@
    • {{tmpl "#noticeContentTemplate"}}
      -
      +
        {{tmpl "#noticeImageTemplate"}}
      @@ -17,52 +17,53 @@ diff --git a/PumpkinHouseWeb/template/replyTemplate.html b/PumpkinHouseWeb/template/replyTemplate.html index 9cba12f..a1d4667 100644 --- a/PumpkinHouseWeb/template/replyTemplate.html +++ b/PumpkinHouseWeb/template/replyTemplate.html @@ -6,8 +6,8 @@
    • - ${displayName} - {{if replyTo}}   回复  ${replyToNickname}{{/if}} + ${displayName} + {{if replyTo}}   回复  ${replyToNickname}{{/if}} ${timeago}
      {{html content}}     diff --git a/PumpkinHouseWeb/template/uploadTemplate.html b/PumpkinHouseWeb/template/uploadTemplate.html index fece1fb..8b55abc 100644 --- a/PumpkinHouseWeb/template/uploadTemplate.html +++ b/PumpkinHouseWeb/template/uploadTemplate.html @@ -62,9 +62,9 @@
    +

    添加后,可直接点击盒子工具抓取想收纳的图片哦!

    -

    拖拽【分享到木头盒子】至浏览器收藏栏

    +

    拖拽【分享到木头盒子】至浏览器收藏栏

    (没看到浏览器收藏栏?快捷键 Ctrl+Shift+B 展开)

    -

    添加后,可直接点击盒子工具抓取想收纳的图片哦!

    查看详情> @@ -145,7 +145,7 @@ \ No newline at end of file diff --git a/PumpkinHouseWeb/template/userProfileTemplate.html b/PumpkinHouseWeb/template/userProfileTemplate.html index f0778f5..6e83cb8 100644 --- a/PumpkinHouseWeb/template/userProfileTemplate.html +++ b/PumpkinHouseWeb/template/userProfileTemplate.html @@ -21,7 +21,7 @@ .messageBoxCon{width:610px;}
    -

    编辑头像

    +

    编辑头像

    diff --git a/PumpkinHouseWeb/template/userTemplate.html b/PumpkinHouseWeb/template/userTemplate.html index c8363c4..1d4e1aa 100644 --- a/PumpkinHouseWeb/template/userTemplate.html +++ b/PumpkinHouseWeb/template/userTemplate.html @@ -33,14 +33,14 @@
    - 粉丝
    ${numberOfFans} + 粉丝
    ${numberOfFans} - 关注
    ${numberOfAttentions} + 关注
    ${numberOfAttentions} 收纳
    - ${numberOfPictures} + ${numberOfPictures} @@ -80,7 +80,7 @@