[gui] small fixes, mousemode fix

assets/css/style.css

@@ -35,7 +35,11 @@ h1 {
   padding: 10px;
   width: 540px;
   user-select: none;
-  z-index: -1; }
+  z-index: -1;
+  line-height: 0.8em; }
+  .terminal .line {
+    margin: 0;
+    padding: 0; }
 
 .terminal-main {
   background: black;

assets/sass/style.sass

@@ -33,6 +33,10 @@ h1
 	width: 540px
 	user-select: none
 	z-index: -1
+	line-height: 0.8em
+	.line
+		margin: 0
+		padding: 0
 
 .terminal-main
 	background: black

index.html

@@ -15,14 +15,14 @@ <h1>press space or tap the screen</h1>
 <div class='terminal'>
 <div class='terminal-ghost'></div>
 <div class='options terminal-main'>
-bounds? <span class='option option-bounds active'>y</span>/<span class='option option-bounds'>n</span>
-gravity? <span class='option active'>[wiggly]</span>/<span class='option'>[wigglyInverse]</span>/<span class='option'>[regular]</span>
-collisions? <span class='option option-collisions'>[boring]</span>/<span class='option option-collisions active'>[care]</span>
-type? <span class='option option-type'>[round]</span>/<span class='option active option-type'>[square]</span>
+<p class='line'>bounds? <span class='option option-bounds active'>y</span>/<span class='option option-bounds'>n</span></p>
+<p class='line'>gravity? <span class='option active'>[wiggly]</span>/<span class='option'>[wigglyInverse]</span>/<span class='option'>[regular]</span></p>
+<p class='line'>collisions? <span class='option option-collisions'>[boring]</span>/<span class='option option-collisions active'>[care]</span></p>
+<p class='line'>type? <span class='option option-type'>[round]</span>/<span class='option active option-type'>[square]</span></p>
 
 </div>
-    </div>
-    </div>
+</div>
+</div>
 
     <canvas width='1000' height='1000'>If you can read this, your browser does not support HTML5 canvas.</canvas>
 </body>

main.js

@@ -119,11 +119,11 @@ const mouse = {
 
 function mouseNext() {
 	let flag
-for (let mode in mouse.modus) {
-		if (flag)
-			return mouse.action = mouse.modus[mode]
-		flag = mouse.modus[mode] === window.onclick
-	}
+		for (let mode in mouse.modus) {
+			if (flag)
+				return mouse.action = mouse.modus[mode]
+			flag = mouse.modus[mode] === mouse.action
+		}
 	return mouse.action = mouse.modus.emit
 }
 
@@ -149,13 +149,15 @@ window.onmousemove = ev => mouse.clone = ev
 
 window.onclick = ev => mouse.clone = ev
 
+window.onscroll = onScroll
+
 /* Anything related to touch events.
  ************************************/
 
 // Touchscreen handles very different from a mouse, make seperate actions!
 const touch = {}
 
-window.ontouchstart = window.onmousedown
+// window.ontouchstart = window.onmousedown
 
 window.ontouchend = window.onmouseup
 

package.json

@@ -14,7 +14,7 @@
     "nodemon": "^1.11.0"
   },
   "scripts": {
-    "watch-css": "node-sass -w -r ./app/assets/sass -o ./app/assets/css",
+    "watch-css": "node-sass -w -r ./assets/sass -o ./assets/css",
     "test": "ava",
     "start": "electron ."
   }