lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1034 from ubavic/ui-fixes

Browse source 
fix: scrollbar gutter. 'UTC' in labels
This commit is contained in:
Rafael Taranto 2022-01-13 00:28:43 +00:00 • committed by GitHub
commit ae42927958
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
new-lamassu-admin/src/pages/Machines/MachineComponents/Transactions/Transactions.js
View file

@ -145,7 +145,7 @@ const Transactions = ({ id }) => {
width: 140 width: 140
}, },
{ {
header: 'Date (UTC)', header: 'Date',
view: it => formatDate(it.created, timezone, 'yyyy-MM-dd'), view: it => formatDate(it.created, timezone, 'yyyy-MM-dd'),
textAlign: 'left', textAlign: 'left',
size: 'sm', size: 'sm',

2
new-lamassu-admin/src/pages/SessionManagement/SessionManagement.js
View file

@ -79,7 +79,7 @@ const SessionManagement = () => {
} }
}, },
{ {
header: 'Expiration date (UTC)', header: 'Expiration date',
width: 290, width: 290,
textAlign: 'right', textAlign: 'right',
size: 'sm', size: 'sm',

2
new-lamassu-admin/src/pages/Transactions/Transactions.js
View file

@ -222,7 +222,7 @@ const Transactions = () => {
width: 140 width: 140
}, },
{ {
header: 'Date (UTC)', header: 'Date',
view: it => view: it =>
timezone && formatDate(it.created, timezone, 'yyyy-MM-dd HH:mm:ss'), timezone && formatDate(it.created, timezone, 'yyyy-MM-dd HH:mm:ss'),
textAlign: 'right', textAlign: 'right',

5
new-lamassu-admin/src/styling/global/index.js
View file

@ -28,7 +28,10 @@ export default {
pointerEvents: 'none' pointerEvents: 'none'
}, },
html: { html: {
height: fill height: fill,
'@media screen and (max-height: 900px)': {
scrollbarGutter: 'stable'
}
}, },
body: { body: {
width: mainWidth, width: mainWidth,