From 166ecc19d5bb1f5e191ce7d5d584cb1918f53495 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Mon, 10 Jun 2019 12:15:21 +1000
Subject: [PATCH] worklog and styles

---
 WORKLOG.md                      | 35 ++++++++++++++++++++++++++-------
 client/assets/styles/styles.css |  4 ++++
 server/src/item.rs              |  1 -
 3 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/WORKLOG.md b/WORKLOG.md
index cd6c0e6e..6afe89fa 100644
--- a/WORKLOG.md
+++ b/WORKLOG.md
@@ -27,12 +27,37 @@
 # WORK WORK
 ## NOW
 
+*$$$*
+
+* balances table
+  id
+  account
+  balance
+
+* incoming txs table / payments
+  id
+  ref
+  currency
+  amount
+  conversion rate
+  converted value
+
+* mtx table
+
+
+* define $cost for ingame bits
+  * pay for rerolls
+
+* eth adapter
+
+* dollar processor
+
+
+
 *CLIENT*
 
 mobile info page
 
-mnml tv
-
 rework scatter
 hatred maybe
 
@@ -43,13 +68,8 @@ consolidate game and instance
 do not allow vbox actions for finished instances
   cause of logging
 
-
 *SERVER*
 
-* modify time controls to be optional
-
-* eth adapter
-  * pay for rerolls
 
 ## SOON
 
@@ -68,6 +88,7 @@ do not allow vbox actions for finished instances
   * elo
   * password on MM game to prevent direct joins
 
+* mnml tv
 
 * flavour text
   * chat wheel trash talk
diff --git a/client/assets/styles/styles.css b/client/assets/styles/styles.css
index 34ebe29d..6556388a 100644
--- a/client/assets/styles/styles.css
+++ b/client/assets/styles/styles.css
@@ -430,6 +430,10 @@ header {
     flex: 1;
 }
 
+.menu-intances .menu-construct {
+    flex: 1 0 33%;
+}
+
 .menu-instance-list {
     flex: 1;
     order: 99;
diff --git a/server/src/item.rs b/server/src/item.rs
index f1da024d..fa66fb65 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -678,7 +678,6 @@ impl Item {
             Item::ScatterI      => vec![Item::Buff, Item::Blue, Item::Blue],
             Item::ScatterII     => vec![Item::ScatterI, Item::ScatterI, Item::ScatterI],
             Item::ScatterIII    => vec![Item::ScatterIII, Item::ScatterIII,   Item::ScatterIII],
-
             Item::HasteI        => vec![Item::Buff, Item::Red, Item::Green],
             Item::HasteII       => vec![Item::HasteI, Item::HasteI, Item::HasteI],
             Item::HasteIII      => vec![Item::HasteII, Item::HasteII, Item::HasteII],