From 2cc1727693437ca20f22c1b54f1ffa06bbe652eb Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 4 Aug 2017 16:39:12 +0800
Subject: [PATCH] =?UTF-8?q?Issues=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/challenges/_edit_answer.html.erb        | 2 +-
 app/views/challenges/_edit_propaedeutics.html.erb | 2 +-
 app/views/challenges/_edit_task_pass.html.erb     | 2 +-
 app/views/messages/_common_reply_box.html.erb     | 4 ++--
 app/views/shixuns/_settings_show.html.erb         | 2 +-
 app/views/student_work/_common_reply_box.html.erb | 4 ++--
 app/views/users/_course_boardlist.html.erb        | 2 +-
 app/views/users/show.html.erb                     | 6 +++---
 public/stylesheets/css/edu-user.css               | 4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/challenges/_edit_answer.html.erb b/app/views/challenges/_edit_answer.html.erb
index 1fd0f9522..e34a0a24b 100644
--- a/app/views/challenges/_edit_answer.html.erb
+++ b/app/views/challenges/_edit_answer.html.erb
@@ -11,7 +11,7 @@
         <ul>
           <li class="clearfix">
             <label class=" panel-form-label fl"> 参考答案：</label>
-            <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="tpm_answer_show" style="width: 90%">
+            <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="tpm_answer_show" style="width: 90%;background: #fff!important;">
               <textarea style="display:none;"><%= @challenge.answer.blank? ? "无" : (@challenge.answer) %></textarea>
             </div>
           </li>
diff --git a/app/views/challenges/_edit_propaedeutics.html.erb b/app/views/challenges/_edit_propaedeutics.html.erb
index d3a5af201..bdc032f39 100644
--- a/app/views/challenges/_edit_propaedeutics.html.erb
+++ b/app/views/challenges/_edit_propaedeutics.html.erb
@@ -11,7 +11,7 @@
         <ul>
           <li class="clearfix">
             <label class=" panel-form-label fl"> 预备知识：</label>
-            <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_editorMd_propaedeutics" style="width: 90%">
+            <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_editorMd_propaedeutics" style="width: 90%;background: #fff!important;">
               <textarea style="display:none;"><%= @challenge.ready_knowledge.blank? ? "无" : (@challenge.ready_knowledge) %></textarea>
             </div>
   <!--          <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="tpm_answer_show" style="width: 90%">
diff --git a/app/views/challenges/_edit_task_pass.html.erb b/app/views/challenges/_edit_task_pass.html.erb
index 663b225c7..7b603928d 100644
--- a/app/views/challenges/_edit_task_pass.html.erb
+++ b/app/views/challenges/_edit_task_pass.html.erb
@@ -17,7 +17,7 @@
           </li>
           <li class="clearfix">
             <label class="panel-form-label fl"><span class="c_red mr5">*</span>过关任务：</label>
-            <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_task_pass_show" style="width: 90%;color: #888;font-size: 14px;">
+            <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="challenge_task_pass_show" style="width: 90%;background: #fff!important;">
               <textarea style="display:none;"><%= @challenge.task_pass %></textarea>
             </div>
           </li>
diff --git a/app/views/messages/_common_reply_box.html.erb b/app/views/messages/_common_reply_box.html.erb
index 895cfdbcf..2f87581ea 100644
--- a/app/views/messages/_common_reply_box.html.erb
+++ b/app/views/messages/_common_reply_box.html.erb
@@ -5,7 +5,7 @@
     <span id="praise_count_<%=activity.id %>">
         <%= render :partial => 'praise_tread/edu_praise', :locals => {:activity=>activity, :user_activity_id=>activity.id,:type=>"activity"} %>
     </span>
-    <a href="javascript:void(0);"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
+    <a href="javascript:void(0);" class="mr15"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
   </p>
 </div>
 <div class="panel-comment_item">
@@ -72,7 +72,7 @@
                         </span>
                         <%= link_to(
                                     '<i class="fa fa-comments-o mr5"></i>回复'.html_safe,
-                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
+                                    {:controller => 'users' ,:action => 'reply_to',:class=>'mr15', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
                                     :remote => true,
                                     :method => 'get',
                                     :title => l(:button_reply)) %>
diff --git a/app/views/shixuns/_settings_show.html.erb b/app/views/shixuns/_settings_show.html.erb
index adad8d569..3bc014121 100644
--- a/app/views/shixuns/_settings_show.html.erb
+++ b/app/views/shixuns/_settings_show.html.erb
@@ -17,7 +17,7 @@
         </li>
         <li class="clearfix">
           <label class="panel-form-label fl"><!--<span class="c_red mr5">*</span>-->简介：</label>
-          <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="shixun_settings_desc" style="width: 90%;color: #888888">
+          <div class="fl task-bg-grey panel-box-sizing panel-form-width-690 new_li" id="shixun_settings_desc" style="width: 90%;background: #fff!important;">
             <textarea style="display:none;"><%= @shixun.description %></textarea>
           </div>
         </li>
diff --git a/app/views/student_work/_common_reply_box.html.erb b/app/views/student_work/_common_reply_box.html.erb
index fb0ea9465..9bdbb1f73 100644
--- a/app/views/student_work/_common_reply_box.html.erb
+++ b/app/views/student_work/_common_reply_box.html.erb
@@ -4,7 +4,7 @@
     <span id="praise_count_<%=activity.id %>">
         <%= render :partial => 'praise_tread/edu_praise', :locals => {:activity=>activity, :user_activity_id=>activity.id,:type=>"activity"} %>
     </span>
-    <a href="javascript:void(0);"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
+    <a href="javascript:void(0);"class="mr15"><i class="fa fa-comments-o mr5"></i>回复<span class="ml5"><%= count %></span></a>
   </p>
 </div>
 <div class="panel-comment_item">
@@ -71,7 +71,7 @@
                         </span>
                         <%= link_to(
                                     '<i class="fa fa-comments-o mr5"></i>回复'.html_safe,
-                                    {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
+                                    {:controller => 'users' ,:action => 'reply_to',:class=>'mr15', :reply_id => comment.id, :type => activity.class.to_s, :user_activity_id => activity.id},
                                     :remote => true,
                                     :method => 'get',
                                     :title => l(:button_reply)) %>
diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb
index 213c90057..a5392c0e4 100644
--- a/app/views/users/_course_boardlist.html.erb
+++ b/app/views/users/_course_boardlist.html.erb
@@ -8,7 +8,7 @@
   <!--<a href="#" class="link-color-grey fr">时间排序</a>-->
 </p>
 <div class="cl"></div>
-<div class="resources user_bg_shadow" style="padding-top: 0;">
+<div class="resources user_bg_shadow" style="padding: 0;width: 100%">
   <!--列表内容-->
   <% topics.each do |activity| %>
       <div class="panel-inner-fourm">
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 7faa45635..476b61702 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -216,7 +216,7 @@
   <!--<%# end %>-->
   <!--</div>-->
 
-  <div class="passageway mt15">
+  <div class="passageway mt30">
     <!--    <div class="hint">
       <div class="pr10 color-blue play font-14">
         <i class="fa fa-sort-down zhuan mr5" aria-hidden="true"></i>开始
@@ -251,7 +251,7 @@
     </div>
   </div>
 
-  <div class="passageway mt15" id="user_homepage_course_show">
+  <div class="passageway mt30" id="user_homepage_course_show">
     <div class="hascon">
       <ul id="edu-user-tab-nav">
         <li class="edu-user-tab-hover new-tab-nav">
@@ -273,7 +273,7 @@
     <%#= render :partial => "my_homepage_course_show" %>
   </div>
 
-  <div class="favour" id="watcher_fan_list">
+  <div class="favour mt30" id="watcher_fan_list">
     <%= render :partial => 'edu_user_watch_fan_list', :locals => {:current_user => current_user} %>
   </div>
 </div>
diff --git a/public/stylesheets/css/edu-user.css b/public/stylesheets/css/edu-user.css
index 8e703adf7..aca913b63 100644
--- a/public/stylesheets/css/edu-user.css
+++ b/public/stylesheets/css/edu-user.css
@@ -11,7 +11,7 @@
 .-task-con-data .top{width:100%;}
 .-task-con-data .top .top-left{width:60%;}
 .-task-con-data .top .top-left .p1{margin:5px 0;}
-.-task-con-data .top .top-right{width:20%;text-align: right;}
+.-task-con-data .top .top-right{width:35%;text-align: right;}
 .-task-con-data .top .top-right .mynew{display:block;width:100%;}
 .-task-con-data .top .top-right .mynew p a{color:#5789c8;}
 .-task-con-data .top .top-right .mynew .p2{color:#ccc;}
@@ -34,7 +34,7 @@
 .-task-con-data .bot input{width:100%;height:40px;line-height:40px;border:none;outline:none;background:#fff;}
 .-task-con-data .bot p{width: 100%; height: 25px; background: #fff;}
 /*-----------------博客------------------------*/
-.-task-con-int .blog,.favour{width:100%;margin-top:15px;background:#fff;}
+.-task-con-int .blog,.favour{width:100%;background:#fff;}
 .-task-con-int .blog .p1{width:100%;height:40px;background:#f2f2f2;line-height:40px;text-indent:10px;}
 .-task-con-int .blog .p1 span{padding:0 5px;border-radius:8px;background:#e9e9eb;line-height:14px;color:#666;}
 .-task-con-int .blog .p2{line-height:90px;text-align:center;}