From b86bcf63ffe0f1ead05212399a91f8efdac03388 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:29:08 +0100
Subject: [PATCH 1/2] fix: cash boxes table height
---
new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js b/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js
index 5d793293..389968bc 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashUnits.styles.js
@@ -5,7 +5,7 @@ export default {
height: 36
},
tBody: {
- maxHeight: '65vh',
+ maxHeight: 'calc(100vh - 350px)',
overflow: 'auto'
},
tableWidth: {
From ac7bcac53f2f4211634a523c0b01c65b781cab97 Mon Sep 17 00:00:00 2001
From: Nikola Ubavic <53820106+ubavic@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:33:36 +0100
Subject: [PATCH 2/2] fix: cashbox history table height
---
.../src/pages/Maintenance/CashboxHistory.js | 22 +++++++++++++------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
index 139899d1..080868cb 100644
--- a/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
+++ b/new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js
@@ -51,6 +51,12 @@ const styles = {
display: 'flex',
flexDirection: 'row',
justifyContent: 'space-between'
+ },
+ tableWrapper: {
+ display: 'flex',
+ flexDirection: 'column',
+ flex: 1,
+ marginBottom: 80
}
}
@@ -243,13 +249,15 @@ const CashboxHistory = ({ machines, currency, timezone }) => {
]
return (
-