From cedff021ad5016ce46c15c371d6c72807a20d054 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Thu, 4 Aug 2016 10:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=94=AF=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=9B=E6=94=B9=E5=8A=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=9B=E6=97=A0=E5=90=88=E5=B9=B6=E5=86=85=E5=AE=B9=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/pull_requests/_form.html.erb                 | 8 ++++----
 app/views/pull_requests/_pull_request_changes.html.erb | 2 +-
 app/views/pull_requests/show.html.erb                  | 4 ++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/pull_requests/_form.html.erb b/app/views/pull_requests/_form.html.erb
index ff840c800..f2d7c84ff 100644
--- a/app/views/pull_requests/_form.html.erb
+++ b/app/views/pull_requests/_form.html.erb
@@ -8,12 +8,12 @@
       <div class="cl"></div>
     </div>
     <div class="new-merge-wrap borderBottomNone">
-      <div class="merge-option-name fl">源分支</div>
-      <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl" %>
+      <div class="merge-option-name fl" style="padding:5px 0">源分支</div>
+      <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
       <!--<select name="source_branch" value="source_branch" class="ml30 fontGrey3 fb fl"><option>master</option><option>develop</option><option>rep_quality</option></select>-->
       <div class="cl mb10"></div>
-      <div class="merge-option-name fl">目标分支</div>
-      <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl" %>
+      <div class="merge-option-name fl" style="padding:5px 0">目标分支</div>
+      <%= select_tag :branch, options_for_select(@rev), :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
       <!--<select name="target_branch" value="source_branch" class="ml30 fontGrey3 fb fl"><option>master</option><option>hjq_course</option><option>hjq_beidou</option><option>develop</option><option>dev_huang</option></select>-->
       <div class="cl"></div>
       <p class="fl ml100 mt10"><a href="javascript:void(0);" class="fr linkGrey2">修改分支</a></p>
diff --git a/app/views/pull_requests/_pull_request_changes.html.erb b/app/views/pull_requests/_pull_request_changes.html.erb
index 84067ffca..b24efee6a 100644
--- a/app/views/pull_requests/_pull_request_changes.html.erb
+++ b/app/views/pull_requests/_pull_request_changes.html.erb
@@ -1,6 +1,6 @@
 <% unless @changes.blank? %>
     <% @changes.each do |cd| %>
-        <div class="showing-changes-row fontGrey2">
+        <div class="showing-changes-row fontGrey2" style="width:710px;">
           <a class="linkGrey3" id="changed-files">
             <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd['new_path'] %>
           </a>
diff --git a/app/views/pull_requests/show.html.erb b/app/views/pull_requests/show.html.erb
index 2564dda77..b7b7b4e54 100644
--- a/app/views/pull_requests/show.html.erb
+++ b/app/views/pull_requests/show.html.erb
@@ -10,6 +10,10 @@
   <div class="merge-commit-option mt15">
     <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn" %>
   </div>
+  <div class="merge-commit-option mt15">
+    <span class="fontGrey3 fb" style="font-size:13px;"><img src="/images/warning.png" width="16" class="mr5 mt2 fl">dev_huang没有新内容可以合并至develop</span><br />
+    <p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
+  </div>
 </div>
 <ul class="merge-record" style="border-top:1px solid #ddd;">
   <li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>