kevinli
/
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:
cxt 2017-07-26 17:42:12 +08:00
parent b4711318d9 75d3b92bac
commit 306d5ab153
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/games/_game_show.html.erb
View File

@ -86,11 +86,13 @@
<div class="-flex -relative">
<div class="split-panel -fit -vertical">
<div class="-layout -stretch -fit -vertical centerH">
<div class="-layout -vertical -flex -relative -bg-black -flex-basic60" id="games_repository_contents" style="overflow:hidden;">
<div class="-layout -vertical -flex -relative -bg-black -flex-basic70" id="games_repository_contents" style="overflow:hidden;">
<%= render :partial => 'games/repository' %>
</div>
<!--拖拽增加结构---------------------------------------->
<div class="h-center"></div>
<div class="h-center">
<div class="-changebg -bg-black" id="-bg-change-color"></div>
</div>
<!------------------------------------------------------>
<div class="split-panel--second -layout -vertical -flex -relative -bg-black -flex-basic40" id="games_valuation_contents">
<%= render :partial => 'games/game_results' %>

9
app/views/games/_repository.html.erb
View File

@ -71,8 +71,13 @@
g_l('codotab_con_'+i).className='undis';
}
n == 2 ? $("#games_repository_contents").removeClass("-bg-black").addClass("-bg-weightblack")
: $("#games_repository_contents").removeClass("-bg-weightblack").addClass("-bg-black");
if(n==2){
$("#games_repository_contents").removeClass("-bg-black -flex-basic70").addClass("-bg-weightblack -flex-basic60");
$("#-bg-change-color").removeClass("-bg-black").addClass("-bg-weightblack");
}else{
$("#games_repository_contents").removeClass("-bg-weightblack -flex-basic60").addClass("-bg-black -flex-basic70");
$("#-bg-change-color").removeClass("-bg-weightblack").addClass("-bg-black");
}
g_l('codotab_con_'+n).className='dis -relative';
g_l('codetab_nav_'+n).className='blacktab_hover';

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

@ -149,11 +149,13 @@ input.knowledge_frame{height:30px;line-height:30px;border:none;background:#f3f5f
.-flex-basic40{flex-basis:auto;}
.-flex-basic50{flex-basis:auto;}
.b-label{width:4px;cursor:ew-resize;background:#2b2b2b;}
.h-center{height:4px;cursor:ns-resize;background:#33485F;z-index:9999;}
.h-center{height:4px;cursor:ns-resize;background:#33485F;}
.-changebg{height:3px;}
.-brother{width:100%;height:100%;position:absolute;left:0;top:0;z-index:999;}
.-bg-weightblack{background:#000;}
.-flex-basic70{flex:4 9 auto;}
/*---------------------------------------------*/
.-flex-basic60{flex:4 9 auto;}
.-flex-basic60{flex:none;}
.-flex-basic100{flex-basis: 100%!important;}
.-header-title{ max-width:500px; font-weight: normal;}
.-header-right{ background:#333;border-radius:25px; padding:5px 15px; height: 30px; position: absolute; right:10px;line-height: 30px;}