From 9af8757cebe7d3ed102abaf6aaa1661e3b1f0405 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 2 Aug 2016 10:03:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/index.html.erb | 34 +++++++++++++++++++++++---
 public/stylesheets/css/project.css     |  8 ++++--
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index cad9247a6..b680dcb60 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -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>
\ No newline at end of file
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 3c4dd04c9..573948d66 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -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;}
\ No newline at end of file
+.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;}
\ No newline at end of file