jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project

This commit is contained in:
huang 2017-03-21 10:06:21 +08:00
parent 62ba2e723c 5629b26378
commit cd30987c88
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/games/_exec_results.html.erb
View File

@ -25,12 +25,12 @@
</div>
</div>
</div>
<div class=" col-width fl content-history mt15" >
<div class="col-width fl content-history mt15" >
<div class="panel-header clearfix">
<h3 class="fl">测评历史</h3>
<div class="fr mt5">
<div class="fr mt5">
<a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
<a href="javascript:void(0)" onclick="extend_window()"><i class="fa fa-minus-square font-14 fl color-grey"></i></a>
<a href="javascript:void(0)" onclick="extend_window()"><i class="fa fa-expand font-14 fl color-grey"></i></a>
</div>
</div>
<div class="content-history-inner">
@ -53,7 +53,7 @@
999999
</div>
</div>
<div class=" col-width fl content-submit ml15 mt15">
<div class="col-width fl content-submit ml15 mt15">
<div class="panel-header ">
<h3 >操作</h3>
</div>

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

@ -10,7 +10,7 @@
<h3 class="fl">第<%= @game.stage %>关：<%= @game.subject %></h3>
<div class="fr mt5">
<a href="#"><i class="fa fa-minus font-14 mr10 fl color-grey"></i></a>
<a href="javascript:void(0);" onclick="extend_game_description();"><i class="fa fa-minus-square font-14 fl color-grey"></i></a>
<a href="javascript:void(0);" onclick="extend_game_description();"><i class="fa fa-expand font-14 fl color-grey"></i></a>
</div>
</div>
<div class="tab_content clearfix">

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

@ -20,7 +20,7 @@
<% if params[:action] == "entry" %>
<a href="<%= file_edit_myshixun_game_path(@game, :myshixun_id => @myshixun, :path => params[:path]) %>" data-remote="true"><i class="fa fa-edit font-18 fl color-grey mr10"></i></a>
<% end %>
<a href="javascript:void(0)" onclick="extend_repository();"><i class="fa fa-check-circle font-18 fl color-grey"></i></a>
<a href="javascript:void(0)" onclick="extend_repository();"><i class="fa fa-expand font-18 fl color-grey"></i></a>
</div>
</div>
<div class="content-editor-inner">