diff --git a/css/menupages.scss b/css/menupages.scss index 7eadef042..ffaa1d1b8 100644 --- a/css/menupages.scss +++ b/css/menupages.scss @@ -4,15 +4,10 @@ /* CSS for different main menu pages, such as character info, script editor, etc (but excluding terminal which has its own page) */ -.generic-menupage-container { +#generic-react-container { -ms-overflow-style: none; /* for Internet Explorer, Edge */ scrollbar-width: none; /* for Firefox */ flex-grow: 1; - height: 100vh; - bottom: 0px; -} - -#generic-react-container { overflow-y: scroll; height: 100vh; bottom: 0px; diff --git a/src/Terminal/ui/TerminalRoot.tsx b/src/Terminal/ui/TerminalRoot.tsx index 7b5405000..925963c6f 100644 --- a/src/Terminal/ui/TerminalRoot.tsx +++ b/src/Terminal/ui/TerminalRoot.tsx @@ -43,6 +43,11 @@ const useStyles = makeStyles((theme: Theme) => whiteSpace: "pre-wrap", margin: 0, }, + list: { + padding: 0, + height: "100%", + overflowY: "scroll", + }, }), ); @@ -348,7 +353,7 @@ export function TerminalRoot({ terminal, engine, player }: IProps): React.ReactE return ( - + {terminal.outputHistory.map((item, i) => { if (item instanceof Output) return ( diff --git a/src/index.html b/src/index.html index 1512b6a34..00128fd74 100644 --- a/src/index.html +++ b/src/index.html @@ -42,9 +42,7 @@