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

代码合并页面

This commit is contained in:
Tim 2016-08-01 16:53:33 +08:00
parent 96b04f39b1
commit be36755d95
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/pull_rquests/index.html.erb
View File

@ -0,0 +1,10 @@
<ul id="test" 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>
</ul>
<script>
$("#test").parent().css("width","730px");
</script>

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

@ -513,4 +513,11 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
.analysis-result-loc {width:60px; text-align:right;} .analysis-result-loc {width:60px; text-align:right;}
.analysis-result-debt {width:160px; text-align:right;} .analysis-result-debt {width:160px; text-align:right;}
.analysis-result-time {width:150px; text-align:right;} .analysis-result-time {width:150px; text-align:right;}
.analysis-name-icon {background:url(/images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;} .analysis-name-icon {background:url(/images/code-analysis-icon.png) -2px -148px no-repeat; width:16px; height:16px; display:inline-block; vertical-align:middle;}
/*20160801项目合并*/
.project-merge-banner {margin-top:-10px;}
.project-merge-banner li {float:left;}
.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;}