From c9ee938bc64a51527e9e1ae04e7a1dfade45c530 Mon Sep 17 00:00:00 2001 From: Snarling <84951833+Snarling@users.noreply.github.com> Date: Mon, 12 Sep 2022 18:05:48 -0400 Subject: [PATCH] fix previous commit --- src/ui/GameRoot.tsx | 82 +++++++++++++++--------------- src/ui/React/CharacterOverview.tsx | 2 +- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/ui/GameRoot.tsx b/src/ui/GameRoot.tsx index 8836c3f03..481d146e0 100644 --- a/src/ui/GameRoot.tsx +++ b/src/ui/GameRoot.tsx @@ -476,49 +476,47 @@ export function GameRoot(): React.ReactElement { } return ( - - - - - - - {!ITutorial.isRunning ? ( - saveObject.saveGame()} killScripts={killAllScripts} /> - ) : ( - - )} - - {withSidebar ? ( - - { - setSideBarOpened(isOpened); - Settings.IsSidebarOpened = isOpened; - }} - /> - {mainPage} - + <> + + + + + {!ITutorial.isRunning ? ( + saveObject.saveGame()} killScripts={killAllScripts} /> ) : ( + + )} + + {withSidebar ? ( + + { + setSideBarOpened(isOpened); + Settings.IsSidebarOpened = isOpened; + }} + /> {mainPage} - )} - - {withPopups && ( - <> - - - - - - - )} - - - - - - - + + ) : ( + {mainPage} + )} + + {withPopups && ( + <> + + + + + + + )} + + + + + + ); } diff --git a/src/ui/React/CharacterOverview.tsx b/src/ui/React/CharacterOverview.tsx index 24a6c93fa..d1b29aaed 100644 --- a/src/ui/React/CharacterOverview.tsx +++ b/src/ui/React/CharacterOverview.tsx @@ -212,7 +212,7 @@ function Work(): React.ReactElement { ); innerText = ( <> - rep + rep
( )