Fix styles of issues and pull requests

src/main/twirl/gitbucket/core/dashboard/issuesnavi.scala.html

@@ -3,7 +3,7 @@
   condition: gitbucket.core.service.IssuesService.IssueSearchCondition)(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.view.helpers._
-<ul class="nav nav-pills-group pull-left fill-width">
+<ul class="nav nav-pills-group pull-left fill-width" style="margin-bottom: 10px;">
   <li class="@if(filter == "created_by"){active} first">
     <a href="@path/dashboard/@active/created_by@condition.copy(author = None, assigned = None).toURL">Created</a>
   </li>
@@ -15,7 +15,7 @@
   </li>
   <li class="pull-right">
     <form method="GET" id="search-filter-form" action="@path/dashboard/@active" style="margin-bottom: 0px;">
-      <input type="text" id="search-filter-box" class="form-control input-lg" name="q" style="width: 400px;"
+      <input type="text" id="search-filter-box" class="form-control input-lg" name="q" style="width: 400px; font-size: 100%;"
              value="is:@{if(active == "issues") "issue" else "pr"} @condition.toFilterString"/>
     </form>
   </li>

src/main/twirl/gitbucket/core/issues/issue.scala.html

@@ -31,22 +31,22 @@
         </span>
       </h1>
     </div>
-    @if(issue.closed) {
+    <div style="margin-bottom: 15px">
-      <span class="label label-important issue-status">Closed</span>
+      @if(issue.closed) {
-    } else {
+        <span class="label label-important issue-status">Closed</span>
-      <span class="label label-success issue-status">Open</span>
+      } else {
-    }
+        <span class="label label-success issue-status">Open</span>
-    <span class="muted">
-      @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining(
-        comments.count( _.action.contains("comment") )
-      ){ count =>
-        @count @plural(count, "comment")
       }
-    </span>
+      <span class="muted">
-    <br/><br/>
+        @user(issue.openedUserName, styleClass="username strong") opened this issue @helper.html.datetimeago(issue.registeredDate) - @defining(
+          comments.count( _.action.contains("comment") )
+        ){ count =>
+          @count @plural(count, "comment")
+        }
+      </span>
+    </div>
     <hr>
-    <br/>
+    <div class="row" style="margin-top: 15px;">
-    <div class="row">
       <div class="col-md-10">
         @commentlist(Some(issue), comments, hasWritePermission, repository)
         @commentform(issue, true, hasWritePermission, repository)

src/main/twirl/gitbucket/core/pulls/conversation.scala.html

@@ -11,8 +11,8 @@
 @import gitbucket.core.view.helpers._
 @import gitbucket.core.model._
 
-<div class="row-fluid">
+<div class="row">
-  <div class="span10">
+  <div class="col-md-10">
     <div id="comment-list">
       @issues.html.commentlist(Some(issue), comments, hasWritePermission, repository, Some(pullreq))
     </div>
@@ -44,7 +44,7 @@
         @issues.html.commentform(issue, !merged, hasWritePermission, repository)
       }
   </div>
-  <div class="span2">
+  <div class="col-md-2">
     @issues.html.issueinfo(Some(issue), comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
   </div>
 </div>

src/main/twirl/gitbucket/core/pulls/pullreq.scala.html

@@ -36,32 +36,33 @@
           </span>
         </h1>
       </div>
-      @if(issue.closed) {
+      <div style="margin-bottom: 15px">
-        @comments.flatMap @{
+        @if(issue.closed) {
-          case comment: IssueComment => Some(comment)
+          @comments.flatMap @{
-          case _ => None
+            case comment: IssueComment => Some(comment)
-        }.find(_.action == "merge").map{ comment =>
+            case _ => None
-          <span class="label label-info issue-status">Merged</span>
+          }.find(_.action == "merge").map{ comment =>
-          <span class="muted">
+            <span class="label label-info issue-status">Merged</span>
-            @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
+            <span class="muted">
-            into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
+              @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
-            @helper.html.datetimeago(comment.registeredDate)
+              into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-          </span>
+              @helper.html.datetimeago(comment.registeredDate)
-        }.getOrElse {
+            </span>
-          <span class="label label-important issue-status">Closed</span>
+          }.getOrElse {
+            <span class="label label-important issue-status">Closed</span>
+            <span class="muted">
+              @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
+              into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
+            </span>
+          }
+        } else {
+          <span class="label label-success issue-status">Open</span>
           <span class="muted">
             @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
             into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
           </span>
         }
-      } else {
+      </div>
-        <span class="label label-success issue-status">Open</span>
-        <span class="muted">
-          @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
-          into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-        </span>
-      }
-      <br/><br/>
       <ul class="nav nav-tabs fill-width pull-left" id="pullreq-tab">
         <li class="active"><a href="#conversation">Conversation <span class="badge">@comments.flatMap @{
           case comment: IssueComment => Some(comment)

src/main/webapp/assets/common/css/gitbucket.css

@@ -43,6 +43,7 @@ h6 {
     /*font-size: 14px;*/
     text-align: center;
 }
+
 .mega-octicon{
     width: 32px;
     height: 32px;
@@ -74,6 +75,10 @@ blockquote p {
   border-bottom-width: 1px;
 }
 
+.tab-content {
+  margin-top: 20px;
+}
+
 .danger {
   color: #900;
 }
@@ -82,6 +87,19 @@ blockquote p {
   color: #F28722;
 }
 
+dl {
+  margin: 0px;
+}
+
+dd {
+  margin-left: 20px;
+}
+
+hr {
+  margin-top: 4px;
+  margin-bottom: 4px;
+}
+
 /* ======================================================================== */
 /* Global Header */
 /* ======================================================================== */
@@ -345,19 +363,6 @@ th.box-header .octicon {
   display: inline;
 }
 
-dl {
-  margin: 0px;
-}
-
-dd {
-  margin-left: 20px;
-}
-
-hr {
-  margin-top: 4px;
-  margin-bottom: 4px;
-}
-
 img.avatar {
   border-radius: 4px;
   -webkit-border-radius: 4px;