diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index 90c86a9..696ee77 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -2028 \ No newline at end of file +2030 \ No newline at end of file diff --git a/Resources/FLocal/static/css/modern/global.css b/Resources/FLocal/static/css/modern/global.css index a8b2174..a2f65d5 100644 --- a/Resources/FLocal/static/css/modern/global.css +++ b/Resources/FLocal/static/css/modern/global.css @@ -1,4 +1,8 @@ -body { font-size:13.5pt; } +body { + font-size:13.5pt; + margin:0; + padding:0; +} FORM{ DISPLAY:inline; @@ -30,7 +34,7 @@ pre overflow-x: auto; overflow-y: hidden; margin: 10px; - width: 99%; + width: 97%; font-family:Consolas, monospace; } diff --git a/Resources/FLocal/static/js/modern.js b/Resources/FLocal/static/js/modern.js index 9b0c0e2..809b6ae 100644 --- a/Resources/FLocal/static/js/modern.js +++ b/Resources/FLocal/static/js/modern.js @@ -26,4 +26,27 @@ function getChildrenHider(elem) { function hideChildren(elem) { clearTimeout(elem.interval); elem.interval = setTimeout(getChildrenHider(elem), 200); -} \ No newline at end of file +} + +function makeMainboxScrollable() { + if(window.innerHeight > 0) { + var height = window.innerHeight; + height -= document.getElementById("headerContainer").clientHeight; + var width = window.innerWidth; + width -= document.getElementById("bjAndSlutsContainer").clientWidth; + var mainbox = document.getElementById("contentContainer"); + mainbox.style.overflow = "auto"; + mainbox.style.height = mainbox.style.maxHeight = height + "px"; + mainbox.style.width = mainbox.style.maxWidth = width + "px"; + } +} + +function onLoad() { + if(typeof(window.addEventListener) == "function") { + makeMainboxScrollable(); + window.addEventListener("resize", makeMainboxScrollable, false); + } + if(typeof(machicharaInit) == "function") { + machicharaInit(); + } +} diff --git a/Resources/FLocal/templates/Modern/elems/Main.xslt b/Resources/FLocal/templates/Modern/elems/Main.xslt index 03a1b6f..90bc628 100644 --- a/Resources/FLocal/templates/Modern/elems/Main.xslt +++ b/Resources/FLocal/templates/Modern/elems/Main.xslt @@ -8,18 +8,18 @@ - + [if lte IE 7]> + ]]><![endif] - /static/css/modern/.css?v6.4 + /static/css/modern/.css?v6.5 - - + + - +