diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb
index ed90453ac..11b1403cd 100644
--- a/app/views/forums/_show_topics.html.erb
+++ b/app/views/forums/_show_topics.html.erb
@@ -19,7 +19,7 @@
               <div class="postDetailReply fr">
                 <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>
                 <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
-                <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10 mt20" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
+                <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
               </div>
 
               <div class="postDetailDes" id = "postDetailDes_<%= topic.id %>"><%= topic.content.html_safe%>
diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb
index 8b313a2ef..7382a89b4 100644
--- a/app/views/issues/_form.html.erb
+++ b/app/views/issues/_form.html.erb
@@ -103,4 +103,4 @@
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
 <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>
-<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50" > 取消 </a>
+<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50 ml10" > 取消 </a>
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index b63897951..d975b13cd 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -57,7 +57,7 @@
               <div class="problem_search fr" >
                 <input class="problem_search_input fl" id="v_subject" type="text" name="subject" placeholder="请输入问题名称" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
                 <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
-                <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
+                <a href="javascript:void(0)" class="grey_btn fl ml10 f14" onclick="nh_reset_form();" >清空</a>
               </div><!--problem_search end-->
               <%#= link_to '新建问题', new_project_issue_path(@project) , :class => "green_u_btn fr ml10" %>
               <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.project_score.issue_num %></a>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 6a6d8c796..df30db346 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -17,7 +17,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag  'css/common','jquery/jquery-ui-1.9.2','css/public', 'css/structure','prettify', 'css/courses','css/popup'%>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup'%>
   <%= javascript_include_tag "course","header","attachments",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index cc4673fc6..a19295233 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'css/common','css/structure','scm','css/public', 'css/project','prettify','jquery/jquery-ui-1.9.2','repository' %>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','prettify','repository' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 232be1f35..7cfe65767 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -163,7 +163,7 @@
           <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
             <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
                 <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
-                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %>
                 <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
             <% end %>
             <div class="cl"></div>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index e5455bc85..9f091e866 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -179,7 +179,7 @@
           <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
             <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
                 <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
-                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %>
                 <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
             <% end %>
             <div class="cl"></div>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 164e4c326..f3ee4c0b7 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -223,7 +223,7 @@
             <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
               <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
                   <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                  <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                  <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %>
                   <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'project_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
               <% end %>
               <div class="cl"></div>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 589541c39..53ae1198d 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -1,5 +1,5 @@
-<div class="fl">
-  <div id="RSide">
+
+  <div id="RSide" style="margin-left:0px; margin-bottom:0px;">
     <div id="users_tb_" class="users_tb_">
       <ul>
         <li id="users_tb_1" class="users_hovertab" onclick="x:HoverLi(1);">基本资料</li>
@@ -197,8 +197,7 @@
       <% end %>
     </div><!--ctt end-->
 
-
-  </div><!--users_setting end-->
+<!--users_setting end-->
 
 </div>
 <div id="search_school_result_list"
diff --git a/app/views/projects/settings/_join_org.html.erb b/app/views/projects/settings/_join_org.html.erb
index 903525607..cd3fd7ff2 100644
--- a/app/views/projects/settings/_join_org.html.erb
+++ b/app/views/projects/settings/_join_org.html.erb
@@ -16,7 +16,7 @@
       <div id="search_orgs_result_list" class="ml20"></div>
       <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
         <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mb5" onclick="join_org(<%= @project.id %>);">关联</a>
-      <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
+      <a href="javascript:void(0);" class="grey_btn db fl" onclick="cancel_join_orgs();">取消</a>
       <% end %>
     </div>
     <div class="relatedList fr">
diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb
index 557025eaa..7c4338e3b 100644
--- a/app/views/projects/settings/_new_versions.html.erb
+++ b/app/views/projects/settings/_new_versions.html.erb
@@ -22,8 +22,8 @@
     <td class="tl">
       <a class="c_blue02"><%= 'shared' if version.project != @project %> <%= link_to_version version %></a>
     </td>
-    <td class="description"><%= format_date(version.effective_date) %></td>
-    <td class="description tl" style="word-break:break-all;"><%=h version.description %></td>
+    <td class=""><%= format_date(version.effective_date) %></td>
+    <td class="tl" style="word-break:break-all;"><%=h version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
     <!--<td class="sharing"><%#=h format_version_sharing(version.sharing) %></td>-->
     <!--<td class="tl" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"  title="">-->
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 30c15c03d..39d8a9847 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -11,7 +11,7 @@
     <div class="NewsBannerName">项目动态</div>
     <ul class="resourcesSelect" class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-        <ul class="homepagePostType">
+        <ul class="homepagePostType2">
           <li>
             <ul class="homepagePostTypeHomework fl">
               <li><%= link_to "全部动态", {:controller => "projects", :action => "show", :type => nil}, :class => "homepagePostTypeAll postTypeGrey" %></li>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 63b03e5dd..b96d52f1b 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -7,7 +7,7 @@
 
     }
 </script>
-  <div class="courses_box" id="RSide">
+  <div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0;">
     <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
       <% if @action == 'fans' %>
         <h2 class="courses_h2 fl">粉丝</h2>
diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 0b71fa5e2..e15df5dfa 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -21,7 +21,7 @@
 
 
 <% if @versions.empty? %>
-      <p class="nodata"><%= l(:label_no_data) %></p>
+      <p class="nodata mt10"><%= l(:label_no_data) %></p>
 <% else %>
       <% @versions.each do |version| %>
 
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
index c58f42dea..4d100e9d7 100644
--- a/app/views/wiki/show.html.erb
+++ b/app/views/wiki/show.html.erb
@@ -52,7 +52,7 @@
 <% if @editable && authorize_for('wiki', 'add_attachment') %>
 
     <div class=" mb10">
-      <%= link_to l(:label_upload_files), {}, :onclick => "$('#add_attachment_form').show(); return false;",
+      <%= link_to l(:label_upload_source), {}, :onclick => "$('#add_attachment_form').show(); return false;",
                        :id => 'attach_files_link',
                        :class => "blue_u_btn fl mr10" %>
       <%= form_tag({:controller => 'wiki', :action => 'add_attachment',
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index fb78f320d..974f81da6 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -23,13 +23,12 @@ blockquote {
 a:link,a:visited{color:#7f7f7f;text-decoration:none;}
 a:hover,a:active{color:#000;}
 a:hover {text-decoration: none;  }
-select,input,textarea{ border:1px solid #dddddd; background:#fff; color:#000; padding-left:5px}
+select,input,textarea{border:1px solid #ddd; background:#fff; color:#000; padding-left:5px}
 textarea {resize: none;}
 .pInline {margin:0px; padding:0px; display:inline-block;}
 div.minHeight48{min-height: 48px;}
 
 /*常用*/
-/*#RSide{ background:#fff;}*/
 #users_setting{clear:both;width:728px;background: #fff;padding: 10px;/*滑动门的宽度*/}
 /*上传图片处理*/
 .upload_img img{max-width: 100%;}
@@ -37,7 +36,6 @@ blockquote img{max-width: 100%;}
 
 .none{display: none;}
 .rside_back{ width:670px;  margin-left:10px;  background:#fff;  margin-bottom:10px;}
-select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; }
 .sub_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #707070; color:#000;  border-radius:3px; padding:1px 10px;  background:#dbdbdb;}
 .sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;}
 table{ background:#fff;}
@@ -430,9 +428,9 @@ a.bBlue {background-color:#3498db;}
 a.bBlue:hover {background-color:#297fb8;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
 a.submit_btn:hover {background-color:#3498db; color:#ffffff;}
-a.link_file_a{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
-a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
-a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
+a.link_file_a{ background:url(/images/pic_file.png) 0 2px no-repeat; padding-left:20px; }
+a:hover.link_file_a{ background:url(/images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
+a.link_file_a2{ background:url(/images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
 a.submit_btn2 {background-color: #269ac9; padding: 3px 5px; color: #ffffff;}
 a.submit_btn2:hover {background-color:  #297fb8;}
 
@@ -548,14 +546,14 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;}
 .pic_sch{ display:block; background:url(../images/public_icon.png) -31px -195px no-repeat; width:16px; height:15px; }
 .pic_mes{ display:block; background:url(../images/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;}
 .pic_img{ display:block; background:url(../images/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; }
-.pic_del{ display:block; background:url(../images/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; }
-.pic_del:hover{  background:url(../images/public_icon.png) -32px -235px no-repeat; }
+.pic_del{ display:block; background:url(/images/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; }
+.pic_del:hover{  background:url(/images/public_icon.png) -32px -235px no-repeat; }
 .pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
 .pic_files{display:block; background:url(../images/public_icon.png) 0px -578px no-repeat; width:20px; height:15px;}
 .pic_text{display:block; background:url(../images/public_icon.png) 0px -609px no-repeat; width:20px; height:18px;}
 .pic_text02{display:block; background:url(../images/public_icon.png) 0px -642px no-repeat; width:20px; height:19px;}
-.pic_edit{display:block; background:url(../images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px;}
-.pic_edit:hover{display:block; background:url(../images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
+.pic_edit{display:block; background:url(/images/public_icon.png) 0px -32px no-repeat; width:20px; height:15px;}
+.pic_edit:hover{display:block; background:url(/images/public_icon.png) -32px -32px no-repeat; width:20px; height:15px;}
 .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;}
 
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index b1aa37347..3caf26e10 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -85,7 +85,6 @@ a:hover.memberBtn{background: url(/images/course/hwork_icon.png) -80px -90px no-
 .addMemberC li:hover {cursor:pointer; background-color:#cccccc;}
 .addMemberCP {width:514px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:fixed !important;left:50%;top:50%;margin:-100px 0 0 -150px;  -moz-border-radius:5px;}
 .rightArrow {margin:50px 15px 0px 15px; float:left;}
-.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
 .resubAtt {border-top:1px solid #dddddd; position:relative; margin-top:15px;}
 .resubTitle {position:absolute; top:-10px; left:5px; background-color:#ffffff; display:block; font-weight:bold; padding:0px 2px;}
 a.blueCir{ display:inline-block; padding:2px 5px; background-color:#ffffff;border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
@@ -547,44 +546,4 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .courseR {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
 
 /*20160310分班样式*/
-.select-class-option {width:125px;}
-
-/* 作业二级回复 */
-.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_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;}
-.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;}
\ No newline at end of file
+.select-class-option {width:125px;}
\ No newline at end of file
diff --git a/public/stylesheets/css/org.css b/public/stylesheets/css/org.css
index ab652a8b3..1e8105a0e 100644
--- a/public/stylesheets/css/org.css
+++ b/public/stylesheets/css/org.css
@@ -57,7 +57,6 @@ a.org-cancel-btn:hover {background-color:#717171; color:#ffffff;}
 
 /*关联项目弹窗*/
 .projectRelate {float:left; max-height:118px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden; width:288px;}
-.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
 
 /*组织首页新151204Tim*/
 .orgNav {width:1000px; height:30px; background-color:#cfcfcf; margin:0 auto;}
diff --git a/public/stylesheets/css/popup.css b/public/stylesheets/css/popup.css
index 581402a2b..74ab98097 100644
--- a/public/stylesheets/css/popup.css
+++ b/public/stylesheets/css/popup.css
@@ -237,7 +237,7 @@ a.exit { height:24px; display:block; width:80px; color:#000000; background:#c3c3
 .lh22{ line-height: 22px;}
 
 /*上传资源弹出框样式*/
-.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;/*margin:-100px 0 0 -150px;*/  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
 .upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
 .upload_box{ width:430px; margin:15px auto;}
 
@@ -252,9 +252,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col
 #attachments_fields input.description {margin-left: 4px;width: 100px;}
 #attachments_fields span .boldSpan{display:block; white-space:nowrap; font-family:'微软雅黑';}
 #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
-a.remove-upload:hover {text-decoration:none !important;}
 #attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
 #attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px; white-space: nowrap; }
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 #attachments_fields span {display: block;white-space: nowrap;}
@@ -265,7 +263,7 @@ span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .reply_btn:hover{ background:#999; color:#fff; }
 .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
 .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
-.upload_filename{ background: url(../images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+.upload_filename{ background: url(/images/pic_file.png) 0 -22px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 
 #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
 
@@ -276,7 +274,7 @@ a.remove-upload:hover {text-decoration:none !important;}
 .attachments_fields input.is_public_checkbox {width:20px;}
 
 .attachments_fields span.ispublic-label {display: inline-block;width: 30px;margin-left: 10px;}
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
+a.remove-upload {background: url(/images/delete.png) no-repeat 1px 50%;width: 1px;display: inline-block;padding-left: 16px;margin-left: 5px;}
 .attachments_fields input.filename {border: 0;height: 1.8em;color: #555;background-color: inherit;background: url(../images/attachment.png) no-repeat 1px ;padding-left: 18px;padding-top: 2px;}
 span.add_attachment {font-size: 80%;line-height: 2.5em;}
 .attachments_fields span {display: block;white-space: nowrap;}
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index f3994f896..396957732 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -6,7 +6,7 @@
 
 /*主内容左右分栏*/
 #LSide{ width:240px;}
-#RSide{ width:728px; background:#fff; padding:10px;}
+#RSide{ width:728px; background:#fff; padding:10px; margin-left: 10px; margin-bottom:10px;}
 
 /*资源库*/
 .resources {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;float: right}
@@ -481,13 +481,14 @@ a.postRouteLink:hover {text-decoration:underline;}
 /*日历选择图*/
 img.ui-datepicker-trigger {
     display:block;
-    background:url(../images/public_icon.png) -31px 0 no-repeat;
+    background:url(/images/public_icon.png) -31px 0 no-repeat;
     cursor: pointer;
     vertical-align: middle;
     width:16px;
     height:15px;
     float:left;
-    margin: 7px;
+    margin-left:5px;
+    margin-top:5px;
 }
 
 /****翻页***/
@@ -1255,9 +1256,7 @@ a.winbox_btn_close{
 }
 
 /* 邮箱验证 */
-.email_verify body,h1,h2,h3,h4,h5,h6,hr,p,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;}
+/*.email_verify body,h1,h2,h3,h4,h5,h6,hr,p,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}*/
 .new_content{
     width:1000px;
     margin:10px auto;
@@ -1363,4 +1362,46 @@ a.winbox_btn_close{
 .email_verify_p{
     font-size:14px;
     color:#3a95d7;
-}
\ No newline at end of file
+}
+
+/* 作业二级回复 */
+.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_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;}
+.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;}
+
+.relateText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight: bold;}
\ No newline at end of file
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 1d3f87e2e..f4b92c6d8 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -131,7 +131,7 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-
 .ajax-waiting input.upload_filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
 .ajax-loading input.upload_filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
 div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
-.upload_filename{ background: url(../images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
+.upload_filename{ background: url(/images/pic_file.png) 0 -25px no-repeat;color: #7f7f7f;width: 270px;border: none; padding-left: 20px;margin-right: 10px;margin-bottom: 5px; white-space: nowrap; text-overflow:ellipsis;}
 .message_title{border: 1px solid #9C9C9C;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff; max-width:400px;word-wrap:break-word; word-break:break-all;}
 .message_title_red{border: 1px solid #484848;padding: 0.6em;margin-left: 1.4em;margin-right: 0.4em;border-radius: 4px;font-family: "Microsoft YaHei";background-size: 100% 100%;margin-bottom: 5px;background-color: #fff;background-image: -moz-linear-gradient(top, #fff, #E0E0E0);}
 
@@ -186,6 +186,7 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;}
 
 /*个人主页右部分*/
 .homepagePostType {width:180px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-170px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
+.homepagePostType2 {width:90px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-80px; font-size:12px; color:#4b4b4b; line-height:2; z-index:9999; display:none;}
 .homepagePostTypeHomework {width:100px;}
 .homepagePostTypeProject {width:80px;}
 a.homepagePostTypeAssignment {background:url(../images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}