diff --git a/app/views/attachments/_show_attachment_history.html.erb b/app/views/attachments/_show_attachment_history.html.erb
index 6e2994a8d..61ccef344 100644
--- a/app/views/attachments/_show_attachment_history.html.erb
+++ b/app/views/attachments/_show_attachment_history.html.erb
@@ -1,7 +1,7 @@
 <!--<div class="resourceUploadPopup">-->
 <span class="uploadDialogText">更新资源版本</span>
 <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-<div class="uploadBoxContainer mt0">
+<div>
   <div>
     <div>当前版本
             <span class="attachment" >
@@ -39,19 +39,19 @@
         <!--<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%#= l(:button_cancel)%></a>-->
         <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
       </div>
+      <div class="W300 uploadResourceIntr fontGrey2">
+        <span id="upload_file_count" class="mr15">(未选择文件)</span>
+        <span>您可以上传小于<span class="c_red">50MB</span>的文件</span>
+      </div>
       <div class="cl"></div>
       <div class="mb5 mt5">
-        <label class="fl c_dark f14" style="line-height:30px;">描述：</label>
+        <p class="c_dark f14" style="line-height:30px;">描述：</p>
         <div class="fl">
-          <input  type="text" name="description" class="InputBox fl W160" value="<%= @attachment.description %>">
+          <textarea style="resize:none"  type="text" placeholder="请编辑资源描述" name="description" class="InputBox fl H60 W420" ><%= @attachment.description %></textarea>
         </div>
         <div class="cl"></div>
       </div>
       <div class="cl"></div>
-      <div class="uploadResourceIntr">
-        <div class="uploadResourceName fl"><span id="upload_file_count">(未选择文件)</span></div>
-        <div class="uploadResourceIntr2 fl">您可以上传小于<span class="c_red">50MB</span>的文件</div>
-      </div>
       </div>
       <div class="cl"></div>
       <div style="margin-top: 10px" >
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 2b0dce4fa..1bbdc0e93 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/app/views/files/_org_subfield_list.html.erb
@@ -43,15 +43,12 @@
                   <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                   </div>
-                  <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
-                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container.organization,file)%>','<%= file.id %>');"><%= file.description %></textarea>
+                  <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                            onblur="edit_file_description('<%= update_file_description_org_subfield_file_path(file.container,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                 </div>
             <% else %>
                 <div class="fontGrey2 mb4">
-                  <% unless file.description.blank? %>
-                      <div class="cl"></div>
-                      <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                  <% end %>
+                    资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
                 </div>
             <% end %>
 
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index b8b38f7b9..4d3645a33 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -48,15 +48,12 @@
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                 <%= render :partial => 'files/file_description', :locals => {:file => file} %>
               </div>
-              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                         onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
             </div>
         <% else %>
             <div class="fontGrey2 mb4">
-              <% unless file.description.blank? %>
-                  <div class="cl"></div>
-                  <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-              <% end %>
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
             </div>
         <% end %>
         <div class="tag_h">
diff --git a/app/views/files/_project_list.html.erb b/app/views/files/_project_list.html.erb
index 48fb4c86f..36dc80a18 100644
--- a/app/views/files/_project_list.html.erb
+++ b/app/views/files/_project_list.html.erb
@@ -40,16 +40,13 @@
                     <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                       <%= render :partial => 'files/file_description', :locals => {:file => file} %>
                     </div>
-                    <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+                    <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                               onblur="edit_file_description('<%= update_file_description_project_file_path(project,file)%>','<%= file.id %>');"><%= file.description %></textarea>
                   </div>
               <% else %>
-                  <div class="fontGrey2 mb4">
-                    <% unless file.description.blank? %>
-                        <div class="cl"></div>
-                        <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                    <% end %>
-                  </div>
+                    <div class="fontGrey2 mb4">
+                        资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
+                    </div>
               <% end %>
               <div class="tag_h">
                 <!-- container_type = 1 代表是课程里的资源 -->
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index 8aedc3c03..0edf22e58 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -42,15 +42,12 @@
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
               </div>
-              <textarea class="homepageSignatureTextarea none" placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
+              <textarea style="resize: none;max-width: none;margin-left: 0" class="homepageSignatureTextarea W600 none " placeholder="请编辑资源描述" id="file_description_edit_<%= file.id %>"
                         onblur="edit_file_description('<%= update_file_description_course_file_path(@course,file)%>','<%= file.id %>');"><%= file.description %></textarea>
             </div>
           <% else %>
             <div class="fontGrey2 mb4">
-                <% unless file.description.blank? %>
-                    <div class="cl"></div>
-                    <div class="fontGrey2 mb4">资源描述：<%= file.description %></div>
-                <% end %>
+                资源描述：<% if file.description.blank? %><span style="color:#C5C5BE;">未添加</span><% else %><%= file.description %><% end %>
             </div>
           <% end %>
       <%# end %>
diff --git a/app/views/organizations/_org_custom_left1.html.erb b/app/views/organizations/_org_custom_left1.html.erb
index ee88f3315..8632dd57a 100644
--- a/app/views/organizations/_org_custom_left1.html.erb
+++ b/app/views/organizations/_org_custom_left1.html.erb
@@ -66,7 +66,7 @@
                 <% else %>
                     <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(document.content)}", :width => "299", :height => "246"), org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :target => "_blank" %>
                 <% end %>
-                <div style="background: #f8fafb;">
+                <div style="background: #f8fafb; padding:3px 5px">
                   <%= link_to document.title, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => document.title %>
                   <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(document.created_at) %></span><%= link_to document.creator.show_name, user_path(document.creator), :class => "por_hot_name link-blue", :target => "_blank" %></p>
                   <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => document.id, :content=> document.content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
@@ -85,9 +85,11 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_url_in_org(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        <div style="background: #f8fafb; padding:3px 5px">
+                          <%= link_to title, board_message_url_in_org(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        </div>
                       </div>
                   <% else %>
                       <div class="por_hotbar_right fl">
@@ -96,9 +98,11 @@
                         <% else %>
                             <%= link_to image_tag("/files/uploads/image#{get_image_path_from_content(content)}", :width => "299", :height => "246"), board_message_path(message.board.id, message.id), :target => "_blank" %>
                         <% end %>
-                        <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
-                        <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                        <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        <div style="background: #f8fafb; padding:3px 5px">
+                          <%= link_to title, board_message_path(message.board.id, message.id), :class => 'por_hot_title_r link-black', :target => "_blank", :title => title %>
+                          <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(message.created_on) %></span><%= link_to message.author.show_name, user_path(message.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                          <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => message.id, :content=> content, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                        </div>
                       </div>
                   <% end %>
               <% end %>
@@ -111,9 +115,11 @@
                     <% else %>
                         <%= link_to image_tag("/files/uploads/image#{path}", :width => "299", :height => "246"), news_path(news), :target => "_blank" %>
                     <% end %>
-                    <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
-                    <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
-                    <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                    <div style="background: #f8fafb; padding:3px 5px">
+                      <%= link_to news.title, news_path(news), :class => 'por_hot_title_r link-black', :target => "_blank", :title => news.title %>
+                      <p class="mt5 mb5"><span class="por_time mr10"><%= time_from_now(news.created_on) %></span><%= link_to news.author.show_name, user_path(news.author), :class => "por_hot_name link-blue", :target => "_blank" %></p>
+                      <%=render :partial =>"organizations/organization_content_extension", :locals => {:user_activity_id => news.id, :content=> news.description, :maxheight => 80, :maxwordsnum => 90, :maxwidth => 0, :cl => "por_hot_txt_r"} %>
+                    </div>
                   </div>
               <% end %>
           <% end %>
@@ -121,4 +127,8 @@
 
   <%# end %>
   <div class="cl"></div>
-</div><!--por_hotbar end-->
\ No newline at end of file
+</div><!--por_hotbar end-->
+
+<script>
+  $(".por_hotbar_left li:last").css("borderBottom","none");
+</script>
\ No newline at end of file
diff --git a/app/views/organizations/_org_custom_left3.html.erb b/app/views/organizations/_org_custom_left3.html.erb
index fb2b83dd2..ff412d869 100644
--- a/app/views/organizations/_org_custom_left3.html.erb
+++ b/app/views/organizations/_org_custom_left3.html.erb
@@ -71,7 +71,7 @@
               <% end %>
           <% end %>
         </div>
-        <% unless acts[1..4].nil? %>
+        <% unless acts[1..4].blank? %>
             <% acts[1..4].each do |activity| %>
                 <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                     <% document = activity.org_act %>
@@ -110,10 +110,10 @@
             <% end %>
         <% end %>
       </div>
-      <% unless acts[5..16].nil? %>
+      <% unless acts[5..16].blank? %>
           <div class="fl">
             <ul class="por_post_right por_post_list">
-              <% acts[6..16].each do |activity| %>
+              <% acts[5..16].each do |activity| %>
                   <% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
                       <% document = activity.org_act %>
                       <li><%= link_to "<span class='post_icons_grey fl'></span>#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %></li>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index 23090265c..a7034ffc7 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -1,23 +1,23 @@
-<div class="orig_reply_box borderBottomNone" id="reply_to_message_<%= reply.id%>">
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
-  <div class="orig_textarea mb10 fl">
-    <% if User.current.logged? %>
-        <div nhname='new_message_<%= reply.id%>'>
-          <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
-              <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
-              <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
-              <input type="hidden" name="course_activity" value=<%=@course_activity %>>
-              <input type="hidden" name="reply[subject]" id="reply_subject">
-              <div nhname='toolbar_container_<%= reply.id%>'></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
-              <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
-              <div class="cl"></div>
-              <p nhname='contentmsg_<%= reply.id%>'></p>
-          <% end%>
-        </div>
-    <% else %>
-        <%= render :partial => "users/show_unlogged" %>
-    <% end %>
+<div class="<%= User.current.logged? ? 'orig_reply_box' : 'orig_reply_box2' %> borderBottomNone" id="reply_to_message_<%= reply.id%>">
+  <% if User.current.logged? %>
+      <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= reply.id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %></div>
+      <div class="orig_textarea mb10 fl">
+      <div nhname='new_message_<%= reply.id%>'>
+      <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
+          <input type="hidden" name="is_in_course" value=<%=@is_in_course %>>
+          <input type="hidden" name="user_activity_id" value=<%=@user_activity_id %>>
+          <input type="hidden" name="course_activity" value=<%=@course_activity %>>
+          <input type="hidden" name="reply[subject]" id="reply_subject">
+          <div nhname='toolbar_container_<%= reply.id%>'></div>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="reply_message"></textarea>
+          <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+          <div class="cl"></div>
+          <p nhname='contentmsg_<%= reply.id%>'></p>
+      <% end%>
+      </div>
+  <% else %>
+    <%= render :partial => "users/show_unlogged_reply" %>
+  <% end %>
     <div class="cl"></div>
   </div>
   <div class="cl"></div>
diff --git a/app/views/users/_show_unlogged_reply.html.erb b/app/views/users/_show_unlogged_reply.html.erb
new file mode 100644
index 000000000..b428fd249
--- /dev/null
+++ b/app/views/users/_show_unlogged_reply.html.erb
@@ -0,0 +1,4 @@
+<div class="visitor-box fontGrey2 mt10">
+  <a href='<%= signin_url_without_domain %>' class='linkBlue' target='_Blank' >登录</a>后可添加回复
+  <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
+</div>
\ No newline at end of file
diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js
index 97d5e33c5..479b1101a 100644
--- a/public/assets/kindeditor/pasteimg.js
+++ b/public/assets/kindeditor/pasteimg.js
@@ -327,28 +327,28 @@ function enablePasteImg(_editor) {
     };
 
     $(nodeBody).on('pasteImage', function(ev, data) {
-        console.log('pasteImage');
-        console.log("dataURL: " + data.dataURL);
-        console.log("width: " + data.width);
-        console.log("height: " + data.height);
-        var blob = dataURItoBlob(data.dataURL);
-        if (data.blob !== null) {
-            var data = new FormData();
-            data.append("imgFile",blob, "imageFilename.png");
-            console.log(data);
-            $.ajax({
-                url: '/kindeditor/upload?dir=image',
-                contentType: false,
-                type: 'POST',
-                data: data,
-                processData: false,
-                success: function(data) {
-                    console.log(data);
-                    editor.exec('insertimage', JSON.parse(data).url);
-                }
-            });
-        }
-
+        //粘贴图片时走这里会出现两张图片走df()即可
+//        console.log('pasteImage');
+//        console.log("dataURL: " + data.dataURL);
+//        console.log("width: " + data.width);
+//        console.log("height: " + data.height);
+//        var blob = dataURItoBlob(data.dataURL);
+//        if (data.blob !== null) {
+//            var data = new FormData();
+//            data.append("imgFile",blob, "imageFilename.png");
+//            console.log(data);
+//            $.ajax({
+//                url: '/kindeditor/upload?dir=image',
+//                contentType: false,
+//                type: 'POST',
+//                data: data,
+//                processData: false,
+//                success: function(data) {
+//                    console.log(data);
+//                    editor.exec('insertimage', JSON.parse(data).url);
+//                }
+//            });
+//        }
     });
     return;
 };
@@ -371,7 +371,8 @@ function df(myself) {
                     sstr += that.attr("src") + "|";
             }
             else if (that.attr("src").indexOf("data:image") >= 0){
-                that.parents().removeAttr("href"); //删除所有父节点的href
+                //去掉外链
+//                that.parents().removeAttr("href"); //删除所有父节点的href
             }
         }
     });
@@ -421,10 +422,10 @@ function uploadpic(piclist,myself) {
 
                             //复制过来带的链接class等都要去掉 和视频图片有关系
                             that.removeAttr("class");
-                            that.parent().removeAttr("class");
-                            that.parents().removeAttr("href"); //删除所有父节点的href
-//                            that.parent().removeAttr("href");
-                            that.parent().removeAttr("data-ke-src");
+                            //去掉外链
+//                            that.parent().removeAttr("class");
+//                            that.parents().removeAttr("href"); //删除所有父节点的href
+//                            that.parent().removeAttr("data-ke-src");
                             tIndex = tIndex + 1;
                         }
                     }
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 785fb2ba3..ed99217b8 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1372,6 +1372,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;}
@@ -1420,3 +1421,9 @@ a.pages-big{ width:50px;}
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 6812faf34..7fad9854f 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1553,6 +1553,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;}
@@ -1796,3 +1797,9 @@ input.new_loggin_input{
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
diff --git a/public/stylesheets/org_custom.css b/public/stylesheets/org_custom.css
index 95df98738..5ff340272 100644
--- a/public/stylesheets/org_custom.css
+++ b/public/stylesheets/org_custom.css
@@ -25,31 +25,31 @@ a.por_edit_index{ position:absolute; font-size:14px; right:5px; top:15px;}
 .por_h2_index{ font-size:18px; font-weight:normal; color:#3b94d6; width:100%; border-bottom:1px solid #e8e5e5; height:40px; line-height:40px;}
 a.por_more_index{ font-size:12px; color:#999; }
 .por_hotbar_left li{ width:365px; padding:12px 5px 12px 0; border-bottom:1px dashed #e8e5e5;}
-a.por_hot_title{ font-size:16px; display:block; font-weight:bold; width:365px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.por_hot_txt{ color:#666; line-height:20px;max-height:60px;overflow:hidden;text-overflow:ellipsis;}
+a.por_hot_title{ font-size:16px; display:block; width:365px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color: #02253f;}
+.por_hot_txt{ color:#637379; line-height:20px;max-height:60px;overflow:hidden;text-overflow:ellipsis;}
 .por_time{ color:#999;}
 a.por_hot_name{color:#3b94d6;}
 .por_hotbar_right{  padding:5px 0 5px 10px; margin-top:15px; width:300px; }
 .por_hotbar_right img{ width:300px; height:246px;}
-.por_hot_title_r{ font-size:16px; display:block; font-weight:bold; width:300px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_hot_title_r{ font-size:16px; display:block; width:300px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color: #02253f;}
 .por_hot_txt_r{color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
 .por_course{ }
 .por_course_bar{ width:328px; margin:0 7px; padding:20px 0 0px;}
-a.por_course_title{font-size:14px; margin-bottom:10px; display:block; font-weight:bold; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_course_title{font-size:16px; margin-bottom:10px; display:block; width:328px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color: #02253f;}
 .por_course_bar img{ width:140px; height:100px; }
-.por_course_txt { width:180px; margin-left:5px;color:#666; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
+.por_course_txt { width:180px; margin-left:5px;color:#637379; line-height:20px;max-height:80px;overflow:hidden;text-overflow:ellipsis;}
 .por_course_time{color:#3b94d6; margin-left:5px;}
 .por_post{  padding-bottom:5px;}
-.por_post_left{ width:394px; margin-top:15px;}
+.por_post_left{ width:385px; margin-top:15px; margin-right: 9px;}
 .por_post_leftbar img{ width:377px; height:163px;}
 .por_post_leftbar { border-bottom:1px dashed #e8e5e5; padding-bottom:5px; margin-bottom:10px;}
-a.por_post_title{font-size:18px; display:block;  width:377px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-.por_post_txt{color:#666; line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis;  }
+a.por_post_title{font-size:18px; display:block;  width:377px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
+.por_post_txt{color:#637379; line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-bottom: 5px;}
 .post_icons_grey{ width:4px; height:4px; margin:10px 5px 0 0; background-color:#b3b3b3; display:block; line-height:20px;}
 .por_post_list li{  height:35px;}
 .por_post_list li a{ font-size:14px; }
-a.por_hidden_w390{ display:block; width:390px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
-a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_hidden_w390{ display:block; width:390px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
+a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
 .por_post_right{ width:280px; border-left:1px solid #e8e5e5; margin-top:15px; padding-left:10px;}
 .por_news_list li{ padding:15px 0; border-bottom:1px dashed #e8e5e5;}
 .por_users_img{ width:40px; height:40px;  -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
@@ -57,11 +57,11 @@ a.por_hidden_w270{ display:block; width:280px; overflow:hidden; white-space: now
 .por_news_p{ line-height:20px;max-height:40px;min-width:240px;overflow:hidden;text-overflow:ellipsis;  }
 a.por_zan{ background:url(../images/org_custom/icons_por.png) 0 -41px no-repeat; height:15px; width:20px; display:block; padding-left:15px; line-height:20px; color:#999;}
 a.por_zan:hover{background:url(../images/org_custom/icons_por.png) -34px -42px no-repeat; color:#3b94d6; }
-.por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.por_hidden_w205{ font-size:14px; display:block; width:205px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
 .por_projects{ padding-bottom:10px; margin-top:10px;}
 .por_projects ul li{ padding:5px 0;}
 .por_projects ul{ margin-top:5px;}
-.por_project_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-top:5px; margin-left:10px; color:#666;  }
+.por_project_p{ line-height:20px;max-height:40px;overflow:hidden;text-overflow:ellipsis; margin-top:5px; margin-left:10px; color:#637379; margin-bottom: 5px;}
 .por_project_li{border-bottom:1px dashed #ccc; padding-bottom:10px; margin-bottom:5px;}
 .por_time a{ color:#3b94d6;}
 .por_teachers{ margin-top:20px; }
@@ -78,7 +78,7 @@ a.por_more_teacher{ font-size:12px; }
 .por_teachers_li{ margin-top:10px;}
 .por_teachers_li li{ padding:10px 0;}
 .por_teachers_img{ width:60px; height:60px; -webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
-a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+a.por_teachers_name{ display:block; width:75px; font-size:18px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; color: #02253f;}
 .por_teachers_p{ font-size:14px; color:#999; width:150px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 .por_teachers_span{ color:#999;}
 .por_teachers_span a{ margin:0 5px; color:#999;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index ac65d34c2..d8b8cc74a 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1249,3 +1249,9 @@ a.pages-big{ width:50px;}
 
 /*未登录回复提示*/
 .visitor-box {width:620px; height:33px; line-height:33px; text-align:center; vertical-align: middle; border:1px solid #ccc; background-color: #fff;}
+
+/*更新资源文件的描述框*/
+.H60 {height:60px !important;}
+.W420 {width:420px;}
+.W300 {width:300px !important;}
+.W600{ width:600px;}
\ No newline at end of file