Revert console layout change (fixes scrollbar).

Reformat uploadButton a little.
retrixe · Jun 6, 2022 · 3b86038 · 3b86038
1 parent 2a2353c
commit 3b86038
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/imports/dashboard/files/uploadButton.tsx b/imports/dashboard/files/uploadButton.tsx
@@ -2,7 +2,10 @@ import React, { useState, useEffect } from 'react'
 import { IconButton, Tooltip } from '@mui/material'
 import CloudUpload from '@mui/icons-material/CloudUpload'
 
-const UploadButton = ({ uploadFiles, disabled }: { uploadFiles: (files: FileList) => void, disabled: boolean }) => {
+const UploadButton = ({ uploadFiles, disabled }: {
+  uploadFiles: (files: FileList) => void
+  disabled: boolean
+}) => {
   const [files, setFiles] = useState<null | FileList>(null)
   useEffect(() => {
     if (files) {

diff --git a/pages/dashboard/[server]/console.tsx b/pages/dashboard/[server]/console.tsx
@@ -164,9 +164,9 @@ const Console = ({ setAuthenticated }: {
   return !listening
     ? <ConnectionFailure loading={listening === null} />
     : (
-      <Paper style={{ padding: 20, flex: 1, display: 'flex', flexDirection: 'column' }}>
+      <Paper style={{ padding: 20 }}>
         <Typography variant='h5' gutterBottom>Console - {server}</Typography>
-        <Paper variant='outlined' style={{ flex: 1, padding: 10, color, ...terminalUi }}>
+        <Paper variant='outlined' style={{ height: '60vh', padding: 10, color, ...terminalUi }}>
           <ConsoleView console={consoleText} />
         </Paper>
         <CommandTextField ws={ws} buffer={buffer} id={id} />