From c8f7655d1e0ca194da5c1ddadae0d535b162f58e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 18 Sep 2015 17:01:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_projects.html.erb | 15 ---------------
 app/views/users/user_messages.html.erb   |  8 ++++++--
 public/stylesheets/application.css       |  2 +-
 public/stylesheets/new_user.css          |  3 ++-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 7cd3fcfef..b7b88c186 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -36,21 +36,6 @@
   <%#= render :partial => 'layouts/new_header'%>
   <div class="cl"></div>
 
-  <!--TopBar begin-->
-  <div id="TopBar">
-    <div class="topbar_info02 fl">
-      <h2>
-        <a href="http://<%= Setting.host_name %>" target="_blank" class="c_blue">
-          <%= l(:label_projects_community) %>
-        </a>
-      </h2>
-      <p class="hidden">
-        <%= l(:label_user_location) %> :
-        <%= link_to l(:field_homepage), home_path %> > <a href="http://<%= Setting.host_name %>"><%=l(:label_project_hosting_platform) %> </a>><%= link_to @project.name, project_path(@project.id) %>
-      </p>
-    </div>
-  </div><!--TopBar end-->
-
   <div id="content">
     <div id="LSide" class="fl">
       <div class="project_info">
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index fef94f67a..831c589cd 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -62,9 +62,13 @@
             </li>
               <div style="display:none;" class="message_title_red system_message_style">
                 <% unless usm.subject.nil? %>
-                  <p>标题：<%= usm.subject %></p>
+                    <p><strong>标题：</strong></span><%= usm.subject %></p>
+                <% end %>
+                <% if usm.description.nil? && usm.content.nil? %>
+
+                <% else %>
+                    <div class="fl"><strong>内容：</strong></div><div class="ml36"><%= usm.description.html_safe %></div>
                 <% end %>
-                <p>内容：<%= usm.content.nil? ? usm.description.html_safe : usm.content.html_safe %></p>
               </div>
               <li class="homepageNewsTime fl"><%= time_tag(usm.created_at).html_safe %> </li>
             </ul>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 12e3e7c36..a08c7760b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2814,4 +2814,4 @@ img.school_avatar {
 }
 
 .admin_message_warn{font-size: 12px;color: red;}
-a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;}
+a.btn_message_free{ background:#15BCCF; display:block;  text-align:center; color:#fff; padding:3px 0; width:60px; margin-bottom:10px;margin-left: 58px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4cfd5da0d..34692d16b 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -68,6 +68,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
+.ml36{ margin-left:36px; }
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -1119,7 +1120,7 @@ a:hover.tijiao{ background:#0f99a9;}
 #cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
 #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
 #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
-.system_message_style {line-height: 19.1px; max-width: 610px;overflow:hidden; work-wrap: break-word; word-break: break-all;}
+.system_message_style {line-height: 19.1px; max-width: 681px;overflow:hidden; work-wrap: break-word; word-break: break-all;}
 .system_message_style img {max-width: 100%;}
 /*20150906关联项目LB*/
 a.RalationIcon{  background: url(../images/homepage_icon.png) -183px -396px  no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}