From b682a442fe54ec469e2fccb97b7654a6c1d30d4d Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Thu, 16 Sep 2021 14:55:55 -0400 Subject: [PATCH] =?UTF-8?q?terminal=20wrap=20but=20it's=20not=20perfect?= =?UTF-8?q?=C2=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Sidebar/ui/SidebarRoot.tsx | 6 ++---- src/Terminal/ui/TerminalRoot.tsx | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Sidebar/ui/SidebarRoot.tsx b/src/Sidebar/ui/SidebarRoot.tsx index c44d201e5..c8777c612 100644 --- a/src/Sidebar/ui/SidebarRoot.tsx +++ b/src/Sidebar/ui/SidebarRoot.tsx @@ -57,17 +57,15 @@ import { KEY } from "../../../utils/helpers/keyCodes"; import { FconfSettings } from "../../Fconf/FconfSettings"; import { Page, routing } from "../../ui/navigationTracking"; -const drawerWidth = 240; - const useStyles = makeStyles((theme: Theme) => createStyles({ drawer: { - width: drawerWidth, + width: theme.spacing(31), flexShrink: 0, whiteSpace: "nowrap", }, drawerOpen: { - width: drawerWidth, + width: theme.spacing(31), transition: theme.transitions.create("width", { easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.enteringScreen, diff --git a/src/Terminal/ui/TerminalRoot.tsx b/src/Terminal/ui/TerminalRoot.tsx index 628683635..7b5405000 100644 --- a/src/Terminal/ui/TerminalRoot.tsx +++ b/src/Terminal/ui/TerminalRoot.tsx @@ -40,7 +40,7 @@ const useStyles = makeStyles((theme: Theme) => padding: 0, }, preformatted: { - whiteSpace: "pre", + whiteSpace: "pre-wrap", margin: 0, }, }),