Merge branch 'frameless_w_fixed_header-div'

diff --git a/css/kivitendo/menu.css b/css/kivitendo/menu.css
index 2abe56f..ae1c213 100644 (file)
--- a/css/kivitendo/menu.css
+++ b/css/kivitendo/menu.css
@@ -290,6 +290,8 @@ div#menuv3 li:hover ul, div#menuv3 li li:hover ul, div#menuv3 li li li:hover ul,
    and one mic (menu-item-chunk)
    indenting is done with the levels s0, s1, s2 */
 #content.html-menu, #html-menu {
+  position: relative;
+  top: 20px;
   transition:         margin-left 0.2s, width 0.2s;
   -moz-transition:    margin-left 0.2s, width 0.2s;
   -webkit-transition: margin-left 0.2s, width 0.2s;

diff --git a/css/lx-office-erp/frame_header/header.css b/css/lx-office-erp/frame_header/header.css
index 852a76c..1e96c98 100644 (file)
--- a/css/lx-office-erp/frame_header/header.css
+++ b/css/lx-office-erp/frame_header/header.css
@@ -8,6 +8,9 @@
 }
 
 #frame-header {
+  position: fixed; 
+  top: 0px;
+  z-index: 99;
   background: url('../../../image/bg_titel.gif') repeat-x;
   text-align: center;
   margin: 0;

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index 19f98b2..ac73a9e 100644 (file)
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -296,6 +296,8 @@ div#menuv4 li li li li:hover ul
    and one mic (menu-item-chunk)
    indenting is done with the levels s0, s1, s2 */
 #content.html-menu, #html-menu {
+  position: relative;
+  top: 20px;
   transition:         margin-left 0.2s, width 0.2s;
   -moz-transition:    margin-left 0.2s, width 0.2s;
   -webkit-transition: margin-left 0.2s, width 0.2s;