From 66c35b7b3ea79a6ddf0e8951a4dd3f87a50d1271 Mon Sep 17 00:00:00 2001
From: Joe Reeve <joseph.reeve@googlemail.com>
Date: Tue, 18 Jun 2019 10:01:42 +0100
Subject: [PATCH] Fix alignment, improve search box appearance

---
 static/server/taskbar.css       | 44 +++++++++++++++++++++++++++------
 static/server/taskbar.html.part | 13 +++++++---
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/static/server/taskbar.css b/static/server/taskbar.css
index 96b38db..fdaca98 100644
--- a/static/server/taskbar.css
+++ b/static/server/taskbar.css
@@ -7,6 +7,8 @@
     z-index:100;
     background-position-y: 0px;
     transition: 0.3s;
+    width: 100%;
+    box-sizing: border-box;
 }
 
 #kiwixtoolbar > a {
@@ -22,9 +24,27 @@
     height: 3em;
 }
 
-#kiwixsearchbox {
+.kiwixsearch {
+    position: relative;
+    height: 26px;
+    width: 100%;
+    left: 0;
+    margin-bottom: 0;
+}
+
+.kiwix_searchform {
     width: 20em;
 }
+#kiwixsearchbox {
+    position: absolute;
+    left: 0;
+    width: 100%;
+}
+#kiwix_serve_taskbar_home_button button {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 160px;
+}
 
 .kiwix .kiwix_centered {
     max-width: 720px;
@@ -92,9 +112,10 @@ li.ui-state-focus {
     font-weight: bold;
 }
 
+
 @media(min-width:415px) {
     .kiwix_button_cont {
-        display: block !important;
+        display: inline-block !important;
     }
     .kiwix_button_cont > a {
         display: inline-block !important;
@@ -103,23 +124,30 @@ li.ui-state-focus {
         display: none;
     }
 }
-
 @media (max-width: 520px) {
     .kiwixsearch {
         margin-top: 5px;
     }
+    .kiwix_button_cont {
+        margin-top: 5px;
+    }
 }
 @media (max-width: 645px) {
+    .kiwix_searchform.full_width {
+        width: 100%;
+    }
     .kiwixsearch {
         float: none;
     }
-    #kiwixsearchbox {
-      width: 65%;
-    }
-    #kiwixsearchform input[type="submit"] {
-        width: 28%;
+    .kiwix_searchform {
+        width: 36%;
     }
     .height_separator {
         height: 6em;
     }
 }
+@media(max-width:415px) {
+    .kiwix_searchform {
+        width: 80%;
+    }
+}
diff --git a/static/server/taskbar.html.part b/static/server/taskbar.html.part
index 8cd2471..2cc862c 100644
--- a/static/server/taskbar.html.part
+++ b/static/server/taskbar.html.part
@@ -4,8 +4,7 @@
       <div class="kiwix_searchform">
         <form class="kiwixsearch" method="GET" action="__ROOT_LOCATION__/search" id="kiwixsearchform">
           <input type="hidden" name="content" value="__CONTENT__" />
-          <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text">
-          <input type="submit" value="&#x1f50d;">
+          <input autocomplete="off" class="ui-autocomplete-input" id="kiwixsearchbox" name="pattern" type="text" placeholder="&#x1f50d;">
         </form>
       </div>
       <input type="checkbox" id="button_show_toggle">
@@ -56,7 +55,15 @@
 
         lastScrollTop = st;
       }
-
     }
+
+    $('#kiwixsearchbox').on({
+      focus: function(){
+        $('.kiwix_searchform').addClass('full_width');
+      },
+      blur: function(){
+        $('.kiwix_searchform').removeClass('full_width');
+      }
+    });
   })(jQuery);
 </script>
\ No newline at end of file