Merge branch 'release/1.8.0' of ssh://git.mnml.gg:40022/~/mnml into release/1.8.0

client/assets/styles/game.less

@@ -133,6 +133,7 @@
     }
 
     .skills {
+        z-index: 2;
         button {
             width: 100%;
             height: 2em;
@@ -144,6 +145,7 @@
     }
 
     .effects {
+        z-index: 2;
         grid-area: effects;
         white-space: nowrap;
         width: 100%;
@@ -230,7 +232,6 @@
     padding-left: 1em;
     padding-right: 1em;
     text-align: center;
-    font-size: 0.8em;
     svg {
         display: inline;
         height: 1em;

client/assets/styles/instance.less

@@ -132,6 +132,7 @@
         grid-area: skills;
         padding: 0 0.5em;
         margin-bottom: 0.75em;
+        z-index: 2;
 
         display: grid;
         grid-template-columns: repeat(3, 1fr);
@@ -149,6 +150,7 @@
         grid-area: specs;
         padding: 0 0.5em;
         margin-bottom: 0.75em;
+        z-index: 2;
 
         display: grid;
         grid-template-columns: repeat(3, 1fr);

client/assets/styles/styles.less

@@ -309,6 +309,7 @@ li {
     background-size: contain;
     background-repeat: no-repeat;
     background-position: center;
+    z-index: 0;
     // pointer-events: none;
 }
 

client/src/components/instance.constructs.jsx

@@ -217,7 +217,10 @@ function Construct(props) {
 
 
         return (
-            <label onDragStart={specClick} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
+            <label onDragStart={ev => {
+                ev.dataTransfer.setData('text', '');
+                specClick(ev);
+            }} key={i} draggable="true" onDragEnd={() => setItemUnequip([])}>
                 <button
                     key={i}
                     onClick={specClick}

client/src/components/vbox.component.jsx

@@ -215,7 +215,10 @@ class Vbox extends preact.Component {
             const vboxObject = shapes[v] ? shapes[v]() : v;
             return (
                 <label draggable='true'
-                    onDragStart={ev => ev.dataTransfer.setData('text', '')}
+                    onDragStart={ev => {
+                        onClick(ev);
+                        ev.dataTransfer.setData('text', '')
+                    }}
                     onDragEnd={clearVboxSelected}>
                     <button
                         class={classes}
@@ -328,7 +331,10 @@ class Vbox extends preact.Component {
             return (
                 <label
                     draggable='true'
-                    onDragStart={ev => ev.dataTransfer.setData('text', '')}
+                    onDragStart={ev => {
+                        onClick(ev);
+                        ev.dataTransfer.setData('text', '');
+                    }}
                     onDragEnd={() => {
                         if (combiner.length === 1) combinerChange([]);
                     }}>