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

项目合并请求

This commit is contained in:
Tim 2016-08-02 10:03:42 +08:00
parent 1fc617d5fa
commit 9af8757ceb
2 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/views/pull_requests/index.html.erb
View File

@ -1,10 +1,38 @@
<ul id="test" class="project-merge-banner">
<ul id="mergeBanner" class="project-merge-banner">
<li><a href="javascript:void(0);">打开<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">合并<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">关闭<span class="project-number-dot">1</span></a></li>
<li><a href="javascript:void(0);">全部<span class="project-number-dot">3</span></a></li>
<li class="active"><a href="javascript:void(0);">全部<span class="project-number-dot">3</span></a></li>
<div class="cl"></div>
</ul>
<div class="cl"></div>
<ul class="project-merge-content">
<li>
<a href="javascript:void(0);" class="linkGrey3 fb fl">第三次提交</a><a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>
<div class="cl mb5"></div>
<span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" class="linkGrey3 fb fl">第二次提交</a><a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">合并</span>
<div class="cl mb5"></div>
<span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" class="linkGrey3 fb fl">第一次提交</a><a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">打开</span>
<div class="cl mb5"></div>
<span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
<div class="cl"></div>
</li>
</ul>
<div class="no-merge-content">没有可显示的请求</div>
<script>
$("#test").parent().css("width","730px");
$("#mergeBanner").parent().css("width","730px");
$(".project-merge-banner li").click(function(){
$(".project-merge-banner li").removeClass("active");
$(this).addClass("active");
});
</script>

8
public/stylesheets/css/project.css
View File

@ -517,7 +517,11 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
/*20160801项目合并*/
.project-merge-banner {margin-top:-10px;}
.project-merge-banner {margin:-10px -10px 0 -10px; padding:0 10px; border-bottom:1px solid #ddd;}
.project-merge-banner li {float:left;}
.project-merge-banner .active {border-bottom:2px solid #3b94d6;}
.project-merge-banner li a {padding:14px; font-size:14px; color:#555; display:inline-block;}
.project-number-dot {display:inline-block; min-width:10px; padding:3px 7px; font-size:13px; color:#888; line-height:1; vertical-align:middle; white-space:nowrap; text-align:center; background-color:#eee; border-radius:10px; margin-left:5px;}
.project-number-dot {display:inline-block; min-width:10px; padding:3px 5px; font-size:12px; color:#888; line-height:1; vertical-align:middle; white-space:nowrap; text-align:center; background-color:#eee; border-radius:10px; margin-left:5px;}
.project-merge-content {}
.project-merge-content li {padding:10px; margin:0 -10px; background-color:#f9f9f9; border-bottom:1px solid #e5e5e5;}
.no-merge-content {padding:10px 15px; color:#888;}