From 6538cd1293eb78ab09bc7c04bbbdc49f8cbc2f09 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Tue, 19 Apr 2022 18:58:04 +0200 Subject: fix(renderer): Improve appearance in small windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure we do not overflow the viewport with the location bar or the error page. Signed-off-by: Kristóf Marussy --- packages/renderer/src/components/App.tsx | 1 + packages/renderer/src/components/ThemeProvider.tsx | 12 +++++++++--- packages/renderer/src/components/errorPage/ErrorPage.tsx | 7 ++++++- .../renderer/src/components/locationBar/ExtraButtons.tsx | 7 +------ .../src/components/locationBar/LocationTextField.tsx | 1 + .../src/components/locationBar/NavigationButtons.tsx | 7 +------ 6 files changed, 19 insertions(+), 16 deletions(-) (limited to 'packages/renderer') diff --git a/packages/renderer/src/components/App.tsx b/packages/renderer/src/components/App.tsx index 26e2e01..4a3a5cf 100644 --- a/packages/renderer/src/components/App.tsx +++ b/packages/renderer/src/components/App.tsx @@ -95,6 +95,7 @@ function App({ devMode }: { devMode: boolean }): JSX.Element { sx={{ flex: 1, display: 'flex', + overflow: 'hidden', flexDirection: 'column', alignItems: 'stretch', height: '100%', diff --git a/packages/renderer/src/components/ThemeProvider.tsx b/packages/renderer/src/components/ThemeProvider.tsx index 581563b..2ea2186 100644 --- a/packages/renderer/src/components/ThemeProvider.tsx +++ b/packages/renderer/src/components/ThemeProvider.tsx @@ -35,9 +35,15 @@ export default observer( const theme = createTheme({ direction: writingDirection, - palette: { - mode: shouldUseDarkColors ? 'dark' : 'light', - }, + palette: shouldUseDarkColors + ? { + mode: 'dark', + divider: 'rgba(255, 255, 255, 0.22)', + } + : { + mode: 'light', + divider: 'rgba(0, 0, 0, 0.24)', + }, components: { MuiBadge: { styleOverrides: { diff --git a/packages/renderer/src/components/errorPage/ErrorPage.tsx b/packages/renderer/src/components/errorPage/ErrorPage.tsx index 571059a..99ca020 100644 --- a/packages/renderer/src/components/errorPage/ErrorPage.tsx +++ b/packages/renderer/src/components/errorPage/ErrorPage.tsx @@ -152,7 +152,12 @@ function ErrorPage({ > {icon} - + {title} {description} diff --git a/packages/renderer/src/components/locationBar/ExtraButtons.tsx b/packages/renderer/src/components/locationBar/ExtraButtons.tsx index 1755495..ef90199 100644 --- a/packages/renderer/src/components/locationBar/ExtraButtons.tsx +++ b/packages/renderer/src/components/locationBar/ExtraButtons.tsx @@ -37,12 +37,7 @@ function ExtraButtons({ }); return ( - + ({ padding: '0 12px', + flex: '1 0 200px', borderRadius: 18, '&.Mui-focused': { outline: `2px solid ${theme.palette.primary.main}`, diff --git a/packages/renderer/src/components/locationBar/NavigationButtons.tsx b/packages/renderer/src/components/locationBar/NavigationButtons.tsx index 219ed90..9c4ebdb 100644 --- a/packages/renderer/src/components/locationBar/NavigationButtons.tsx +++ b/packages/renderer/src/components/locationBar/NavigationButtons.tsx @@ -43,12 +43,7 @@ function NavigationButtons({ const { direction } = useTheme(); return ( - +