diff --git a/packages/app/src/App.jsx b/packages/app/src/App.jsx index 8349212d..4dfeeb56 100755 --- a/packages/app/src/App.jsx +++ b/packages/app/src/App.jsx @@ -333,20 +333,20 @@ class App extends React.Component { return window.app.ModalController.open((props) => ) }, openSettings: (goTo) => { - const controller = window.isMobile ? app.DrawerController : app.SidedrawerController - - if (!controller) { - console.error("No controller found") - return false + if (window.isMobile) { + return app.DrawerController.open("Settings", Settings, { + props: { + width: "fit-content", + goTo, + }, + allowMultiples: false, + escClosable: true, + }) } - controller.open("Settings", Settings, { - props: { - width: "fit-content", - goTo, - }, - allowMultiples: false, - escClosable: true, + return app.SidebarController.setCustomRender(Settings, { + title: "Settings", + icon: "Settings" }) }, openNavigationMenu: () => window.app.DrawerController.open("navigation", Navigation), @@ -464,11 +464,11 @@ class App extends React.Component { }, () => { App.publicMethods.openCreator() }) - + app.eventBus.emit("app.initialization.start") - + await this.initialization() - + app.eventBus.emit("app.initialization.finish") Utils.handleOpenDevTools() diff --git a/packages/app/src/components/Settings/index.jsx b/packages/app/src/components/Settings/index.jsx index 2de24a22..78397804 100755 --- a/packages/app/src/components/Settings/index.jsx +++ b/packages/app/src/components/Settings/index.jsx @@ -426,13 +426,18 @@ export default class SettingsMenu extends React.PureComponent { } render() { - return
+ return
{this.generateSettingsTabs()} diff --git a/packages/app/src/components/Settings/index.less b/packages/app/src/components/Settings/index.less index 5004c3c3..5dc97c49 100755 --- a/packages/app/src/components/Settings/index.less +++ b/packages/app/src/components/Settings/index.less @@ -1,6 +1,4 @@ .settings_wrapper { - min-width: 30vw; - .settings { display: flex; flex-direction: column; @@ -9,6 +7,20 @@ margin-bottom: 25px; } + &.mobile { + .ant-tabs-nav-list { + width: 100%; + justify-content: space-evenly; + } + } + + .ant-tabs-nav-list { + .ant-tabs-tab { + padding: 5px 0 !important; + margin-right: 10px !important; + } + } + .group { display: flex; flex-direction: column; @@ -133,10 +145,5 @@ } } } - - .ant-tabs-nav-list { - width: 100%; - justify-content: space-evenly; - } } } \ No newline at end of file