Merge pull request #80 from easycoder/dev

Development

Author: easycoder

iwsy/iwannashowyou.js renamed to iwsy/iwsy.js

@@ -52,10 +52,10 @@ Restart:
 
 	clear Panel
     create Row in Panel
-    set the style of Row to `display:flex;margin-top:0.5em`
+    set the style of Row to `display:flex`
     create Title in Row
     set the style of Title to
-    	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center`
+    	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center;margin-bottom:0.5em`
     set the content of Title to `Blocks`
     create Cell in Row
     set the style of Cell to `width:1.4em;text-align:center`
@@ -86,7 +86,7 @@ Restart:
     set the elements of Editor to N
     set the elements of DeleteBlock to N
     create Table in Panel
-    if N is greater than 0 set the style of Table to `width:100%;border:1px solid black`
+    set the style of Table to `width:100%`
     put 0 into B
     while B is less than the elements of EditButton
     begin

iwsy/resources/ecs/blocks.txt

@@ -54,10 +54,10 @@ Restart:
 
 	clear Panel
     create Row in Panel
-    set the style of Row to `display:flex;margin-top:0.5em`
+    set the style of Row to `display:flex`
     create Title in Row
     set the style of Title to
-    	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center`
+    	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center;margin-bottom:0.5em`
     set the content of Title to `Content Items`
     create Cell in Row
     set the style of Cell to `width:1.4em;text-align:center`
@@ -81,7 +81,7 @@ Restart:
     set the elements of TypeSelect to N
     set the elements of TextArea to N
     create Table in Panel
-    if N is greater than 0 set the style of Table to `width:100%;border:1px solid black`
+    set the style of Table to `width:100%`
     put 0 into B
     while B is less than the elements of EditButton
     begin

iwsy/resources/ecs/content.txt

@@ -1,6 +1,6 @@
-!	Mostrami
+!	IWSY
 
-	script Mostrami
+	script IWSY
 
     div Body
     div Left
@@ -85,26 +85,36 @@ L2:
     	if mobile set Mobile else clear Mobile
     end
 
-    set the title to `Mostrami Pro`
+    set the title to `IWSY`
     create Body
     if Mobile
 	    set the style of Body to `width:100%;height:100%`
     else
 	    set the style of Body to `width:100%;height:100%;display:flex`
 
     create Left in Body
-	set the style of Left to `flex:1;height:100%;display:flex;flex-direction:column;overflow:hidden`
+	set the style of Left to
+    	`flex:1;height:100%;display:flex;flex-direction:column;border-right:1px solid black;margin-right:0.5em`
 
     create Right in Body
-	set the style of Right to `flex:1;height:100%;display:flex;flex-direction: column`
+	set the style of Right to `flex:1;height:100%;display:flex;flex-direction:column;overflow:hidden`
 
     create Controls in Left
-    set the style of Controls to `flex:1;background:lightgray;padding:0 0.5em`
+    set the style of Controls to `flex:1;padding:0 0.5em`
 
     create Buttons in Controls
     set the style of Buttons to `width:100%;padding:0.5em 0`
 
-	create ContentDiv in Left
+    create ScriptName in Controls
+    set the style of ScriptName to `display:flex`
+    if Mobile set style `display` of ScriptName to `none`
+    create Span in ScriptName
+    set the style of Span to `flex:15`
+    set the content of Span to `Script name: `
+    create NameEditor in ScriptName
+    set the style of NameEditor to `flex:85;display:inline-block`
+
+	create ContentDiv in Right
     set the style of ContentDiv to `width:100%;height:100%;position:relative`
 
     create Link in Buttons
@@ -140,17 +150,8 @@ L2:
     create Status in Buttons
     if Mobile set the style of Status to `height:1em`
     else set the style of Status to `float:right;margin:0.5em 0 0 0;color:green`
-
-    create ScriptName in Controls
-    set the style of ScriptName to `display:flex`
-    if Mobile set style `display` of ScriptName to `none`
-    create Span in ScriptName
-    set the style of Span to `flex:15`
-    set the content of Span to `Script name: `
-    create NameEditor in ScriptName
-    set the style of NameEditor to `flex:85;display:inline-block`
 
-    create Tabs in Controls
+    create Tabs in ContentDiv
     set the style of Tabs to `width:100%;padding:0.5em 0;text-align:center`
     put the width of Tabs into N
     divide N by 3
@@ -162,23 +163,23 @@ L2:
     set the style of SectionButton to `width:100%`
     set the content of SectionButton to `Steps`
     create StepsPanel in ContentDiv
-    set the style of StepsPanel to `position:absolute;left:0;top:0;width:100%;height:100%;`
+    set the style of StepsPanel to `position:absolute;left:0;top:2.5em;width:100%;height:calc(100% - 2.5em)`
     create Tab in Tabs
     set the style of Tab to `display:inline-block;width:` cat N cat `px`
     index SectionButton to 1
     create SectionButton in Tab
     set the style of SectionButton to `width:100%`
     set the content of SectionButton to `Blocks`
     create BlocksPanel in ContentDiv
-    set the style of BlocksPanel to `position:absolute;left:0;top:0;width:100%;height:100%;`
+    set the style of BlocksPanel to `position:absolute;left:0;top:2.5em;width:100%;height:calc(100% - 2.5em)`
     create Tab in Tabs
     set the style of Tab to `display:inline-block;width:` cat N cat `px`
     index SectionButton to 2
     create SectionButton in Tab
     set the style of SectionButton to `width:100%`
     set the content of SectionButton to `Content`
     create ContentPanel in ContentDiv
-    set the style of ContentPanel to `position:absolute;left:0;top:0;width:100%;height:100%;`
+    set the style of ContentPanel to `position:absolute;left:0;top:2.5em;width:100%;height:calc(100% - 2.5em)`
     create Tab in Tabs
     set the style of Tab to `display:inline-block;width:` cat N cat `px`
 

iwsy/resources/ecs/main.txt

@@ -66,7 +66,7 @@
     put -1 into SelectedStep
 
     create StepsPanel in Panel
-	set the style of StepsPanel to `flex:1;overflow-y:scroll;margin-top:0.5em`
+	set the style of StepsPanel to `flex:1;overflow-y:scroll`
 
     on message go to Start
     set ready
@@ -92,7 +92,7 @@ Restart:
     set the style of Row to `display:flex`
     create Title in Row
     set the style of Title to
-    	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center`
+    	`flex:1;font-size:110%;font-weight:bold;background:lightgray;text-align:center;margin-bottom:0.5em`
     set the content of Title to `Steps`
     create Cell in Row
     set the style of Cell to `width:1.4em;text-align:center`
@@ -116,7 +116,7 @@ Restart:
     	create Row in StepsPanel
         set the style of Row to `width:100%`
         create Row1 in Row
-        set the style of Row1 to `display:flex;margin:0.2em 0`
+        set the style of Row1 to `display:flex;margin-bottom:0.2em`
     	create StepButton in Row1
         set the style of StepButton to `flex:1`
         put element N of Steps into CurrentStep