diff --git a/web/css/styles.fix.css b/web/css/styles.fix.css index dd7ead5b..5a9d1cad 100644 --- a/web/css/styles.fix.css +++ b/web/css/styles.fix.css @@ -683,13 +683,12 @@ b, strong { } .l-content #vstobjects > .l-center { margin-left: 200px; - margin-right: 40px; + margin-right: 240px; padding-top: 0; padding-bottom: 1px; } -.l-content .io-log { - color: #58666f; - border-left: 1px solid #dee5e8; + +.l-content .right_sidebar { width: 240px; position: fixed; display: block; @@ -697,13 +696,24 @@ b, strong { z-index: 98; top: 50px; right: 0px; + box-sizing: border-box; + height: 100%; +} +.l-content .io-log { + color: #58666f; + border-left: 1px solid #dee5e8; + width: 240px; + position: relative; + display: block; + /*overflow-scrolling: auto;*/ + z-index: 98; + top: 0px; + right: 0px; background: #fff; word-break: break-word; overflow: hidden; border-right: 8px solid #e3e3e3; box-sizing: border-box; - /* Firefox */ - /* width */ } .l-content .io-log::-webkit-scrollbar { width: 7px; @@ -788,26 +798,23 @@ b, strong { background: #fbffe0; } - .l-content .io-log2 { color: #58666f; border-left: 1px solid #dee5e8; border-top: 1px solid #cecece; width: 240px; - position: fixed; + position: relative; height: 100%; display: block; /*overflow-scrolling: auto;*/ z-index: 98; - top: 380px; + top: 0px; right: 0px; background: #fff; word-break: break-word; overflow-y: scroll; scrollbar-width: thin; box-sizing: border-box; - /* Firefox */ - /* width */ } .l-content .io-log2::-webkit-scrollbar { width: 7px; diff --git a/web/js/fix.js b/web/js/fix.js index 2a87abc4..e1bdbb34 100644 --- a/web/js/fix.js +++ b/web/js/fix.js @@ -26,15 +26,15 @@ function showIoLog(animate) { $(".l-content .l-center").css("margin-right", 240); $(".to-top").css("right", 285); $(".to-shortcuts").css("right", 330); - $(".io-log").css("right", 0); - $(".io-log2").css("right", 0); + $(".right_sidebar").css("right", 0); + //$(".io-log2").css("right", 0); //$("#myvesta_float").css("margin-right", 280); } else { $(".l-content .l-center").animate({"margin-right": 240}); $(".to-top").animate({"right": 285}); $(".to-shortcuts").animate({"right": 330}); - $(".io-log").animate({"right": 0}); - $(".io-log2").animate({"right": 0}); + $(".right_sidebar").animate({"right": 0}); + //$(".io-log2").animate({"right": 0}); //$("#myvesta_float").animate({"margin-right": 280}); } @@ -53,15 +53,15 @@ function hideIoLog(animate){ $(".l-content .l-center").css("margin-right", 40); $(".to-top").css("right", 85); $(".to-shortcuts").css("right", 130); - $(".io-log").css("right", -200); - $(".io-log2").css("right", -200); + $(".right_sidebar").css("right", -200); + //$(".io-log2").css("right", -200); $("#myvesta_float").css("margin-right", 100); } else { $(".l-content .l-center").animate({"margin-right": 40}); $(".to-top").animate({"right": 85}); $(".to-shortcuts").animate({"right": 130}); - $(".io-log").animate({"right": -200}); - $(".io-log2").animate({"right": -200}); + $(".right_sidebar").animate({"right": -200}); + //$(".io-log2").animate({"right": -200}); $("#myvesta_float").animate({"margin-right": 100}); } } @@ -89,8 +89,8 @@ var iohtml = '
\n' + '
'; $(document).ready(function(){ - var sys_height=$(".io-log").height(); - $(".io-log2").css("top", sys_height+50); + //var sys_height=$(".io-log").height(); + //$(".io-log2").css("top", sys_height+50); setTimeout(function() { iolog = getCookie("iolog"); /* //console.log('cookie: "'+iolog+'"'); diff --git a/web/templates/header.html b/web/templates/header.html index 57273c59..4baa2888 100644 --- a/web/templates/header.html +++ b/web/templates/header.html @@ -9,7 +9,7 @@ - + @@ -165,7 +167,7 @@ foreach ($data as $key => $value) { - +