header css: Schnellsuchen überlagern nicht mehr den rechten Block

behebt #268

diff --git a/css/kivitendo/frame_header/header.css b/css/kivitendo/frame_header/header.css
index 6eda3f0..884392e 100644 (file)
--- a/css/kivitendo/frame_header/header.css
+++ b/css/kivitendo/frame_header/header.css
@@ -6,9 +6,8 @@
 }
 
 #frame-header {
-  text-align: center;
+  text-align: left;
   margin: 0;
-  padding: 0;
   border: 0;
   overflow: hidden;
   height: 20px;
@@ -19,6 +18,7 @@
   top: 0;
   z-index: 40;
   background-color: white;
+  line-height: 100%;
 }
 
 #frame-header + div {
@@ -27,9 +27,12 @@
 
 #frame-header .frame-header-left {
   float: left;
+  margin-right: 10px;
+  margin-top: 2px;
 }
 #frame-header .frame-header-right {
   float: right;
+  margin-top: 2px;
 }
 
 #frame-header .frame-header-left,
@@ -42,15 +45,14 @@
 }
 
 #frame-header .frame-header-right {
-  margin-top: 3px;
+  vertical-align: middle;
 }
 
 #frame-header #ajax-spinner {
-  margin-top: 2px;
-  margin-right: 10px;
   display: none;
 }
 
 #frame-header input {
   font-size: 12px;
+  margin-top: 2px;
 }

diff --git a/css/lx-office-erp/frame_header/header.css b/css/lx-office-erp/frame_header/header.css
index 33f9ff3..5bddf6e 100644 (file)
--- a/css/lx-office-erp/frame_header/header.css
+++ b/css/lx-office-erp/frame_header/header.css
@@ -9,9 +9,8 @@
 
 #frame-header {
   background-color: #d0cfc9;
-  text-align: center;
+  text-align: left;
   margin: 0;
-  padding: 0;
   color: black;
   border: 0;
   overflow: hidden;
@@ -30,6 +29,7 @@
 
 #frame-header .frame-header-left {
   float: left;
+  margin-right: 10px;
 }
 #frame-header .frame-header-right {
   float: right;
@@ -46,12 +46,10 @@
 }
 
 #frame-header .frame-header-right {
-  margin-top: 3px;
+  vertical-align: middle;
 }
 
 #frame-header #ajax-spinner {
-  margin-top: 2px;
-  margin-right: 10px;
   display: none;
   width: 16px;
   height: 16px;
@@ -61,4 +59,5 @@
 
 #frame-header input {
   font-size: 100%;
+  margin-top: 1px;
 }

diff --git a/templates/webpages/menu/header.html b/templates/webpages/menu/header.html
index f566af7..09db656 100644 (file)
--- a/templates/webpages/menu/header.html
+++ b/templates/webpages/menu/header.html
@@ -5,11 +5,6 @@
  <span class="frame-header-element frame-header-left">
     [<a href="controller.pl?action=LoginScreen/user_login" target="_blank" title="[% 'Open a further kivitendo window or tab' | $T8 %]">[% 'New window/tab' | $T8 %]</a>]
     [<a href="JavaScript:top.print();" title="[% 'Hardcopy' | $T8 %]">[% 'Print' | $T8 %]</a>]
-
-[%- FOREACH search = quick_search.enabled_modules %]
-    [<input id="top-quick-search-[% search.name %]" module="[% search.name %]" placeholder="[% search.description_field %]" maxlength="20">]
-[%- END %]
-
  </span>
 [%- END %]
  <span class="frame-header-element frame-header-right">
@@ -18,7 +13,11 @@
    <a href="controller.pl?action=LoginScreen/logout" target="_top" title="[% 'Logout now' | $T8 %]">[% 'Logout' | $T8 %]</a>]
  </span>
  <span class="frame-header-element frame-header-right" id="ajax-spinner">
-  <img src="image/[% IF MYCONFIG.stylesheet == 'lx-office-erp.css' %]spinner-blue.gif[% ELSE %]spinner-white.gif[% END %]" alt="[% LxERP.t8('Loading...') %]">
+  <img src="image/spinner-white.gif" alt="[% LxERP.t8('Loading...') %]">
  </span>
+[%- FOREACH search = quick_search.enabled_modules %]
+   <span class='frame-header-quicksearch'><input id="top-quick-search-[% search.name %]" module="[% search.name %]" placeholder="[% search.description_field %]" maxlength="20"></span>
+[%- END %]
+
 </div>
 [%- END %]