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

pull request commits样式调整

This commit is contained in:
huang 2016-08-03 15:16:28 +08:00
parent 27e755a0a9
commit 8e329db4d8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/pull_requests/_pull_request_commits.html.erb
View File

@ -1,4 +1,5 @@
<% @commits.each do |commit| %>
<div class="new-merge-wrap">
<div class="merge-commit-time">
<img width="16" class="ui-datepicker-trigger mr15" style="cursor:default; margin-top:3px; margin-left:0;" /><span class="fontGrey3"><%= format_date(commit.created_at) %></span>
<!--<p class="mt10 fontGrey2">1次提交</p>-->
@ -13,4 +14,5 @@
</span>
</div>
<div class="cl"></div>
</div>
<% end %>

8
app/views/pull_requests/show.html.erb
View File

@ -16,13 +16,13 @@
<li><%= link_to "改动<span class='project-number-dot'>1</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id), :remote => true, :class => "active" %></li>
</ul>
<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
<div class="new-merge-wrap" id="merge_record_0">
<div id="merge_record_0">
<%= render :partial => "pull_requests/pull_request_commits" %>
</div>
<% if @type == 2 %>
<div id="merge_record_1" class="undis">
<%= render :partial => "pull_requests/pull_request_changes" %>
</div>
<div id="merge_record_1" class="undis">
<%= render :partial => "pull_requests/pull_request_changes" %>
</div>
<% end %>
<script>