Merge branch 'master', remote branch 'origin'

[kivitendo-erp.git] / css / lx-office-erp / menu.css

diff --git a/css/lx-office-erp/menu.css b/css/lx-office-erp/menu.css
index 812999a..469d9de 100644 (file)
--- a/css/lx-office-erp/menu.css
+++ b/css/lx-office-erp/menu.css
@@ -115,13 +115,11 @@ position:absolute;
 z-index:500;
 top:auto;
 display:none;
-background:#000;
 }
 
 #menuv3 ul ul ul {
 top:0;
 left:100%;
-background:#000;
 }
 
 /* Begin non-anchor hover selectors */
@@ -176,12 +174,6 @@ margin:0;
 padding:1px 0 1px 3px;
 }
 
-#menuv4 h2:before {
-    content:" ";
-}
-#menuv4 h2:after {
-    content:" ";
-}
 #menuv4 h2 {
 color:#fff;
 padding:2px 10px;
@@ -223,11 +215,6 @@ float:none;
 border:0;
 }
 
-#menuv4 li.sub {
-left:-25px;
-top:-3px;
-}
-
 /* IE6 spacing bug fix, <li>s without a bottom border get spaced to far
  * correction: the bug will change the height of the parent element! this will also cause the whole menu to grow
  * so the only method to get this pile of crap going is to add a bottom border to the <li>s, where the enclosing <ul> already has
@@ -255,7 +242,7 @@ display:none;
 
 #menuv4 ul ul ul {
 top:0;
-left:100%;
+left:90%;
 }
 
 /* Begin non-anchor hover selectors */
@@ -286,7 +273,7 @@ div#menuv4 li:hover ul,
 div#menuv4 li li:hover ul,
 div#menuv4 li li li:hover ul,
 div#menuv4 li li li li:hover ul
-{display:block; left:10px;}
+{display:block;}
 
 /* End of non-anchor hover selectors */
 
@@ -295,12 +282,23 @@ div#menuv4 li li li li:hover ul
    each line is a mi (menuitem) and has one mii (menu-item-icon) whcih is ms (menu-spacer)
    and one mic (menu-item-chunk)
    indenting is done with the levels s0, s1, s2 */
-#html-menu { float:left; width: 183px; font-size: 8pt }
+#content.html-menu, #html-menu {
+  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;
+  -o-transition:      margin-left 0.2s, width 0.2s;
+}
+#content.html-menu { margin-left: 190px; }
+#content.html-menu.folded { margin-left: 40px }
+#html-menu.folded:hover + #content.html-menu.folded { margin-left: 190px }
+#html-menu { float:left; width: 183px; font-size: 8pt; margin-top: 10px; overflow:hidden; }
+#html-menu.folded { width: 32px; }
+#html-menu.folded:hover { width: 183px; }
 #html-menu div.mi { margin-top: 4px; margin-bottom: 3px; white-space: nowrap; clear:both; position:relative; }
 #html-menu div.sm { font-weight: bold }
 #html-menu img { vertical-align: top; border: 0; }
 #html-menu a { vertical-align: top }
-#html-menu .i span.ms { float: left; width: 24px }
+#html-menu .i span.ms { float: left; width: 24px; margin-bottom: 4px; }
 #html-menu .m span.ms { float: left; width: 32px }
 #html-menu .sm span.ms { float: left; width: 24px; background: url(../../image/unterpunkt.png); }
 #html-menu div.m { height: 24px }
@@ -313,6 +311,12 @@ div#menuv4 li li li li:hover ul
 #html-menu div.s1 { padding-left: 8px }
 #html-menu div.s2 { padding-left: 16px }
 
-#content { margin-left: 190px }
-
 body { margin: 0 }
+
+
+@media print {
+  #menuv3, #menuv4, #html-menu, #frame-header, #js-menu {   /* items with this class won't print */
+    display: none;
+  }
+  #content.html-menu { margin-left: 0; }
+}