From 0d4047b4ee5577bd615f88f91484f31775bb216c Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 30 May 2016 09:19:11 +0900
Subject: [PATCH] Fix presentation of pull request page

---
 .../twirl/gitbucket/core/pulls/mergeguide.scala.html | 12 ++++++++----
 .../twirl/gitbucket/core/pulls/pullreq.scala.html    |  2 +-
 src/main/webapp/assets/common/css/gitbucket.css      |  2 --
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index 933aa52a1..2451820d1 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -84,7 +84,7 @@
       }
       </div>
       @if(status.hasMergePermission){
-        <div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa">
+        <div style="padding:15px; border-top:solid 1px #e5e5e5; background:#fafafa">
           <input type="button" class="btn @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/>
           &nbsp;&nbsp;You can also merge branches on the <a href="#" class="show-command-line">command line</a>.
           <div id="command-line" style="display: none;margin-top: 15px;">
@@ -135,15 +135,15 @@
         </div>
       }
     </div>
-    <div id="confirm-merge-form" style="display: none;">
+    <div id="confirm-merge-form" style="display: none; padding: 12px;">
       <form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/merge">
         <div class="strong">
           Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
         </div>
         <span id="error-message" class="error"></span>
-        <textarea name="message" style="height: 80px;" class="form-control">@issue.title</textarea>
+        <textarea name="message" style="height: 80px; margin-top: 8px; margin-bottom: 8px;" class="form-control">@issue.title</textarea>
         <div>
-          <input type="button" class="btn" value="Cancel" id="cancel-merge-pull-request"/>
+          <input type="button" class="btn btn-default" value="Cancel" id="cancel-merge-pull-request"/>
           <input type="submit" class="btn btn-success" value="Confirm merge"/>
         </div>
       </form>
@@ -170,6 +170,10 @@ $(function(){
     $('#merge-pull-request').hide();
     $('#confirm-merge-form').show();
   });
+  $('#cancel-merge-pull-request').click(function(){
+    $('#merge-pull-request').show();
+    $('#confirm-merge-form').hide();
+  });
 
   @forkedRepository.sshUrl.map { sshUrl =>
     $('#repository-url-http').click(function(e){
diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
index af8c4aba2..0cff2d6a7 100644
--- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
@@ -28,7 +28,7 @@
         <div class="edit-title pull-right" style="display: none;">
           <a class="btn btn-success" href="#" id="update">Save</a>  <a class="btn btn-default" href="#" id="cancel">Cancel</a>
         </div>
-        <h1>
+        <h1 class="body-title">
           <span class="show-title">
             <span id="show-title">@issue.title</span>
             <span class="muted">#@issue.issueId</span>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 299bc13fd..2c391cf87 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -833,7 +833,6 @@ a.issue-title {
   font-size: 120%;
 }
 
-/*
 .label-success {
   background-color: #6cc644;
 }
@@ -841,7 +840,6 @@ a.issue-title {
 .label-important {
   background-color: #bd2c00;
 }
-*/
 
 ul.label-list {
   list-style-type: none;