From 4cbae10934670a0fb2fdfcfa9014159c59da67ab Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 5 Jul 2016 15:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5devlope=E5=88=86=E6=94=AFcss?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/css/common.css    |  32 +++
 public/stylesheets/css/courses.css   |  42 +--
 public/stylesheets/css/popup.css     |  19 +-
 public/stylesheets/css/project.css   |  43 ++-
 public/stylesheets/css/public.css    | 394 ++++++++++++++++++++++++++-
 public/stylesheets/css/structure.css |  19 +-
 public/stylesheets/org.css           |   9 +-
 7 files changed, 490 insertions(+), 68 deletions(-)

diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 6d4c20ee7..f1e937ae4 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -59,6 +59,8 @@ a.btn_message_free{ background:#ff5722; display:block;  text-align:center; color
 h2{ font-size:18px;} /*color:#269ac9;*/
 h3{ font-size:14px;}/* color:#e8770d;*/
 h4{ font-size:14px;}/*color:#3b3b3b;*/
+.f8 {font-size:8px;}
+.f10 {font-size:10px;}
 .f12{font-size:12px;}
 .f_12{ font-size:12px;}
 .f14{font-size:14px;}
@@ -83,10 +85,12 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .fr{float:right;}
 .f_l{ float:left;}
 .f_r{ float:right;}
+.float-none {float:none !important;}
 .tac {text-align:center;}
 .clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
 .clearfix{clear:both;zoom:1}
 .hidden{overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.hide-text {overflow:hidden; white-space:nowrap;}
 .flow_hidden{ width:300px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .white_space{white-space:nowrap;}
 .pr {position:relative;}
@@ -135,8 +139,10 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
 .ml125 { margin-left:125px;}
+.ml130 { margin-left:130px;}
 .ml150 { margin-left:150px;}
 .ml160 {margin-left:160px;}
+.ml250 {margin-left:250px;}
 .ml258{ margin-left:258px;}
 .ml320{ margin-left:320px;}
 .ml358{ margin-left:358px;}
@@ -189,7 +195,10 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .mt20{margin-top: 20px;}
 .mt28 {margin-top:28px;}
 .mt30{ margin-top: 30px;}
+.mt35 {margin-top:35px;}
 .mt40{ margin-top: 40px;}
+.mt50{ margin-top:50px;}
+.mt100{ margin-top:100px;}
 .mb0 {margin-bottom: 0px !important;}
 .mb4{ margin-bottom:4px;}
 .mb5{ margin-bottom:5px;}
@@ -199,8 +208,11 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .mb12 {margin-bottom:12px !important;}
 .mb15{margin-bottom: 15px;}
 .mb20{ margin-bottom:20px;}
+.mb30 {margin-bottom:30px;}
+.mb40 {margin-bottom:40px;}
 .pl5{ padding-left:5px;}
 .pl10 {padding-left:10px;}
+.pr5 {padding-right:5px;}
 .pr10{padding-right: 10px;}
 .pl15{ padding-left:15px;}
 .pt5{ padding-top:5px;}
@@ -276,9 +288,11 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .h200{ height:200px;}
 .h400{height: 400px !important;}
 .h150{ height:150px;}
+.H60 {height:60px !important;}
 .H150{ height:150px;}
 .p10 {padding-left:10px; padding-right:10px;}
 .mw220 {max-width: 220px !important;}
+.mw280 {max-width:280px !important;}
 .mw360 {max-width: 360px !important;}
 .mw380 {max-width: 380px !important;}
 .mw400 {max-width: 400px !important;}
@@ -289,8 +303,11 @@ a.linkGrey6:hover {color:#ffffff !important;}
 .W50{ width:50px;}
 .W120{ width:110px;}
 .W200{ width:200px;}
+.W300 {width:300px !important;}
 .W320{ width:320px;}
+.W420 {width:420px;}
 .W440{ width:440px;}
+.W600{ width:600px;}
 .W700{ width:700px; max-width:700px; min-width:700px;}
 .W710{ width:708px;}
 .maxwidth150{max-width: 150px;}
@@ -363,9 +380,15 @@ a:hover.c_grey{ color:#333;}
 .c_grey{color:#999;}
 .c_dgrey{ color:#696969;}
 .c_dblue{ color:#09658c;}
+.c_white {color:#fff;}
 .b_blue{background:#64bdd9;}
 .b_green{background:#28be6c;}
 .b_w{ background:#fff !important;}
+.b_slow_yellow{background:#adde18;}
+.b_yellow{background:#DDDF0D;}
+.b_slow_red{background:#df8538;}
+.b_green2 {background:#63c360;}
+.b_red {background:#d60308;}
 
 /*font&color add by Tim*/
 .fontGrey {color:#cecece;}
@@ -373,12 +396,17 @@ a:hover.c_grey{ color:#333;}
 .fontGrey3 {color:#484848;}
 .fontGrey4{color:#999999;}
 .fontGrey5 {color:#a1a1a1;}
+.fontGrey6 {color:#7a7a7a;}
 .fontBlue {color:#3498db;}
+span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.underline {text-decoration:underline;}
 a.fontBlue {color:#297fb8;}
 .fontBlue2 {color:#269ac9 !important;}
 a.fontGrey {color:#cecece;}
 a.fontGrey2 {color:#888888;}
+a.link-black {color:#000;}
+a.link-black:hover {color:#3b94d6;}
+a.link-blue {color:#3b94d6;}
 a.linkOrange {color:#ff7143;}
 a.linkBlue {color:#269ac9;}
 a.linkBlue:hover {color:#297fb8;}
@@ -512,6 +540,10 @@ a:hover.bgreen_n_btn{background:#08a384;}
 .button-rep { color: #888;display: inline-block;background: #eee;padding: 2px 5px;}
 a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #269ac9; color:#269ac9;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
 a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
+.green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
+.borderRadius {border-radius:5px;}
+a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.Blue-btn{ background:#3598db; color:#fff;}
 /* commonpic */
 .pic_date{ display:block; background:url(../images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; }
 .pic_add{ display:block; background:url(../images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; }
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index e4edc8752..5c3ec3508 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -97,45 +97,6 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .captainName {max-width:65px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
 
-/* 作业二级回复 */
-.clearfix:after { content:"."; display:block; height:0; visibility:hidden; clear:both; }
-.clearfix { zoom:1; }
-.clearit { clear:both; height:0; font-size:0; overflow:hidden; }
-.comment_item{ width:720px; background-color:#f1f1f1; color:#888;}
-.comment_top{ height:15px;    border: 1px solid #e4e4e4; padding:10px; position:relative;}
-.reply_iconup{ position:absolute; top:21px; left:13px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
-.comment_item_cont{ padding:15px; border-bottom:1px solid #e3e3e3;}
-.J_Comment_Face img{ width:40px; height:40px; }
-.t_content{ width:92%; margin-left:15px;}
-a.content-username { color:#269ac9; font-size:14px; margin-right:15px;}
-a.content-username:hover{ color:#297fb8;}
-.orig_user img{width:32px; height:32px;}
-.reply-right{ float:right; position:relative;}
-.reply_iconup02{ position:absolute; top:16px; left:4px; color:#d4d4d4; font-size:16px; background:#f1f1f1; line-height:13px;}
-.comment_orig_content{margin:10px 0; color:#999;}
-.comment_orig_content .comment_orig_content{margin-top:0;}
-.orig_cont{ border:solid 1px #F3DDB3; background:#FFFEF4; padding:4px;color:#999;margin-top:-1px;}
-.orig_cont_sub{ border-top:0}
-.orig_index{ float:right; color:#666; font-family:Arial; padding-right:5px;line-height:30px;}
-.orig_user{ margin:10px 15px 10px 5px;}
-.orig_user span{ color:#999; padding-right:5px;}
-.orig_content{padding:5px 0px 5px 0px;line-height:24px; color:#333; }
-.orig_right{ width:80%; margin-top:5px;}
-a.comment_ding_link{ height:24px;line-height:24px;display:inline-block;padding-left:2px;vertical-align:middle; color:#333; }
-a:hover.comment_ding_link{ color:#269ac9;}
-.comment_ding_link span{display: inline-block;padding: 0 0px 0 8px;}
-.comment_ding_link em{font-style: normal;font-family: arial;}
-.comment_reply_link{  display:inline-block; width:50px; height:24px;line-height: 24px; vertical-align:middle;text-align: center;}
-.comment_reply_link:link,.comment_reply_link:visited{color:#333;text-decoration: none;}
-.comment_content{ color:#333;}
-.t_txt{ margin-top:10px;}
-.orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
-.orig_textarea{width:90%;  margin-bottom:10px;}
-.orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
-.orig_sub:hover{ background:#297fb8;}
-.orig_cont_hide{ text-align:center; width:624px; display:block; font-size:14px; color:#333; border-bottom:1px solid #F3DDB3; padding:8px 0;}
-.orig_icon{ color:#888; margin-right:10px; font-size:14px; font-weight:bold;}
-
 /* 创建作品 work */
 .Newwork{ width:668px;}
 .N_top{ float:right; margin-left:390px; }
@@ -195,8 +156,6 @@ a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-l
 a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .link_file_a{ display:block; max-width:450px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
 .ul_grey li {color:#909090; list-style-position:inside; padding-left:1px;list-style-image:url('../images/news_dot2.png')}
 .ul_normal_color li {list-style-position:inside; padding-left:1px; list-style-image:url('../images/news_dot.png')}
 span.author { font-size: 0.9em; color: #888; }
@@ -623,6 +582,7 @@ a:hover.comment_ding_link{ color:#269ac9;}
 .comment_content{ color:#333;}
 .t_txt{ margin-top:10px;}
 .orig_reply_box{border-top:1px solid #e3e3e3; width:95%; padding:15px 0px 15px 25px;}
+.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
 .orig_textarea{width:90%;  margin-bottom:10px;}
 .orig_sub{ float:right; background-color:#269ac9; color:#fff; height:25px; line-height:25px; text-align:center; width:80px; border:none;}
 .orig_sub:hover{ background:#297fb8;}
diff --git a/public/stylesheets/css/popup.css b/public/stylesheets/css/popup.css
index b167ca703..27faa27f1 100644
--- a/public/stylesheets/css/popup.css
+++ b/public/stylesheets/css/popup.css
@@ -207,8 +207,6 @@ a:hover.ping_sub{ background:#14a8b9;}
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
 span.author { font-size: 0.9em; color: #888; }
 
 /* 匿名评分弹框 */
@@ -348,4 +346,19 @@ a.blue-btn {padding: 4px 7px; color: #FFF; border: none; background-color: #269a
 .sectionContent span {width:160px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:20px; vertical-align:top;}
 .orgDirection {width:392px; background-color:#f1f1f1; height:30px; vertical-align:middle; line-height:30px; color:#585858; padding-left:10px;}
 .orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}
-.relatePWrap{max-height: 210px;overflow:hidden;}
\ No newline at end of file
+.relatePWrap{max-height: 210px;overflow:hidden;}
+
+/*消息弹框*/
+.shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
+.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
+.shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:400px; overflow:hidden;}
+.shadowbox_news_list a{ color:#999;}
+.shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
+.shadowbox_news_list li:hover{ background-color:#eee;}
+span.shadowbox_news_user{ color:#3b94d6;}
+a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
+
+/*20160622代码分析弹窗*/
+.analysis-option-box {width:100%; border:1px solid #ccc; padding:3px 5px;}
\ No newline at end of file
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index ff88e75fe..8c3fe68f6 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -19,7 +19,6 @@ img.date-trigger {
 .proInfoBox2 ul li{ height:24px; position:relative;}
 .pic_edit2{display:inline-block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px; vertical-align:middle; display:none;}
 .pic_edit2:hover{display:inline-block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
-.label03{ width:70px; text-align:right;    display:block; float:left;}
 .pro_info_p{color:#0781b4 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .proInfoP{color:#000000 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 
@@ -258,7 +257,7 @@ p.percent {
 .newpro_box select{ height:29px; float:left; margin-bottom:10px;}
 .label{ width:80px; text-align:right; font-size:14px; display:block; float:left;}
 .label02{ width:110px; text-align:right; font-size:14px; display:block; float:left;}
-.label03{ width:70px; text-align:right; display:block; float:left;}
+.label03{ width:70px; text-align:right; display:block; float:left; white-space: nowrap;}
 .collapsible{ border-left:none;border-right:none;border-bottom:none; border-top:1px solid #e4e4e4; padding-top:10px;  }
 .icon-reload  { background-image: url(../images/reload.png); }
 .icon {
@@ -480,4 +479,42 @@ a:hover.upload_btn02{ background:#55a1b9;}
 a.upload_btn_grey{background:#a3a3a3;}
 a:hover.upload_btn_grey{background:#8a8a8a;}
 .upload_btn{width:80px; height:26px;}
-.upload_check{ margin-top:4px;}
\ No newline at end of file
+.upload_check{ margin-top:4px;}
+.orig_reply_box2{border-top:1px solid #e3e3e3; width:95%; padding:10px 25px 10px 0;}
+
+.talk_info a{ color:#15bccf; }
+.ping_disfoot span a span{ color: #6883b6;}
+.ping_journal a{color: #136ec2;}
+
+/*20160622质量分析*/
+.analysis-tag-wrap {width:100%; color:#000; height:20px; line-height:20px; vertical-align:middle;}
+.analysis-tag {width:10px; height:20px; background-color:#777;}
+.analysis-block {padding:15px; border:1px solid #d9d9d9;}
+.flex {display:flex;}
+.analysis-genral {flex:1; display:block; text-align:center;}
+.analysis-block-icon {background:url(../images/code-analysis-icon.png) -2px -8px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-serious-icon {background:url(../images/code-analysis-icon.png) -2px -34px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-main-icon {background:url(../images/code-analysis-icon.png) -2px -59px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-secondary-icon {background:url(../images/code-analysis-icon.png) -2px -85px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.analysis-info-icon {background:url(../images/code-analysis-icon.png) -2px -111px no-repeat; width:14px; height:14px; display:inline-block; vertical-align:middle;}
+.quality-percentage {width:320px; height:14px; display:inline-block;}
+.quality-percentage-rate {width:50%; height:14px; background-color:#0a6c99; display:inline-block;}
+.image-cir {border-radius:50%;}
+.analysis-genral-icon {position:absolute; padding:1px 5px; display:inline-block; top:5px;}
+.contribute-list-avatar {width:80px; vertical-align:middle; text-align:center;}
+.contribute-list-code {width:160px; vertical-align:middle; text-align:center;}
+.contribute-list-problem {width:170px; vertical-align:middle; text-align:center;}
+.contribute-list-rate {width:228px; vertical-align:middle; text-align:center;}
+.contribute-list-height {height:80px;}
+.contribute-list-line-height {line-height:80px;}
+
+/*20160623分析结果*/
+.analysis-result-list {padding:5px;}
+.analysis-result-list:nth-of-type(odd){background:#fff;}/*奇数行*/
+.analysis-result-list:nth-of-type(even){background:#f5f5f5;}/*偶数行*/
+.analysis-result-name {width:200px; cursor:pointer;}
+.analysis-result-version {width:90px; text-align:right; cursor:pointer;}
+.analysis-result-loc {width:60px; text-align:right; cursor:pointer;}
+.analysis-result-debt {width:160px; text-align:right; cursor:pointer;}
+.analysis-result-time {width:150px; text-align:right; cursor:pointer;}
+.analysis-name-icon {background:url(../images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;}
\ No newline at end of file
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index 20e98d3de..2d3395b39 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -104,8 +104,8 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n
 /*.resourcesUploadBox {float:right; width:103px; height:34px; background-color:#64bdd9; line-height:34px; vertical-align:middle; text-align:center; margin-left:12px;}*/
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/
 
-.list_style ol li{list-style-type: decimal;margin-left: 20px;}
-.list_style ul li{list-style-type: disc;margin-left: 20px;}
+.list_style ol li{list-style-type: decimal;margin-left: 40px;}
+.list_style ul li{list-style-type: disc;margin-left: 40px;}
 
 /*20151217资源库Tim*/
 .preview {background:url(/images/hwork_icon.png) -75px -120px no-repeat; width:20px; height:20px; display:inline-block;}
@@ -270,8 +270,8 @@ a.box_close{ display:block; float:right; width:16px; height:16px; background:url
 a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 
 /*注册登陆页面*/
-#loginInBox {display:block; margin-top:143px;}
-#signUpBox {display:none; margin-top:79px;}
+#loginInBox {display:block;}
+#signUpBox {display:none;}
 #loginSignButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginSignButton:hover {background-color:#297fb8;}
@@ -328,6 +328,8 @@ a.loginChooseTab {color:#484848; height:30px; display:block;}
 .resource-list-time {width:70px; height:40px; line-height:40px; text-align:center;}
 .resource-list-quote {width:60px; height:40px; line-height:40px; text-align:center;}
 .resource-list-download {width:60px; height:40px; line-height:40px; text-align:center;}
+.resource-list-apply {width:70px; height:40px; line-height:40px; text-align:center;}
+.resource-list-middle {line-height:40px; vertical-align:middle; display:inline-block;}
 .resource-list {width:980px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px; margin-left:auto; margin-right:auto; cursor:pointer;}
 .resource-list:hover {background-color:#e1e1e1;}
 .resource-list-option {width:980px; height:40px; line-height:40px; vertical-align:middle; margin-left:auto; margin-right:auto; background-color:#f6f6f6;}
@@ -442,7 +444,10 @@ a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no
 .postDetailTitle {width:570px; max-width:570px; margin-bottom:5px;}
 .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;}
 .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;}
-.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;}
+.postDetailDes ol li{list-style-type: decimal;margin-left: 40px;}
+.postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
+.postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
+.postDetailDes a{color: #136ec2;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
 .postDetailReply { color:#888888; float:right;display: inline}
@@ -524,7 +529,7 @@ a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding
 a:hover.st_img { border:1px solid #1c9ec7; }
 
 .green_btn_share{ background:#28be6c; padding:2px 5px; -moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px; color:#fff; font-weight:normal;font-size:12px;}
-.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;}
+.apply_content{ border:1px solid #ddd;line-height: 16px; height:80px;width:420px; background:#fff; margin-bottom:10px;}
 
 /*全站搜索*/
 .blocks {padding:15px; background-color:#ffffff; border:1px solid #dddddd;}
@@ -655,7 +660,7 @@ a.un_work_edit{color: white; display:block; padding:1px 5px; background-color: d
 .users_ctt{ font-size:14px; color:#666;  margin-top:10px;}
 .setting_left{ width:115px; text-align:right; float:left;}
 .setting_left li{ height:28px;line-height:28px;}
-.setting_right{width:500px; text-align:left; float:left; margin-left:8px;}
+.setting_right{width:600px; text-align:left; float:left; margin-left:8px;}
 .setting_right li{ height:28px;line-height:28px;}
 .users_ctt ul li{ margin-bottom:10px;}
 .users_ctt input,.users_ctt select,.users_ctt textarea{ border:1px solid #CCC;}
@@ -902,8 +907,8 @@ a:hover.talk_btn{ background:#2a9dc1;}
 /****讨论区内页***/
 .talk_info{  margin-left:60px; margin-top:10px;}
 /*.issue_desc li{list-style-type: decimal;margin-left: 20px;}*/
-.issue_desc ol li{list-style-type: decimal;margin-left: 20px;}
-.issue_desc ul li{list-style-type: disc;margin-left: 20px;}
+.issue_desc ol li{list-style-type: decimal;margin-left: 40px;}
+.issue_desc ul li{list-style-type: disc;margin-left: 40px;}
 .talk_info img {max-width:100%;}
 a.talk_edit{ color:#269ac9; margin-right:5px;}
 a:hover.talk_edit{ color:#297fb8;}
@@ -989,4 +994,373 @@ a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
 .tag_h{ }
 .tag_h span,.tag_h a{ margin-bottom:5px;}
 
-.re_search{ margin-top:7px; margin-left:5px;}
\ No newline at end of file
+.re_search{ margin-top:7px; margin-left:5px;}
+
+/* 新版登录注册 */
+.new_login{
+    width:100%;
+    height:524px;
+    background-color:#3b94d6;
+}
+.new_login_con{
+    width:1000px;
+    height:524px;
+    margin:0 auto;
+    background:url(../images/login/bg_login.jpg) 0 0 no-repeat;
+}
+.new_login_box{
+    background:#FFF;
+    width:265px;
+    padding:20px 15px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    background-color: rgba(255,255,255,0.3);
+}
+.new_login_h2{
+    font-size:18px;
+    color:#fff;
+    border-bottom:1px solid #fff;
+    font-weight:normal;
+    padding-bottom:5px;
+    margin-bottom:30px;
+}
+.new_login_h2 a{
+    font-size:12px;
+    color:#fff;
+    background:url(../images/login/icons_login.png) 0 -69px no-repeat;
+    padding-left:10px;
+}
+input.new_register_input{
+    -webkit-box-shadow: 0 0 0px 1000px white inset;
+    margin-left:5px;
+    width:250px;
+    height:45px;
+    border:none;
+    outline: none;
+}
+input.new_loggin_input{
+    -webkit-box-shadow: 0 0 0px 1000px white inset;
+    outline: none;
+    width:205px;
+    height:45px;
+    border:none;
+    margin-left:50px;
+}
+.new_loggin_users{
+    width:265px;
+    height:45px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    background:#fff url(../images/login/icons_login.png) 8px 9px no-repeat;
+
+}
+.new_login_lock{
+    background:#fff url(../images/login/icons_login.png) 8px -28px no-repeat;
+    width:265px;
+    height:45px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+}
+.new_register_li{
+    background:#fff;
+    width:265px;
+    height:45px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+}
+
+.new_login_form ul li{
+    margin-bottom:20px;
+}
+.new_login_error{
+    color:#c00202;
+}
+.new_login_submit_disable{
+    width:265px;
+    height:40px;
+    line-height: 40px;
+    background:#ccc;
+    color:#fff;
+    font-size:14px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    text-align:center;
+    cursor:pointer;
+    vertical-align: middle;
+}
+.new_login_submit{
+    width:265px;
+    height:40px;
+    line-height: 40px;
+    background:#f27d0d;
+    color:#fff;
+    font-size:14px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    text-align:center;
+    cursor:pointer;
+    vertical-align: middle;
+}
+.new_login_check{
+    width:15px;
+    height:15px;
+    border:1px solid #fff;
+    border-style:none;
+    margin-right:5px;
+
+    vertical-align: -2px;
+}
+.new_login_form label{ color:#fff;}
+.new_login_form  a{ color:#fff; text-decoration:underline;}
+.new_register{
+    width:100%;
+    height:579px;
+    background-color:#3b94d6;
+}
+.new_register_con{
+    width:1000px;
+    height:580px;
+    margin:0 auto;
+    background:url(../images/login/bg_register.jpg) 0 0 no-repeat;
+}
+.new_login_txt{
+    width:282px;
+    height:140px;
+    padding:30px 12px 0;
+    color:#fff;
+    margin:235px 0 0 165px;
+}
+.new_login_txt h3{
+    font-size:18px;
+    text-align:center;
+    margin-bottom:20px;
+}
+.new_login_txt p{
+    line-height:2.0;
+}
+.new_register_left{
+    margin-top:250px;
+}
+/*未登录回复提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/* 个人资料修改弹框 */
+.winbox{
+    background-color: #fff;
+    padding: 20px;
+    width:480px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+}
+.winbox_h2{
+    font-size: 14px;
+    font-weight: normal;
+    color: #333;
+    border-bottom: 1px solid #ccc;
+    height: 28px;
+}
+.winbox_edit_new{
+    /*width: 425px;*/
+    margin: 28px 0;
+}
+.winbox_edit_new li{
+    height: 45px;
+    line-height: 30px;
+    font-size: 14px;
+}
+.winbox_edit_new label{
+    width: 80px;
+    text-align: right;
+    display: block;
+}
+.winbox_input{
+    width: 330px;
+    height: 28px;
+    border: 1px solid #ccc;
+    padding: 0 5px;
+    color: #888;
+}
+.winbox_select{
+    height: 28px;
+    border: 1px solid #ccc;
+    color: #888;
+}
+.winbox_textarea{
+    width: 330px;
+    height: 50px;
+    border: 1px solid #ccc;
+    padding: 5px;
+    color: #888;
+}
+.winbox_btn_blue{
+    padding: 5px 25px;
+    color: #fff;
+    text-align: center;
+    background-color: #3b94d6;
+    border: none;
+}
+.winbox_btn_blue:hover{
+    background-color: #2e83c2;
+}
+.icons_warning{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 2px no-repeat;
+}
+.icons_right{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 -25px no-repeat;
+}
+.icons_error{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 -52px no-repeat;
+}
+a.winbox_btn_close{
+    color: #3b94d6;
+    font-size: 18px;
+    font-weight: bold;
+}
+.winbox_p{
+    font-size: 14px;
+    text-align: center;
+}
+
+/* 邮箱验证 */
+.email_verify body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+.mt30{ margin-top:30px;}
+.ml30{ margin-left:30px;}
+.new_content{
+    width:1000px;
+    margin:10px auto;
+    padding:30px 0;
+    background-color:#fff;
+}
+.email_verify{
+    width:720px;
+    margin:0px auto;
+}
+.email_verify_prompt{
+    border:2px solid #dd0000;
+    background:#ffe3e3 url(../images/icons_prompt.png) 25px 10px no-repeat;;
+    height:35px;
+    line-height:35px;
+    padding-left:45px;
+    color:#8b0000;
+    font-size:14px;
+}
+.email_verify_btn{
+    border-style:none;
+    height:35px;
+    padding:0 15px;
+    line-height:35px;
+    color:#fff;
+    background:#3a95d7;
+    text-align:center;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    font-size:14px;
+}
+.email_verify_btn:hover{
+    background:#017bd3;
+}
+.email_sub_btn{
+    border-style:none;
+    height:30px;
+    padding:0 25px;
+    line-height:30px;
+    color:#fff;
+    background:#3a95d7;
+    text-align:center;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    font-size:14px;
+}
+.email_sub_btn:hover{
+    background:#017bd3;
+}
+.email_prompt_p{
+    font-size:14px;
+    color:#000;
+    margin-bottom:10px;
+}
+.email_prompt_txt{ width:480px;}
+.email_prompt_txt li{
+    margin-left:15px;
+    list-style-type: disc;
+    color:#777;
+    line-height:1.9;
+    font-size:14px;
+}
+.email_prompt_mes{
+    border:1px solid #ccc;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    width:468px;
+    height:60px;
+    background:#fff;
+    padding:5px;
+    margin-bottom: 5px;
+}
+.email_tanbox{
+    border:2px solid #3a95d7;
+    background:#fff;
+    width:480px;
+
+}
+.email_tancon{
+    width:420px;
+    margin:0 auto;
+    text-align:center;
+    padding:20px 30px;
+    background:#fff;
+}
+.email_tan_title{
+    font-size:18px;
+    color:#3a95d7;
+    font-weight:normal;
+    margin-bottom:5px;
+}
+.email_tan_p{
+    font-size:14px;
+    color:#4c4c4c;
+
+}
+.email_verify_p{
+    font-size:14px;
+    color:#3a95d7;
+}
\ No newline at end of file
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 6099145e5..c769d170f 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -14,7 +14,7 @@
 #TopBar{ height:60px; margin-bottom:10px; background:#fff;}
 .topbar_info02{ margin:5px 10px;width:480px;  }
 .topbar_info02 p{color: #7f7f7f;}
-.search{ margin-top:8px; margin-left:71px;}
+.search{ margin-top:8px; float:right;  margin-left:71px;}
 .search_form{margin-top:8px;margin-left:72px;}
 .topbar_info{ width:350px; color:#5c5c5c; font-size:16px; margin-right:50px; line-height:1.3; padding-left:100px;}
 a.search_btn{ display:block; background:#269ac9; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;}
@@ -94,7 +94,7 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-
 .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;}
 .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;}
 .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
-.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
+.homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {padding-left: 5px; font-size:12px; color:#888888; display:block;}
@@ -233,14 +233,15 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}
 .homepagePostSubmit:hover {background-color:#d8d8d8;}
 .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostIntro ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
+.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
+.homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
-.homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;}
 .borderBottomNone {border-bottom:none !important;}
 .topBorder {border-top: 1px solid #e4e4e4;}
 .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:15px;}
@@ -275,8 +276,10 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";}
-.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;}
-.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
+.homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 40px;}
+.homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
+.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
+.homepagePostReplyContent a{color: #136ec2;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index f8b32a701..459d050e1 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -18,14 +18,14 @@
 .orgUrlInput {width:200px; outline:none; border:1px solid #eaeaea; height:22px;}
 a.saveBtn {padding:2px 10px; background-color:#269ac9; color:#ffffff;}
 a.saveBtn:hover {background-color:#297fb8;}
-.orgMemberList {width:480px; float:left;}
+.orgMemberList {width:420px; float:left;}
 .orgColumnList {width:688px; float:left;}
 .orgListUser {width:110px; float:left;padding-right: 10px;}
 .orgListRole {width:180px; float:left;}
 .orgOrder {width:70px; float:left; text-align:center;}
 .orgSubNum {width:30px; float:left; text-align:center;}
 .subNumBlock {cursor:pointer;background-color:#fffce6;color: #0d90c3;  width:30px; height:17px; line-height:17px; margin:7px 0; vertical-align:middle;}
-.orgMemContainer {width:208px;}
+.orgMemContainer {width:268px;}
 .orgMemberAdd {float:right;}
 .orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
 .undis {display:none;}
@@ -109,7 +109,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 .shareDP {width:415px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; z-index:1000;}
 .shareArrow {background:url(../images/arrowList.png) -90px -108px no-repeat; display:inline-block; width:5px; height:10px; margin-right:3px;}
 .sectionWrap {float:left; max-height:150px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:220px; min-height:150px; padding-top:5px;}
-.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#fffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
+.columnWrap {float:left; max-height:148px; margin-bottom:10px; overflow:auto; overflow-x:hidden; width:178px; background-color:#ffffff; min-height:148px; padding-top:5px; border:1px solid #f1f1f1;}
 .columnWrap li {padding-left:10px; color:#585858;}
 .columnWrap span {width:150px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:inline-block;}
 .sectionRow:hover {background-color:#cccccc; cursor:pointer;}
@@ -178,3 +178,6 @@ a.teacher-select {font-size:13px; color:#fff; padding:3px 18px; background-color
 a.teacher-select:hover {background-color:#297fb8;}
 a.follow-button {font-size:13px; color:#272727; padding:3px 5px; background-color:#f2efef;}
 a.follow-button:hover {background-color:#c1c1c1;}
+
+/*组织未登录提示*/
+.visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}