mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-11-10 09:43:54 +01:00
Merge branch 'dev' into big-container
This commit is contained in:
commit
1344a17482
4
dist/engine.bundle.js
vendored
4
dist/engine.bundle.js
vendored
File diff suppressed because one or more lines are too long
24
dist/vendor.bundle.js
vendored
24
dist/vendor.bundle.js
vendored
File diff suppressed because one or more lines are too long
@ -4,6 +4,8 @@ import { Theme } from "@mui/material/styles";
|
||||
import makeStyles from "@mui/styles/makeStyles";
|
||||
import createStyles from "@mui/styles/createStyles";
|
||||
import TextField from "@mui/material/TextField";
|
||||
import Paper from "@mui/material/Paper";
|
||||
|
||||
import { KEY } from "../../../utils/helpers/keyCodes";
|
||||
import { ITerminal } from "../ITerminal";
|
||||
import { IRouter } from "../../ui/Router";
|
||||
@ -326,14 +328,14 @@ export function TerminalInput({ terminal, router, player }: IProps): React.React
|
||||
return (
|
||||
<>
|
||||
{possibilities.length > 0 && (
|
||||
<>
|
||||
<Paper square>
|
||||
<Typography classes={{ root: classes.preformatted }} color={"primary"} paragraph={false}>
|
||||
Possible autocomplete candidate:
|
||||
</Typography>
|
||||
<Typography classes={{ root: classes.preformatted }} color={"primary"} paragraph={false}>
|
||||
{possibilities.join(" ")}
|
||||
</Typography>
|
||||
</>
|
||||
</Paper>
|
||||
)}
|
||||
<TextField
|
||||
variant="standard"
|
||||
|
@ -101,8 +101,13 @@ export function TerminalRoot({ terminal, router, player }: IProps): React.ReactE
|
||||
</ListItem>
|
||||
);
|
||||
})}
|
||||
|
||||
{terminal.action !== null && (
|
||||
<ListItem classes={{ root: classes.nopadding }}>
|
||||
<ActionTimer terminal={terminal} />{" "}
|
||||
</ListItem>
|
||||
)}
|
||||
</List>
|
||||
{terminal.action !== null && <ActionTimer terminal={terminal} />}
|
||||
<div ref={scrollHook}></div>
|
||||
</Box>
|
||||
<Box position="sticky" bottom={0} width="100%" px={0}>
|
||||
|
Loading…
Reference in New Issue
Block a user