@robotical/martyblocksjr 1.0.2 → 1.0.5

package/editions/free/src/css/editor.css

@@ -51,12 +51,12 @@ div.frame {
 *.rightpanel {
     position: absolute;
     top: ${css_vh(0)};
-    right: ${css_vh(5.73)};
+    right: ${css_vh_ratio_adj(5.73)};
     margin: ${css_vh(0)};
     padding: ${css_vh(0)};
     display: inline-block;
-    height: ${css_vh(61.20)};
-    width: ${css_vh(21.09)};
+    height: ${css_vh_ratio_adj(61.20)};
+    width: ${css_vh_ratio_adj(21.09)};
 }
 
 /* Pages Thumbnails */
@@ -255,7 +255,7 @@ div.frame {
     position: relative;
     margin: ${css_vh(0)} ${css_vh(0)} ${css_vh(0)};
     height: ${64 * scaleMultiplier}px;
-    width: ${678 * scaleMultiplier}px;
+    width: ${800 * scaleMultiplier}px;
     z-index:4;
     overflow: hidden;
 }
@@ -382,7 +382,7 @@ z-index: 5;
 .controlundo {
     position: absolute;
     display: inline-block;
-    top: -${css_vh(10)};
+    top: ${css_vh(0.91)};
     right: ${css_vh(1)};
     margin: ${css_vh(0.00)};
     padding: ${css_vh(0.00)};

package/editions/free/src/css/editorleftpanel.css

@@ -3,9 +3,8 @@
 .flipme {
     position: absolute;
     margin: 0px;
-    margin-top: 50px;
     padding: 0px;
-    top: ${css_vh(0.13)};
+    top: ${css_vh(10.38)};
     left: ${css_vh(1.69)};
     background:  url('../assets/ui/scratchjr-home.svg');
     background-repeat: no-repeat;
@@ -35,9 +34,9 @@
     font-size: 0.7em;
     font-weight: bold;
     top: ${css_vh(0.13)};
-    left: ${css_vh(1.69+10)};
+    left: ${css_vw(5)};
     /*width: ${css_vh(29.95)};*/
-    width: ${css_vh(21.95)};
+    width: ${css_vw(12.95)};
     /*height: ${css_vh(5.20)};*/
     height: ${css_vh(8.38)};
 }
@@ -78,9 +77,9 @@
     display: inline-block;
     margin: 0px;
     padding: 0px;
-    /*top: ${css_vh(9.38)};*/
+    /* top: ${css_vh(9.38)}; */
     top: ${css_vh(19.38)};
-    width: ${css_vh(33.85)};
+    width: ${css_vh_ratio_adj(33.85)};
     overflow-x: hidden;
 }
 
@@ -93,9 +92,9 @@
     display: block;
     overflow-y: scroll;
     overflow-x: hidden;
-    width: ${css_vh(33.85)};
+    width: ${css_vh_ratio_adj(33.85)};
     /*max-height: ${css_vh(40.63)};*/
-    max-height: ${css_vh(30.47)};
+    max-height: ${css_vh_ratio_adj(30.47)};
 }
 
 .spritethumbs::-webkit-scrollbar {
@@ -104,9 +103,9 @@
 
 #library .spritethumbs .spritecc{
     position: relative;
-    margin: 0px ${css_vh(2.34)} 0px;
+    margin: 0px ${css_vh_ratio_adj(2.34)} 0px;
     padding: 0px;
-    width:  ${css_vh(29.95)};
+    width: ${css_vh_ratio_adj(29.95)};
 }
 
 #library .addsprite {
@@ -114,9 +113,9 @@
     display: inline-block;
     background:  url('../assets/ui/newsprite2.png') no-repeat left top;
     background-size: 100%;
-    width:  ${css_vh(23.18)};
-    height: ${css_vh(10.29)};
-    margin: 0px ${css_vh(2.34)} 0px;
+    width: ${css_vh_ratio_adj(23.18)};
+    height: ${css_vh_ratio_adj(10.29)};
+    margin: 0px ${css_vh_ratio_adj(2.34)} 0px;
 }
 
 #library .martymode {
@@ -124,9 +123,9 @@
     display: inline-block;
     background:  url('../assets/ui/martyMode.png') no-repeat left top;
     background-size: 100%;
-    width: ${css_vh(10.29)};
-    height: ${css_vh(10.29)};
-    margin: 0px ${css_vh(2.34)} 0px;
+    width: ${css_vh_ratio_adj(10.29)};
+    height: ${css_vh_ratio_adj(10.29)};
+    margin: 0px ${css_vh_ratio_adj(2.34)} 0px;
 }
 
 #library .buttonwrapper {
@@ -141,10 +140,10 @@
     display: inline-block;
     background:  url('../assets/ui/scatchJrLogo.png') no-repeat left top;
     background-size: 100%;
-    width: ${css_vh(10.29)};
+    width: ${css_vh_ratio_adj(10.29)};
     /*height: ${css_vh(8.33)};*/
-    height: ${css_vh(10.29)};
-    margin: 0px ${css_vh(2.34)} 0px;
+    height: ${css_vh_ratio_adj(10.29)};
+    margin: 0px ${css_vh_ratio_adj(2.34)} 0px;
 }
 
 
@@ -155,39 +154,39 @@
     position: relative;
     display: inline-block;
     word-spacing: -1;
-    width: ${css_vh(29.95)};
-    height: ${css_vh(10.16)};
+    width: ${css_vh_ratio_adj(29.95)};
+    height: ${css_vh_ratio_adj(10.16)};
     margin: 0px;
-    margin-bottom: ${css_vh(-0.39)};
+    margin-bottom: ${css_vh_ratio_adj(-0.39)};
     padding: 0px;
 }
 
 .spritethumb .thumbcanvas{
     position: absolute;
-    margin: ${css_vh(0.65)} ${css_vh(0.65)} 0px;
+    margin: ${css_vh_ratio_adj(0.65)} ${css_vh_ratio_adj(0.65)} 0px;
     padding: 0px;
 }
 
 .spritethumb.off {
     background: url('../assets/ui/viewOff.png') no-repeat left top;
-    background-size: ${css_vh(23.18)};
+    background-size: ${css_vh_ratio_adj(23.18)};
 }
 
 .spritethumb.off.target {
     background: url('../assets/ui/viewOffTarget.png') no-repeat left top;
-    background-size: ${css_vh(23.18)};
+    background-size: ${css_vh_ratio_adj(23.18)};
 }
 
 .spritethumb.on.target {
     background: url('../assets/ui/viewOnTarget.png') no-repeat left top;
     background-size: 100%;
-    width: ${css_vh(29.95)};
+    width: ${css_vh_ratio_adj(29.95)};
 }
 
 .spritethumb.on {
     background: url('../assets/ui/viewOn.png') no-repeat left top;
     background-size: 100%;
-    width: ${css_vh(29.95)};
+    width: ${css_vh_ratio_adj(29.95)};
 }
 
 .spritethumb.noneditable {
@@ -199,8 +198,8 @@
     position: absolute;
     margin: 0px 0px 0px;
     left: 0px;
-    width: ${css_vh(5.86)};
-    height: ${css_vh(5.73)};
+    width: ${css_vh_ratio_adj(5.86)};
+    height: ${css_vh_ratio_adj(5.73)};
     background: url('../assets/ui/closeit.svg');
     background-size: 100.5%; /* webview pixelates the image unless we do this */
     z-index: 5;
@@ -211,8 +210,8 @@
     position: absolute;
     margin: 0px 0px 0px;
     left: 0px;
-    width: ${css_vh(5.86)};
-    height: ${css_vh(5.73)};
+    width: ${css_vh_ratio_adj(5.86)};
+    height: ${css_vh_ratio_adj(5.73)};
     background: url('../assets/ui/closeit.svg');
     background-size: 100.5%; /* webview pixelates the image unless we do this */
     z-index: 5;
@@ -223,10 +222,10 @@
     position: absolute;
     top: ${css_vh(0.65)};
     left: ${css_vh(1.04)};
-    width: ${css_vh(8.33)};
-    height: ${css_vh(8.33)};
-    margin: ${css_vh(0.00)};
-    padding: ${css_vh(0.00)};
+    width: ${css_vh_ratio_adj(8.33)};
+    height: ${css_vh_ratio_adj(8.33)};
+    margin: ${css_vh_ratio_adj(0.00)};
+    padding: ${css_vh_ratio_adj(0.00)};
     overflow: hidden;
 }
 
@@ -244,39 +243,39 @@
     font-family: Roboto;
     font-weight: bold;
     font-size:  ${css_vh(1.69)};
-    width: ${css_vh(11.97)};
+    width: ${css_vh_ratio_adj(11.97)};
     cursor: default;
     color: #999999;
 }
 
 .spritethumb.off .sname{
     color: #999999;
-    top: ${css_vh(3.52)};
-    left: ${css_vh(9.89)};
-    width: ${css_vh(11.97)};
+    top: ${css_vh_ratio_adj(3.52)};
+    left: ${css_vh_ratio_adj(9.89)};
+    width: ${css_vh_ratio_adj(11.97)};
 }
 
 .spritethumb.on .sname{
     color: #F9A737;
-    top: ${css_vh(3.91)};
-    left: ${css_vh(9.24)};
-    width: ${css_vh(11.97)};
+    top: ${css_vh_ratio_adj(3.91)};
+    left: ${css_vh_ratio_adj(9.24)};
+    width: ${css_vh_ratio_adj(11.97)};
 }
 .spritethumb.noneditable .sname{
     color: #999;
-    top: ${css_vh(3.91)};
-    left: ${css_vh(9.24)};
-    width: ${css_vh(11.97)};
+    top: ${css_vh_ratio_adj(3.91)};
+    left: ${css_vh_ratio_adj(9.24)};
+    width: ${css_vh_ratio_adj(11.97)};
 }
 
 .spritethumb .brush {
     position: absolute;
     background:  url('../assets/paint/paintbrush.svg');
     background-size: ${css_vh(7.03)} ${css_vh(7.03)};
-    width: ${css_vh(7.03)};
-    height: ${css_vh(7.03)};
+    width: ${css_vh_ratio_adj(7.03)};
+    height: ${css_vh_ratio_adj(7.03)};
     top: ${css_vh(1.30)};
-    left: ${css_vh(21.75)};
+    left: ${css_vh_ratio_adj(21.75)};
     margin: 0px;
     padding: 0px;
 }

package/editions/free/src/css/editorstage.css

@@ -14,7 +14,7 @@
 
 .fullscreen.presentationmode#full {
     left: 0px;
-    top: 50px;
+    top: ${css_vh(10.65)};
     background:  url('../assets/ui/fullOn2.svg');
     background-size: 100%;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robotical/martyblocksjr",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "description": "ScratchJr",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/webpack.config.js

@@ -1,6 +1,4 @@
 var WebpackNotifierPlugin = require("webpack-notifier");
-// var { FilerWebpackPlugin } = require('filer/webpack');
-// var fallbackConfig = require("./config-overrides");
 
 module.exports = {
   resolve: {