kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

样式冲突的调整

This commit is contained in:
miss 2017-09-06 18:15:09 +08:00
parent 3645742ec2
commit df50ca52f0
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/shixuns/propaedeutics.html.erb
View File

@ -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) %>

6
app/views/shixuns/settings.html.erb
View File

@ -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();

8
public/stylesheets/css/taskstyle.css
View File

@ -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{ }