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

client/src/components/buttons.jsx

@@ -8,7 +8,7 @@ module.exports = {
     Slay: () => 'red-green-border',
     Siphon: () => 'blue-green-border',
     // Stun
-    Link: () => 'blue-greenborder',
+    Link: () => 'blue-green-border',
     Bash: () => 'red-border',
     Sleep: () => 'green-border',
     Ruin: () => 'blue-border',

client/src/components/vbox.component.jsx

@@ -29,6 +29,7 @@ const addState = connect(
         }
 
         function sendVboxAccept(group, index) {
+            document.activeElement.blur();
             return ws.sendVboxAccept(instance.id, group, index);
         }
 
@@ -217,7 +218,7 @@ class Vbox extends preact.Component {
 
             const vboxObject = shapes[v] ? shapes[v]() : v;
             return (
-                <label draggable='true' 
+                <label draggable='true'
                     onDragStart={ev => ev.dataTransfer.setData('text', '')}
                     onDragEnd={clearVboxSelected}>
                     <button
@@ -325,7 +326,7 @@ class Vbox extends preact.Component {
             const highlighted = combiner.indexOf(i) > -1;
             const border = buttons[removeTier(v)] ? buttons[removeTier(v)]() : '';
             const classes = `${highlighted ? 'highlight' : border} ${comboHighlight}`;
-            
+
             const invObject = shapes[v] ? shapes[v]() : v;
 
             return (