From df50ca52f010596140fc17f73b3d32a33fb66bfe Mon Sep 17 00:00:00 2001
From: miss <994230062@qq.com>
Date: Wed, 6 Sep 2017 18:15:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=86=B2=E7=AA=81=E7=9A=84?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/shixuns/propaedeutics.html.erb | 4 ++--
 app/views/shixuns/settings.html.erb      | 6 +++---
 public/stylesheets/css/taskstyle.css     | 8 +++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/views/shixuns/propaedeutics.html.erb b/app/views/shixuns/propaedeutics.html.erb
index a81f279e4..5bef47c4f 100644
--- a/app/views/shixuns/propaedeutics.html.erb
+++ b/app/views/shixuns/propaedeutics.html.erb
@@ -6,8 +6,8 @@
         width: 96%;
     }
 </style>
-<div class="task-pm-content mb20 box_bg_shandow" >
-  <div class="task-pm-box mt20">
+<div class="task-pm-content mb20 " >
+  <div class="task-pm-box mt20 box_bg_shandow">
     <div class="panel-header clearfix">
       <h3 class="shixun_title fl mt5">背景知识</h3>
       <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %>
diff --git a/app/views/shixuns/settings.html.erb b/app/views/shixuns/settings.html.erb
index b102a12b5..457077aa6 100644
--- a/app/views/shixuns/settings.html.erb
+++ b/app/views/shixuns/settings.html.erb
@@ -5,8 +5,8 @@
 <div class="task-pm-content mb20 box_bg_shandow">
   <div class="task-pm-box mt20">
     <div class="tab_content clearfix" >
-      <ul id="tab_nav" class="nav_check_item">
-        <li id="tab_nav_1" class="tab_hover" onclick="HoverLi(1);">
+      <ul id="tab_nav" class="nav_check_item" style="background:#fff;">
+        <li id="tab_nav_1" class="tab_hover_setting" onclick="HoverLi(1);">
           <a href="javascript:void(0);" class="tab_type">实训</a>
         </li>
         <li id="tab_nav_2"  onclick="HoverLi(2);">
@@ -43,7 +43,7 @@
             g('tab_con_'+i).className='undis';
         }
         g('tab_con_'+n).className='dis';
-        g('tab_nav_'+n).className='tab_hover';
+        g('tab_nav_'+n).className='tab_hover_setting';
     }
     function close_waring_frame(){
         $("#warning_frame").hide();
diff --git a/public/stylesheets/css/taskstyle.css b/public/stylesheets/css/taskstyle.css
index fbc8995a8..b53cc74ce 100644
--- a/public/stylesheets/css/taskstyle.css
+++ b/public/stylesheets/css/taskstyle.css
@@ -44,11 +44,13 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:15px; margin-top:
 .panel-header-border{  border:1px solid #eee; padding:10px 15px; border-bottom:none; }
 /* tab */
 .tab_content{ width: 100%;  margin: 0 auto;  background:#fff;  }
-#tab_nav {height:40px; }
+#tab_nav {height:40px;background: #eff0f4; }
 #tab_nav li {float:left; padding:0 30px;text-align:center;height: 40px;line-height: 40px;  }
 #tab_nav li a{font-size:14px; }
-.tab_hover {background: #FC7033;}
-.tab_hover a{ color:#fff;}
+.tab_hover {border-bottom:1px solid #fff; background: #fff;}
+.tab_hover_setting{background:#FC7033;}
+.tab_hover a{ color:#29bd8b;}
+.tab_hover_setting a{color:#fff;}
 .undis {display:none;}
 .dis {display:block;}
 .tab-info{ }