From 62a3aead5b8ae9b6797759c0cb4d311a21960c93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Lucas?= <sebastien@slucas.fr>
Date: Thu, 10 Oct 2013 22:07:47 +0200
Subject: [PATCH] Handle search box a little better (vertical alignment). re
 #34

---
 styles/style-base.css         | 19 +++++++++++--------
 templates/default/footer.html |  8 ++++----
 templates/default/header.html | 12 +++++-------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/styles/style-base.css b/styles/style-base.css
index 10092c5..514a806 100644
--- a/styles/style-base.css
+++ b/styles/style-base.css
@@ -125,7 +125,7 @@ header {
     display:inline-block;
     color:lightgray;
     text-align: center;
-    vertical-align: bottom;
+    margin: 0 2px;
 }
 
 .submit {
@@ -134,6 +134,7 @@ header {
     background-color: transparent;
     background-image: none;
     border-color: transparent;
+    display: table-cell;
 }
 
 .hicon64{
@@ -144,8 +145,6 @@ header {
 }
 
 .hicon32{
-    font-size: 24px;
-    line-height: 32px;
     width: 32px;
     height: 32px;
 }
@@ -318,16 +317,14 @@ line-height: 100%;
 #tool
 {
 width:100%;
-overflow: hidden;
 }
 
 
 /*-------------Search Aside-------------*/
-#tool input[type=search]
+#tool input[type=text]
 {
 vertical-align: middle;
 width: 100%;
-margin: 3px;
 }
 
 .stop select
@@ -341,10 +338,16 @@ margin: 4px;
 cursor:pointer;
 }
 
+#searchForm {
+display: table;
+padding: 0 2px;
+}
+
 .stop
 {
-display: block;
-overflow: hidden;
+display: table-cell;
+vertical-align: middle;
+width: 100%;
 }
 
 /* =============================================================================
diff --git a/templates/default/footer.html b/templates/default/footer.html
index 4e632fe..8a589d7 100644
--- a/templates/default/footer.html
+++ b/templates/default/footer.html
@@ -1,15 +1,15 @@
 <footer>
     <div class="footleft">
-        <a href="index.php?page=19"><div title="{{=it.c.i18n.customizeTitle}}" class="hicon hicon32"><i class="icon-wrench"></i></div></a>
+        <a href="index.php?page=19"><div title="{{=it.c.i18n.customizeTitle}}" class="hicon hicon32"><i class="icon-wrench icon-2x"></i></div></a>
     </div>
     <div class="footright">
-        <a class="fancyabout" href="{{=it.abouturl}}"><div title="{{=it.c.i18n.aboutTitle}}" class="hicon hicon32"><i class="icon-info-sign"></i></div></a>
+        <a class="fancyabout" href="{{=it.abouturl}}"><div title="{{=it.c.i18n.aboutTitle}}" class="hicon hicon32"><i class="icon-info-sign icon-2x"></i></div></a>
     </div>
     {{? it.isPaginated == 1}}
     <div class="footcenter">
-        {{? it.prevLink != ""}}<a id="prevLink" href="{{=it.prevLink}}" ><div title="{{=it.c.i18n.previousAlt}}" class="hicon hicon32"><i class="icon-angle-left"></i></div></a>{{?}}
+        {{? it.prevLink != ""}}<a id="prevLink" href="{{=it.prevLink}}" ><div title="{{=it.c.i18n.previousAlt}}" class="hicon hicon32"><i class="icon-angle-left icon-2x"></i></div></a>{{?}}
         <p> {{=it.currentPage}} / {{=it.maxPage}} </p>
-        {{? it.nextLink != ""}}<a id="nextLink" href="{{=it.nextLink}}" ><div title="{{=it.c.i18n.nextAlt}}" class="hicon hicon32"><i class="icon-angle-right"></i></div></a>{{?}}
+        {{? it.nextLink != ""}}<a id="nextLink" href="{{=it.nextLink}}" ><div title="{{=it.c.i18n.nextAlt}}" class="hicon hicon32"><i class="icon-angle-right icon-2x"></i></div></a>{{?}}
     </div>
     {{?}}
 </footer>
\ No newline at end of file
diff --git a/templates/default/header.html b/templates/default/header.html
index 193a11d..cfc00c7 100644
--- a/templates/default/header.html
+++ b/templates/default/header.html
@@ -11,24 +11,22 @@
     <div id="tool" {{? it.c.config.server_side_rendering == 0}}style="display: none"{{?}}>
         <div style="float: left; width: 50%">
             <form id="searchForm" action="index.php" method="get">
-                <div  style="float: right">
-                    <button title="{{=it.c.i18n.searchAlt}}" type="submit" class="hicon hicon32 submit">
-                        <i class="icon-search"></i>
-                    </button>
-                </div>
                 <div class="stop">
                     <input type="hidden" name="page" value="9" />
                     {{? it.databaseId != ""}}
                         <input type="hidden" name="db" value="{{=it.databaseId}}" />
                     {{?}}
-                    <input type="search" required="required" name="query" />
+                    <input type="text" data-type="search" required="required" name="query" />
                 </div>
+                <button title="{{=it.c.i18n.searchAlt}}" type="submit" class="hicon hicon32 submit">
+                    <i class="icon-search icon-2x"></i>
+                </button>
             </form>
         </div>
         {{? it.c.config.server_side_rendering == 0}}
         <div id="sortForm" style="float: right; width: 45%; display: none">
             <div style="float: right">
-                <div title="{{=it.c.i18n.sortAlt}}" id="sort" class="hicon hicon32"><i class="icon-sort"></i></div>
+                <div title="{{=it.c.i18n.sortAlt}}" id="sort" class="hicon hicon32"><i class="icon-sort icon-2x"></i></div>
             </div>
             <div class="stop">
                 <select id="sortchoice">