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

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
huang 2017-08-25 19:40:23 +08:00
parent 86000572f6 e1407a6834
commit 7ebb8d63b0
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/subjects/_subject_list.html.erb
View File

@ -67,12 +67,11 @@
<script>
//之下六行代码是为了解决实训套件的套件数目不到两排而造成的翻页器离底部距离太远的问题
var L = $(".sub-con").length;
if($(".newContainer").height()>849) {
var L = $(".pre_sub-con").length;
//console.log(L);
if($(".newContainer").height()>849&&L < 5) {
var H = $(".newContainer").height() - 849;
if (L < 5) {
$("#new_expand").css("margin-top", H + "px");
}
$("#new_expand").css("margin-top", H + "px");
}
var timer="";
$(".pre_sub-con").hover(function(ev){