From 87ceaca558fcec0b2c937c2cd112d6fec45a6faf Mon Sep 17 00:00:00 2001
From: Linda <2294690300@qq.com>
Date: Fri, 19 May 2017 15:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=A1=B9=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E9=A1=B5=E6=98=BE=E7=A4=BA=E9=94=99=E4=B9=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/statistics.html.erb | 3 ++-
 public/stylesheets/css/edu-common.css | 1 +
 public/stylesheets/css/taskstyle.css  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/shixuns/statistics.html.erb b/app/views/shixuns/statistics.html.erb
index 19988de49..e8ebca821 100644
--- a/app/views/shixuns/statistics.html.erb
+++ b/app/views/shixuns/statistics.html.erb
@@ -6,7 +6,8 @@
       <% @challenges.each do |challenge| %>
           <div class="panel-warp-3  fl">
             <div class="panel-warp-inner">
-              <p class=" clearfix  font-bd"><span class="  fl"><%= challenge.subject %></span><span class="fr">平均耗时：<%= game_spend_time(avg_spend_time(@shixun.id, challenge.position)) %></span></p>
+              <p class=" clearfix  font-bd"><span class=" edu-txt-w320 task-hide"><%= challenge.subject %></span></p>
+              <span >平均耗时：<%= game_spend_time(avg_spend_time(@shixun.id, challenge.position)) %></span>
               <p>正在挑战：<%= shixun_running(@shixun, challenge.position).to_i %></p>
               <p>完成挑战：<%= shixun_done(@shixun, challenge.position).to_i %></p>
             </div>
diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css
index d456f63f5..72ccbe81e 100644
--- a/public/stylesheets/css/edu-common.css
+++ b/public/stylesheets/css/edu-common.css
@@ -170,6 +170,7 @@ a:hover.link-name-dark{ color:#5faee3;}
 .edu-h350-auto{ max-height:350px; overflow:auto;}
 .edu-txt-w240{ width:240px; display: block;}
 .edu-txt-w280{ width:280px; display: block;}
+.edu-txt-w320{ width:320px; display: block;}
 .edu-txt-w200{ width:200px; display: block;}
 a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;}
 a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;}
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index 15bcd2102..c0f9b2424 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -194,7 +194,7 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f
 .panel-warp-img{width: 30px; height: 30px; border-radius:100px;}
 .panel-warp-name{ display:block; max-width:100px;}
 .panel-warp-inner{ padding:15px;}
-.panel-warp-dbg{ background:#29bd8b; padding:15px;}
+.panel-warp-dbg{ background:#29bd8b; padding:15px; height:120px;}
 .panel-warp-dbg li{ margin-bottom:15px; }
 .panel-warp-dbg li:last-child{ margin-bottom:0;}
 .fa-icons-trophy{ position:relative; padding-top:10px;}