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 15:02:53 +08:00
parent e95c686ea1 a9ccb3b7b9
commit 78c46065f8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,13 @@
<a href="javascript:void(0)" onclick="close_big_repository()"><i class="fa fa-compress font-14 fl color-grey"></i></a> <a href="javascript:void(0)" onclick="close_big_repository()"><i class="fa fa-compress font-14 fl color-grey"></i></a>
</div> </div>
</div> </div>
<div class="content-history-inner"> <div class="content-history-extend">
<% if params[:action] == "entry" %> <% if params[:action] == "entry" %>
<div id="file_entry_content_inner"> <div id="file_entry_content_inner">
<%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %> <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
</div> </div>
<% else %> <% else %>
<% unless @entries.blank? %> <% unless @entries.blank? %>
<%= render :partial => 'tree' %> <%= render :partial => 'tree' %>
<% end %> <% end %>
<% end %> <% end %>

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

@ -117,6 +117,7 @@ a.rightbar-pause{ color:#29bd8b; font-size: 18px; margin-right:245px; margin-top
.tab-info-inner{ overflow:auto; margin:15px 0 0px 15px; } .tab-info-inner{ overflow:auto; margin:15px 0 0px 15px; }
.big-tab-info-inner{ overflow:auto; margin:15px 0 0px 15px; } .big-tab-info-inner{ overflow:auto; margin:15px 0 0px 15px; }
.content-history-inner{overflow:auto; padding:15px; height: 80px} .content-history-inner{overflow:auto; padding:15px; height: 80px}
.content-history-extend{overflow:auto; padding:15px;}
.content-history{width:49%; min-width:150px; } .content-history{width:49%; min-width:150px; }
.history-success{ width: 100%; height:40px; line-height: 40px; background:#eef1f2; color:#666; } .history-success{ width: 100%; height:40px; line-height: 40px; background:#eef1f2; color:#666; }
.history-fail{ width: 100%; height:40px; line-height: 40px; background:#fdebeb; color:#e53238; } .history-fail{ width: 100%; height:40px; line-height: 40px; background:#fdebeb; color:#e53238; }