Skip to content

Commit

Permalink
Fix the scrollbars in the settings window
Browse files Browse the repository at this point in the history
  • Loading branch information
pboutin committed Sep 7, 2024
1 parent ce3c114 commit 672c5df
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ lint:

.PHONY: start
start:
npx electron-forge start
export DEBUG=true && npx electron-forge start
4 changes: 3 additions & 1 deletion src/electron/windows/_base.window.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ export default class BaseWindow {
title: this.getWindowTitle(),
});

// this.window.webContents.openDevTools();
if (process.env.DEBUG) {
this.window.webContents.openDevTools();
}

if (MAIN_WINDOW_VITE_DEV_SERVER_URL) {
this.window.loadURL(`${MAIN_WINDOW_VITE_DEV_SERVER_URL}/index.html`);
Expand Down
6 changes: 3 additions & 3 deletions src/ui/windows/settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const Settings = () => {

return (
<HashRouter>
<div className="bg-base-300 min-h-screen flex flex-col">
<div className="tabs tabs-lifted pt-3">
<div className="bg-base-300 h-full flex flex-col">
<div className="tabs tabs-lifted pt-3 pr-40">
<NavLink className={({ isActive }) => classNames('tab', { 'tab-active': isActive })} to="/">
<Icon icon="user" className="mr-2" />
{translate('characters.title')}
Expand All @@ -39,7 +39,7 @@ const Settings = () => {
</NavLink>
</div>

<div className="bg-base-100 flex-1 p-3">
<div className="bg-base-100 flex-1 p-3 overflow-y-scroll">
<Routes>
<Route index path="/" element={<Characters />} />
<Route path="/teams" element={<Teams />} />
Expand Down
2 changes: 1 addition & 1 deletion src/ui/windows/settings/theme/theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const Theme = () => {
const { theme: activeTheme, updateTheme } = useConfig();

return (
<div className="grid gap-4 grid-cols-4 ">
<div className="grid gap-4 grid-cols-4">
{themes.map((theme) => (
<div
key={theme}
Expand Down

0 comments on commit 672c5df

Please sign in to comment.