From 1d085d52bbe8b37278312aa9554c103c6139a044 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 16 Mar 2016 10:36:52 +0900
Subject: [PATCH] Small fix for UI styles

---
 src/main/twirl/gitbucket/core/issues/create.scala.html    | 2 +-
 src/main/twirl/gitbucket/core/issues/labellist.scala.html | 2 +-
 src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html | 4 ++--
 src/main/twirl/gitbucket/core/pulls/pullreq.scala.html    | 2 +-
 src/main/webapp/assets/common/css/gitbucket.css           | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/issues/create.scala.html b/src/main/twirl/gitbucket/core/issues/create.scala.html
index 9beb1a4aa..10ce60c99 100644
--- a/src/main/twirl/gitbucket/core/issues/create.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -14,7 +14,7 @@
           <div class="panel panel-default issue-box">
             <div class="panel-body">
               <span id="error-title" class="error"></span>
-              <input type="text" id="issue-title" name="title" class="form-control input-lg" value="" placeholder="Title" autofocus/>
+              <input type="text" id="issue-title" name="title" class="form-control" value="" placeholder="Title" autofocus/>
               @helper.html.preview(
                 repository         = repository,
                 content            = "",
diff --git a/src/main/twirl/gitbucket/core/issues/labellist.scala.html b/src/main/twirl/gitbucket/core/issues/labellist.scala.html
index 38b2aa3de..0217bddef 100644
--- a/src/main/twirl/gitbucket/core/issues/labellist.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labellist.scala.html
@@ -1,6 +1,6 @@
 @(issueLabels: List[gitbucket.core.model.Label])
 @if(issueLabels.isEmpty){
-  <li><span class="muted small">None yet</span></li>
+  <li><span class="muted">None yet</span></li>
 }
 @issueLabels.map { label =>
   <li><span class="issue-label" style="background-color: #@label.color; color: #@label.fontColor;">@label.labelName</span></li>
diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
index 50cca1767..3dd8c07aa 100644
--- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
@@ -51,7 +51,7 @@
             <div class="pull-right">
               <form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/update_branch">
                 <input type="hidden" name="expected_head_oid" value="@pullreq.commitIdFrom">
-                <button class="btn"@if(!status.canUpdate){ disabled="true"} id="update-branch-button">Update branch</button>
+                <button class="btn btn-default"@if(!status.canUpdate){ disabled="true"} id="update-branch-button">Update branch</button>
               </form>
             </div>
           }
@@ -83,7 +83,7 @@
       </div>
       @if(status.hasMergePermission){
         <div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa">
-          <input type="button" class="btn btn-lg @if(!status.hasProblem){btn-success} else {btn-default}" id="merge-pull-request-button" value="Merge pull request"@if(!status.canMerge){ disabled="true"}/>
+          <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;">
             <hr />
diff --git a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
index 10e166adf..bb0dfd9c4 100644
--- a/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/pullreq.scala.html
@@ -35,7 +35,7 @@
           </span>
           <span class="edit-title" style="display: none;">
             <span id="error-edit-title" class="error"></span>
-            <input type="text" style="width: 700px;" id="edit-title" value="@issue.title"/>
+            <input type="text" class="form-control" style="width: 700px;" id="edit-title" value="@issue.title"/>
           </span>
         </h1>
       </div>
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 6e30d5866..31db4abe7 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -198,7 +198,7 @@ span.error {
 }
 
 .small {
-  font-size: 80%;
+  font-size: 90%;
 }
 
 .strong {
@@ -388,7 +388,6 @@ ul.dropdown-menu {
 
 ul.dropdown-menu li {
   border-bottom: 1px solid #eee;
-  font-size: 85%;
 }
 
 ul.dropdown-menu li a {