diff --git a/_server/css/editor_mobile.css b/_server/css/editor_mobile.css index 80f3b9d5..0d946075 100644 --- a/_server/css/editor_mobile.css +++ b/_server/css/editor_mobile.css @@ -1,5 +1,5 @@ html{ - font-size: 4vmin; + font-size: 4vw; } input, textarea, select, button { font-size: 1rem; @@ -29,8 +29,8 @@ body { box-sizing: border-box; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12); */ background-color: #F5F5F5; - width: 100vmin; - height: 100vmin; + width: 100vw; + height: 100vw; } #left { @@ -84,14 +84,14 @@ body { .map { position: absolute; - left: 4vmin; - top: 4vmin; - width: 96vmin; - height: 96vmin; + left: 4vw; + top: 4vw; + width: 96vw; + height: 96vw; } .map canvas{ - width: 96vmin; - height: 96vmin; + width: 96vw; + height: 96vw; } #mid .tools { @@ -200,8 +200,8 @@ body { #iconLib { position: absolute; - width: 100vmin; - height: 100vmin; + width: 100vw; + height: 100vw; left: 5px; top: 5px; overflow: auto; @@ -249,7 +249,7 @@ body { } td { - border: 0.230vmin solid #fff; + border: 0.230vw solid #fff; color: #fff; cursor: crosshair; } @@ -279,15 +279,15 @@ table.col td { #mapColMark { top: 0; - left: 4vmin; - width: 96vmin; - height: 4vmin; - font-size: 3vmin; + left: 4vw; + width: 96vw; + height: 4vw; + font-size: 3vw; } #mapColMark td { - width: 7.15vmin; + width: 7.15vw; padding: 0; border-bottom-width: 0px; border-top-width: 0px; @@ -295,9 +295,9 @@ table.col td { #mapColMark td:hover .colBlock { position: absolute; - top: 4vmin; - height: 96vmin; - width: 7.15vmin; + top: 4vw; + height: 96vw; + width: 7.15vw; z-index: 100; background-color: rgba(38, 166, 154, .5); } @@ -324,13 +324,13 @@ table.row td { #mapRowMark { top: 0; left: 0; - width: 4vmin; - height: 96vmin; - font-size: 3vmin; + width: 4vw; + height: 96vw; + font-size: 3vw; } #mapRowMark td { - height: 7.15vmin; + height: 7.15vw; padding: 0; border-left-width: 0px; border-right-width: 0px; @@ -338,9 +338,9 @@ table.row td { #mapRowMark td:hover .rowBlock { position: absolute; - left: 4vmin; - height: 7.15vmin; - width: 96vmin; + left: 4vw; + height: 7.15vw; + width: 96vw; z-index: 100; background-color: rgba(76, 34, 27, .5); } @@ -352,7 +352,7 @@ table.row td { border-style: solid; border-width: 1px; cursor: default; - font: normal 2.5vmin Arial, sans-serif; + font: normal 2.5vw Arial, sans-serif; margin: 0; outline: none; padding: 4px 0; @@ -366,7 +366,7 @@ table.row td { } #midMenu .menuitem{ color: #000; - font: normal 2.5vmin Arial, sans-serif; + font: normal 2.5vw Arial, sans-serif; list-style: none; margin: 0; padding: 4px 7em 4px 28px; @@ -386,7 +386,7 @@ table.row td { } #midMenu .menuitem-content{ color: #000; - font: normal 2.5vmin Arial, sans-serif; + font: normal 2.5vw Arial, sans-serif; } /* for vue dom */ @@ -397,7 +397,7 @@ table.row td { #down{ position: absolute; left:0; - top:100vmin; + top:100vw; bottom: 0; - width: 100vmin; + width: 100vw; } \ No newline at end of file diff --git a/_server/css/editor_mode_mobile.css b/_server/css/editor_mode_mobile.css index 29f66d6e..3098df27 100644 --- a/_server/css/editor_mode_mobile.css +++ b/_server/css/editor_mode_mobile.css @@ -3,14 +3,14 @@ box-sizing: border-box; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12); */ background-color: #F5F5F5; - width: 100vmin; - height: 100vmin; + width: 100vw; + height: 100vw; } .leftTab { overflow: auto; position: absolute; - height: 100vmin; + height: 100vw; } .leftTab > * { @@ -28,7 +28,7 @@ .leftTab { left: 0; top: 0; - width: 100vmin; + width: 100vw; } .leftTab .leftTabHeader { @@ -59,15 +59,15 @@ overflow: hidden; } #left6 h3{ - font-size: 3.5vh; - margin: 1vh 0; + font-size: 6vw; + margin: 1.77vw 0; } #left6 #blocklyArea { - width: 100vmin; - height: 60vh; + width: 100vw; + height: 100vw; } #left6 #blocklyDiv { @@ -77,7 +77,7 @@ #left6 .CodeMirror { border: 1px solid #eee; - height: 21vh; + height: 38vw; width: 100%; } @@ -88,10 +88,10 @@ } #left6 #blocklyDiv .blocklyToolboxDiv{ - width:6vmin; + width:6vw; } #left6 #blocklyDiv .blocklyTreeLabel{ - margin-left:-4vmin; + margin-left:-4vw; } #left7 { diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index 75a0ed9b..dfbe4314 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -250,7 +250,7 @@ var onresize = function(e) { blocklyDiv.style.height = blocklyArea.offsetHeight + 'px'; Blockly.svgResize(workspace); }; -window.addEventListener('resize', onresize, false); +if(typeof editor !== "undefined" && !editor.isMobile)window.addEventListener('resize', onresize, false); onresize(); //Blockly.svgResize(workspace);