From 00d6ed7dbb567f686a75dbf9b27f2f54a606cca9 Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Thu, 18 Jul 2013 20:50:42 +0900
Subject: [PATCH] Cleanup search field and global header styles.

---
 src/main/twirl/main.scala.html                |  8 ++----
 .../webapp/assets/common/css/gitbucket.css    | 26 ++++++++++++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html
index c5fca8a4d..21917c52b 100644
--- a/src/main/twirl/main.scala.html
+++ b/src/main/twirl/main.scala.html
@@ -39,13 +39,9 @@
               <span class="icon-bar"></span>
             </button>
             <a class="brand" href="@path/">GitBucket</a>
-            <div class="nav-collapse collapse pull-right">
+            <div class="nav-collapse collapse pull-right header-menu">
               @repository.map { repository =>
-                @if(loginAccount.isDefined){
-                  <input type="text" name="query" style="width: 300px; margin-top: 0px; margin-bottom: 0px;" placeholder="Search this repository"/>
-                } else {
-                  <input type="text" name="query" style="width: 300px; margin-top: 5px; margin-bottom: 0px;" placeholder="Search this repository"/>
-                }
+                <input type="text" name="query" style="width: 300px; margin-bottom: 0px;" placeholder="Search this repository"/>
                 <input type="hidden" name="owner" value="@repository.owner"/>
                 <input type="hidden" name="repository" value="@repository.name"/>
               }
diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css
index 6c525b318..2e7d1a87c 100644
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -5,6 +5,9 @@ body {
   color: #333;
 }
 
+/* ======================================================================== */
+/* Global Header */
+/* ======================================================================== */
 div.navbar-inner {
   border-radius: 0px;
   -webkit-border-radius: 0px;
@@ -16,18 +19,23 @@ div.navbar-inner {
   padding-right: 0px;
 }
 
+div.header-menu {
+  line-height: 40px;
+}
+
+div.header-menu input,
+div.header-menu a.btn {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+
 div.nav-collapse a.menu {
   margin-right: 12px;
-  line-height: 40px;
-}
-
-div.nav-collapse a.btn-last {
-  margin-right: 30px;
 }
 
+div.nav-collapse a.btn-last,
 div.nav-collapse a.menu-last {
   margin-right: 30px;
-  line-height: 40px;
 }
 
 div.gitbucket-version {
@@ -37,6 +45,9 @@ div.gitbucket-version {
   margin-right: 10px;
 }
 
+/* ======================================================================== */
+/* Repository Header */
+/* ======================================================================== */
 table.global-nav {
   width: 920px;
   margin-bottom: 10px;
@@ -59,6 +70,9 @@ table.global-nav th a:link, table.global-nav th a:hover, table.global-nav th a:v
   text-decoration: none;
 }
 
+/* ======================================================================== */
+/* General Styles */
+/* ======================================================================== */
 div.head {
   font-size: large;
   margin-bottom: 10px;