From d70c5947fa28ab233080fb60c7b6894afaf05097 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Wed, 24 May 2017 18:31:20 +0900
Subject: [PATCH] Fix CSS

---
 .../gitbucket/core/issues/list.scala.html     |  2 ++
 .../gitbucket/core/repo/upload.scala.html     | 22 ++----------
 .../webapp/assets/common/css/gitbucket.css    | 35 +++++++++++++++----
 3 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/issues/list.scala.html b/src/main/twirl/gitbucket/core/issues/list.scala.html
index 70d2f39ee..e90eb65e6 100644
--- a/src/main/twirl/gitbucket/core/issues/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/list.scala.html
@@ -51,6 +51,7 @@
 @if(isManageable){
 <script>
 $(function(){
+  @*
   $('a.header-link').mouseover(function(e){
     var target = e.target;
     if(e.target.tagName != 'A'){
@@ -70,6 +71,7 @@ $(function(){
     $(target).children('img.header-icon-hover').css('display', 'none');
     $(target).children('img.header-icon'      ).css('display', 'inline');
   });
+  *@
 
   $('.table-issues input[type=checkbox]').change(function(){
     var all = $('.table-issues input[type=checkbox][value]');
diff --git a/src/main/twirl/gitbucket/core/repo/upload.scala.html b/src/main/twirl/gitbucket/core/repo/upload.scala.html
index 8cc7ff3ae..e2ee77e06 100644
--- a/src/main/twirl/gitbucket/core/repo/upload.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/upload.scala.html
@@ -10,21 +10,18 @@
       <div class="alert alert-danger">branch @branch is protected.</div>
     }
     <form method="POST" action="@helpers.url(repository)/upload" id="upload-form">
-      @*
-      <span class="error" id="error-newFileName"></span>
-      *@
       <div class="head">
         <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)">@repository.name</a> /
         @pathList.zipWithIndex.map { case (section, i) =>
-        <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+          <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
         <input type="hidden" name="branch" id="branch" value="@branch"/>
         <input type="hidden" name="path" id="path" value="@pathList.mkString("/")"/>
       </div>
       <table class="table table-bordered">
         <tr>
-          <td style="padding: 0px; background-color: #f4f4f4; border: 1px #ddd solid;">
-            <div id="upload-area" style="text-align: center; padding-top: 20px; padding-bottom: 20px; font-size: 120%;">
+          <td id="upload-td">
+            <div id="upload-area">
               Drag files here to add them to your repository
             </div>
             <ul id="upload-files">
@@ -50,19 +47,6 @@
     </form>
   }
 }
-<style type="text/css">
-ul#upload-files {
-  list-style: none;
-  padding-left: 0px;
-  margin-bottom: 0px;
-}
-
-li.upload-file {
-  border-top: 1px #f4f4f4 solid;
-  background-color: white;
-  padding: 4px;
-}
-</style>
 <script>
 $(function(){
   $('#upload-area').dropzone({
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 9de569b9d..232d32c68 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -450,13 +450,6 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{
 .branches .muted-link:hover{
   color: #4183c4;
 }
-/*
-.branches .branch-details{
-  display: inline-block;
-  width: 490px;
-  margin-right: 10px;
-}
-*/
 .branches .branch-name{
   color: #4183c4;
   display: inline-block;
@@ -487,6 +480,32 @@ table.branches>thead>tr>th, table.branches>tbody>tr>td{
   padding: 0 3px;
 }
 
+td#upload-td {
+  padding: 0px;
+  background-color: #f4f4f4;
+  border: 1px #ddd solid;
+}
+
+div#upload-area {
+  text-align: center;
+  padding-top: 40px;
+  padding-bottom: 40px;
+  font-size: 120%;
+}
+
+ul#upload-files {
+  list-style: none;
+  padding-left: 0px;
+  margin-bottom: 0px;
+}
+
+li.upload-file {
+  border-top: 1px #f4f4f4 solid;
+  background-color: white;
+  padding: 4px;
+}
+
+
 /****************************************************************************/
 /* Activity */
 /****************************************************************************/
@@ -501,6 +520,7 @@ p.description {
   color: gray;
 }
 
+/*
 a.header-link {
   color: #888;
   font-size: 90%;
@@ -533,6 +553,7 @@ a.header-link:hover i.octicon-x{
     background-color: #4183c4;
     color: #FFF;
 }
+*/
 
 table.table-file-list td.latest-commit {
   padding-top: 4px;