From be36755d95ebf71b5b41bb0637df1837ac66ad09 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Mon, 1 Aug 2016 16:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_rquests/index.html.erb | 10 ++++++++++
 public/stylesheets/css/project.css    |  9 ++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/views/pull_rquests/index.html.erb b/app/views/pull_rquests/index.html.erb
index e69de29bb..cad9247a6 100644
--- a/app/views/pull_rquests/index.html.erb
+++ b/app/views/pull_rquests/index.html.erb
@@ -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>
\ No newline at end of file
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 350141150..3c4dd04c9 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -513,4 +513,11 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .analysis-result-loc {width:60px; text-align:right;}
 .analysis-result-debt {width:160px; 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;}
\ No newline at end of file
+.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;}
\ No newline at end of file