From d77d7e14c7f14cb159980fa4c20585a7ba3d868e Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmail.com>
Date: Mon, 26 May 2014 08:56:16 +0800
Subject: [PATCH] home page memo css no wrap

---
 app/views/welcome/contest.html.erb | 2 +-
 app/views/welcome/course.html.erb  | 2 +-
 app/views/welcome/index.html.erb   | 2 +-
 public/stylesheets/welcome.css     | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb
index 3e0fecceb..d8d8a2d8a 100644
--- a/app/views/welcome/contest.html.erb
+++ b/app/views/welcome/contest.html.erb
@@ -189,7 +189,7 @@
 			<% find_new_forum_topics(11).each do |topic|%>
 			<li class="message-brief-intro" style="min-height: 60px; line-height:2em; ">
 				<div  style="display: inline-block; width: 100%;">
-				  <span class="memo_activity"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				  <span class="memo_activity text_nowrap"  style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
 				  </span>
                   <div class='memo_activity memo_attr'>
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 5e02730c0..88fd3bf4d 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -234,7 +234,7 @@
       <% find_new_forum_topics(10).each do |topic|%>
           <li class="message-brief-intro" style="min-height: 65px; line-height:2em; ">
             <div  style="display: inline-block; width: 100%;">
-				  <span class="memo_activity" style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+				  <span class="memo_activity text_nowrap" style="color:gray; display: inline-block;  margin-bottom:6px; background: url('/images/list-icon.png') no-repeat scroll ;background-position: left center;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url, :class => "gray" , :style => "font-size: 10pt !important;" %>
 				  </span>
               <div class='memo_activity memo_attr'>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index fcdce62e8..6702f520c 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -112,7 +112,7 @@
 		<div class="welcome-box-list-new memo_activity">
 		<% find_new_forum_topics(7).each do |topic|%>
 			<li class="message-brief-intro">
-				<div class='memo_title'>
+				<div class='memo_title text_nowrap'>
 					<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %>
 				</div>
 				<div class='memo_attr'>
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index 5ee72add5..4636ca5af 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -399,7 +399,7 @@ a.attachments_list_color {
  /************************** 贴吧动态 开始 *****************************/
  /*贴吧活动*/
 .memo_activity{
-
+    max-width: 100%;
 }
 /*帖子li*/
 .memo_activity .message-brief-intro{
@@ -418,6 +418,7 @@ a.attachments_list_color {
     padding-left: 20px;
     background: url('../images/list-icon.png') no-repeat scroll left center;
     font-size: 10pt;
+    max-width: 100%
 }
  /*帖子标题前吧名*/
  .memo_activity .memo_Bar_title{