From 919b1d01e3a99f3626b29ba5b2bcaddfc1d0ed00 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 13 Sep 2017 03:23:15 +0900
Subject: [PATCH] Fix labels and priorities styles

---
 .../twirl/gitbucket/core/issues/labels/edit.scala.html |  8 ++++----
 .../gitbucket/core/issues/labels/label.scala.html      |  4 ++--
 .../twirl/gitbucket/core/issues/labels/list.scala.html |  2 +-
 .../gitbucket/core/issues/priorities/edit.scala.html   | 10 +++++-----
 .../gitbucket/core/issues/priorities/list.scala.html   |  2 +-
 .../core/issues/priorities/priority.scala.html         |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html b/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
index b87957c09..3db3fef83 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/edit.scala.html
@@ -4,9 +4,9 @@
 @defining(label.map(_.labelId).getOrElse("new")){ labelId =>
 <div id="edit-label-area-@labelId">
   <form class="form-inline">
-    <input type="text" id="labelName-@labelId" style="width: 300px; float: left; margin-right: 4px;" class="form-control" value="@label.map(_.labelName)"@if(labelId == "new"){ placeholder="New label name"}/>
+    <input type="text" id="labelName-@labelId" style="width: 300px; float: left; margin-right: 4px;" class="form-control input-sm" value="@label.map(_.labelName)"@if(labelId == "new"){ placeholder="New label name"}/>
     <div id="label-color-@labelId" class="input-group color bscp" data-color="#@label.map(_.color).getOrElse("888888")" data-color-format="hex" style="width: 100px; float: left;">
-      <input type="text" class="form-control" id="labelColor-@labelId" value="#@label.map(_.color).getOrElse("888888")" style="width: 100px;">
+      <input type="text" class="form-control input-sm" id="labelColor-@labelId" value="#@label.map(_.color).getOrElse("888888")" style="width: 100px;">
       <span class="input-group-addon"><i style="background-color: #@label.map(_.color).getOrElse("888888");"></i></span>
     </div>
     <script>
@@ -14,8 +14,8 @@
     </script>
     <span class="pull-right">
       <span id="label-error-@labelId" class="error"></span>
-      <input type="button" id="cancel-@labelId" class="btn btn-default label-edit-cancel" value="Cancel">
-      <input type="button" id="submit-@labelId" class="btn btn-success" style="margin-bottom: 0px;" value="@(if(labelId == "new") "Create label"  else "Save changes")"/>
+      <input type="button" id="cancel-@labelId" class="btn btn-sm btn-default label-edit-cancel" value="Cancel">
+      <input type="button" id="submit-@labelId" class="btn btn-sm btn-success" style="margin-bottom: 0px;" value="@(if(labelId == "new") "Create label"  else "Save changes")"/>
     </span>
   </form>
 </div>
diff --git a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
index c7518eb98..95764ec79 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
@@ -7,9 +7,9 @@
   <td style="padding-top: 15px; padding-bottom: 15px;">
     <div class="milestone row" id="label-@label.labelId">
       <div class="col-md-8">
-        <div style="margin-top: 6px">
+        <div>
           <a href="@helpers.url(repository)/issues?labels=@helpers.urlEncode(label.labelName)" id="label-row-content-@label.labelId">
-            <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
+            <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; border-radius: 4px;">
               <i class="octicon octicon-tag" style="color: #@label.fontColor;"></i>
               @label.labelName
             </span>
diff --git a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
index 94372039b..d276f4dc7 100644
--- a/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/list.scala.html
@@ -7,7 +7,7 @@
   @gitbucket.core.html.menu("labels", repository){
     @if(context.loginAccount.isDefined){
       <div class="pull-right" style="margin-bottom: 10px;">
-        <a class="btn btn-success" href="javascript:void(0);" id="new-label-button">New label</a>
+        <a class="btn btn-success btn-sm" href="javascript:void(0);" id="new-label-button">New label</a>
       </div>
     }
     <table class="table table-bordered table-hover table-issues" id="new-label-table" style="display: none;">
diff --git a/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html
index 3219b4b88..cc9f9439a 100644
--- a/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/priorities/edit.scala.html
@@ -4,19 +4,19 @@
 @defining(priority.map(_.priorityId).getOrElse("new")){ priorityId =>
 <div id="edit-priority-area-@priorityId">
   <form class="form-inline">
-    <input type="text" id="priorityName-@priorityId" style="width: 300px; float: left; margin-right: 4px;" class="form-control" value="@priority.map(_.priorityName)"@if(priorityId == "new"){ placeholder="New priority name"}/>
+    <input type="text" id="priorityName-@priorityId" style="width: 200px; float: left; margin-right: 4px;" class="form-control input-sm" value="@priority.map(_.priorityName)"@if(priorityId == "new"){ placeholder="New priority name"}/>
     <div id="priority-color-@priorityId" class="input-group color bscp" data-color="#@priority.map(_.color).getOrElse("888888")" data-color-format="hex" style="width: 100px; float: left;">
-      <input type="text" class="form-control" id="priorityColor-@priorityId" value="#@priority.map(_.color).getOrElse("888888")" style="width: 100px;">
+      <input type="text" class="form-control input-sm" id="priorityColor-@priorityId" value="#@priority.map(_.color).getOrElse("888888")" style="width: 100px;">
       <span class="input-group-addon"><i style="background-color: #@priority.map(_.color).getOrElse("888888");"></i></span>
     </div>
     <script>
     $('div#priority-color-@priorityId').colorpicker({format: "hex"});
     </script>
-    <input type="text" id="description-@priorityId" style="width: 500px; float: left; margin-left: 4px;" class="form-control" value="@priority.flatMap(_.description).getOrElse("")" placeholder="Description..." />
+    <input type="text" id="description-@priorityId" style="width: 500px; float: left; margin-left: 4px;" class="form-control input-sm" value="@priority.flatMap(_.description).getOrElse("")" placeholder="Description..." />
     <span class="pull-right">
       <span id="priority-error-@priorityId" class="error"></span>
-      <input type="button" id="cancel-@priorityId" class="btn btn-default priority-edit-cancel" value="Cancel">
-      <input type="button" id="submit-@priorityId" class="btn btn-success" style="margin-bottom: 0px;" value="@(if(priorityId == "new") "Create priority"  else "Save changes")"/>
+      <input type="button" id="cancel-@priorityId" class="btn btn-sm btn-default priority-edit-cancel" value="Cancel">
+      <input type="button" id="submit-@priorityId" class="btn btn-sm btn-success" style="margin-bottom: 0px;" value="@(if(priorityId == "new") "Create priority"  else "Save changes")"/>
     </span>
   </form>
 </div>
diff --git a/src/main/twirl/gitbucket/core/issues/priorities/list.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/list.scala.html
index f3e481658..4d0880d3e 100644
--- a/src/main/twirl/gitbucket/core/issues/priorities/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/priorities/list.scala.html
@@ -7,7 +7,7 @@
   @gitbucket.core.html.menu("priorities", repository){
     @if(hasWritePermission){
       <div class="pull-right" style="margin-bottom: 10px;">
-        <a class="btn btn-success" href="javascript:void(0);" id="new-priority-button">New priority</a>
+        <a class="btn btn-success btn-sm" href="javascript:void(0);" id="new-priority-button">New priority</a>
       </div>
     }
     <table class="table table-bordered table-hover table-issues" id="new-priority-table" style="display: none;">
diff --git a/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html b/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html
index 637b11a83..e607a10bb 100644
--- a/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/priorities/priority.scala.html
@@ -10,9 +10,9 @@
         @if(hasWritePermission) {
         <div class="pull-left priority-sort-handle" style="margin-top: 3px"><i class="octicon octicon-grabber"></i></div>
         }
-        <div style="margin-top: 6px">
+        <div>
           <a href="@helpers.url(repository)/issues?priority=@helpers.urlEncode(priority.priorityName)&state=open" id="priority-row-content-@priority.priorityId">
-            <span style="background-color: #@priority.color; color: #@priority.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
+            <span style="background-color: #@priority.color; color: #@priority.fontColor; padding: 8px; border-radius: 4px;">
               <i class="octicon octicon-flame" style="color: #@priority.fontColor;"></i>&nbsp;@priority.priorityName
             </span>
           </a>