From 1ec010038694f521bc4971a2b70ac04082fd7cc3 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 11 Nov 2016 17:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=80=E4=BB=8B=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C=E5=B9=B6=E4=B8=94=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E7=BD=91=E9=A1=B5=E8=83=BD=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/show.html.erb   | 13 +++++++++----
 public/stylesheets/css/project.css |  4 ++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index b32ec6a3a..f9a88baf8 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -1,11 +1,13 @@
 <!--新版项目头部结束-->
-<div class="pro_new_info mb10 break_word">
+<div class="pro_new_info mb10 break_word" style="padding-bottom: 5px" >
  <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
+  <div id="project_description_code" >
   <% if @project.description.blank? %>
-      <p class="break_word"><%= @project.name %></p>
+      <p class="break_word"  style="padding-top:5px"><%= @project.name %></p>
   <% else %>
-      <p class="break_word"><%=h @project.description.html_safe %></p>
+      <p class="break_word" style="padding-top:5px"><%=h @project.description.html_safe %></p>
   <% end %>
+  </div>
 </div>
 
 <input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
@@ -34,4 +36,7 @@
   </div>
 
   <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
-</div>
\ No newline at end of file
+</div>
+<script>
+ autoUrl('project_description_code');
+</script>
\ No newline at end of file
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 667c91863..ead88aef7 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -887,7 +887,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
 /*项目简介*/
 .pro_new_info{ border:1px solid #ddd; background-color:#fff;  width: 998px;}
 .pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;}
-.pro_new_info p{ padding-bottom:2px; padding-left: 5px; color: #666; padding-right: 5px}
+.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}
 .pro_new_info_weight{ font-size: 16px; font-weight: bold;}
 /* 新版项目配置*/
 .pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;}
@@ -1030,4 +1030,4 @@ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; co
 a.pro_new_users { max-width:80px; overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; word-break:break-all; display: inline-block;  font-weight: bold; color: #666;}
 a:hover.pro_new_users {color: #3b94d6}
 .pro_new_users img{ width:40px;height:40px; border: 3px solid #fff;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
-.pro_new_users img:hover{border: 3px solid #e6e6e6;}
+.pro_new_users img:hover{border: 3px solid #e6e6e6;}