From 9b424a5b17dcc285c6c0d8b25f1384a411d20d4d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 14 Aug 2015 17:25:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=97=AE=E5=8D=B7=E8=B0=83?=
 =?UTF-8?q?=E6=9F=A5----=E7=82=B9=E5=87=BB=E9=97=AE=E5=8D=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=A6=82=E5=9B=BE=E7=A9=BA=E7=99=BD=E5=A4=84?=
 =?UTF-8?q?=E4=B9=9F=E8=BF=94=E5=9B=9E=E7=9B=B8=E5=85=B3=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll.html.erb | 12 +++++++-----
 public/stylesheets/polls.css  |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index b4d944220..1828ede6d 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -2,11 +2,13 @@
 <% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
 <% if @is_teacher%>
   <li title="<%= poll.polls_name %>">
-    <% if has_commit %>
-        <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
-    <% else %>
-        <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
-    <% end %>
+    <div style="width: 310px;float: left;">
+      <% if has_commit %>
+          <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
+      <% else %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
+      <% end %>
+    </div>
   </li>
 
   <% if poll.polls_status == 1%>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 97faa0f57..9f7b2d021 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -130,7 +130,7 @@ a:hover.btn_de{ background:#ff5d31;}
 a.btn_pu{ border:1px solid #3cb761; color:#3cb761; }
 a:hover.btn_pu{ background:#3cb761;}
 .pollsbtn_grey{ border:1px solid #b1b1b1; color:#b1b1b1; padding:0px 9px; height:19px; padding-top:3px; }
-.polls_title_w { width:280px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.polls_title_w { max-width:280px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
 .polls_title_st { max-width:530px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
 .polls_de_grey{ color:#b1b1b1; margin-top:3px;}
 .ml5{ margin-left:5px;}