Merge pull request #1823 from danielyxie/dev

rm tail bound
This commit is contained in:
hydroflame 2021-12-04 18:58:42 -05:00 committed by GitHub
commit fa1dd4d0cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -98,6 +98,11 @@ interface IDefaultSettings {
*/
SuppressBladeburnerPopup: boolean;
/**
* Whether the user should be displayed a popup message on stock market actions.
*/
SuppressTIXPopup: boolean;
/*
* Theme colors
*/
@ -180,6 +185,7 @@ export const defaultSettings: IDefaultSettings = {
SuppressMessages: false,
SuppressTravelConfirmation: false,
SuppressBladeburnerPopup: false,
SuppressTIXPopup: false,
theme: {
primarylight: "#0f0",
@ -244,6 +250,7 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
SuppressMessages: defaultSettings.SuppressMessages,
SuppressTravelConfirmation: defaultSettings.SuppressTravelConfirmation,
SuppressBladeburnerPopup: defaultSettings.SuppressBladeburnerPopup,
SuppressTIXPopup: defaultSettings.SuppressTIXPopup,
MonacoTheme: "monokai",
MonacoInsertSpaces: false,
MonacoFontSize: 20,

@ -159,7 +159,7 @@ function LogWindow(props: IProps): React.ReactElement {
}
return (
<Draggable bounds="body" handle=".drag">
<Draggable handle=".drag">
<Paper
style={{
display: "flex",