From 3f845413f7f35a45191873c8755a55b6354754bb Mon Sep 17 00:00:00 2001
From: Peter Ling <pling@scottlogic.com>
Date: Tue, 14 Nov 2023 15:46:13 +0000
Subject: [PATCH] VUU-333: Post-merge fix

---
 .../src/new-basket-panel/NewBasketPanel.css   |  9 +--
 vuu-ui/tsconfig.json                          | 77 +++++--------------
 2 files changed, 24 insertions(+), 62 deletions(-)

diff --git a/vuu-ui/sample-apps/feature-basket-trading/src/new-basket-panel/NewBasketPanel.css b/vuu-ui/sample-apps/feature-basket-trading/src/new-basket-panel/NewBasketPanel.css
index e6116a0f9..d6ece0fbe 100644
--- a/vuu-ui/sample-apps/feature-basket-trading/src/new-basket-panel/NewBasketPanel.css
+++ b/vuu-ui/sample-apps/feature-basket-trading/src/new-basket-panel/NewBasketPanel.css
@@ -8,6 +8,7 @@
 
 .vuuBasketNewBasketPanel-body {
     flex: 1 1 auto;
+    padding: 16px 0;
 }
 
 .vuuBasketNewBasketPanel-buttonBar {
@@ -15,9 +16,7 @@
     --saltButton-padding: 12px;
     display: flex;
     align-items: flex-end;
-    gap: 8px;
-    height: 32px;
     justify-content: flex-end;
-    padding: 0 16px;
-
-}
\ No newline at end of file
+    padding-top: 8px;
+    gap: 8px;
+}
diff --git a/vuu-ui/tsconfig.json b/vuu-ui/tsconfig.json
index 122c804e5..c9c0d8494 100644
--- a/vuu-ui/tsconfig.json
+++ b/vuu-ui/tsconfig.json
@@ -30,67 +30,30 @@
     "showcase/src",
     "sample-apps/*/index.ts",
     "sample-apps/*/src",
-    "global.d.ts",
-    "packages/vuu-data-test/src/UpdateGenerator.ts"
-  ],
+    "global.d.ts"
+, "packages/vuu-data-test/src/UpdateGenerator.ts"  ],
   "exclude": [
     "**/*.cy.*",
     "**/*.test.*"
   ],
   "references": [
-    {
-      "path": "packages/vuu-codemirror"
-    },
-    {
-      "path": "packages/vuu-data"
-    },
-    {
-      "path": "packages/vuu-data-ag-grid"
-    },
-    {
-      "path": "packages/vuu-data-react"
-    },
-    {
-      "path": "packages/vuu-data-types"
-    },
-    {
-      "path": "packages/vuu-datagrid"
-    },
-    {
-      "path": "packages/vuu-datatable"
-    },
-    {
-      "path": "packages/vuu-filter-parser"
-    },
-    {
-      "path": "packages/vuu-filter-types"
-    },
-    {
-      "path": "packages/vuu-filters"
-    },
-    {
-      "path": "packages/vuu-layout"
-    },
-    {
-      "path": "packages/vuu-popups"
-    },
-    {
-      "path": "packages/vuu-protocol-types"
-    },
-    {
-      "path": "packages/vuu-shell"
-    },
-    {
-      "path": "packages/vuu-table"
-    },
-    {
-      "path": "packages/vuu-table-extras"
-    },
-    {
-      "path": "packages/vuu-ui-controls"
-    },
-    {
-      "path": "packages/vuu-utils"
-    }
+    {"path" : "packages/vuu-codemirror"},
+    {"path" : "packages/vuu-data"},
+    {"path" : "packages/vuu-data-ag-grid"},
+    {"path" : "packages/vuu-data-react"},
+    {"path" : "packages/vuu-data-types"},
+    {"path" : "packages/vuu-datagrid"},
+    {"path" : "packages/vuu-datatable"},
+    {"path" : "packages/vuu-filter-parser"},
+    {"path" : "packages/vuu-filter-types"},
+    {"path" : "packages/vuu-filters"},
+    {"path" : "packages/vuu-layout"},
+    {"path" : "packages/vuu-popups"},
+    {"path" : "packages/vuu-protocol-types"},
+    {"path" : "packages/vuu-shell"},
+    {"path" : "packages/vuu-table"},
+    {"path" : "packages/vuu-table-extras"},
+    {"path" : "packages/vuu-ui-controls"},
+    {"path" : "packages/vuu-utils"}
   ]
 }