diff --git a/src/routes/index.ts b/src/routes/index.ts index aa943267c..e9cde473a 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -34,6 +34,7 @@ function index(req: Request, res: Response) { const isElectron = utils.isElectron(); res.render(view, { + device: view, csrfToken: csrfToken, themeCssUrl: getThemeCssUrl(theme, themeNote), themeUseNextAsBase: themeNote?.getAttributeValue("label", "appThemeBase") === "next", @@ -51,7 +52,7 @@ function index(req: Request, res: Response) { instanceName: config.General ? config.General.instanceName : null, appCssNoteIds: getAppCssNoteIds(), isDev: env.isDev(), - isMainWindow: !req.query.extraWindow, + isMainWindow: (view === "mobile") ? true : !req.query.extraWindow, isProtectedSessionAvailable: protectedSessionService.isProtectedSessionAvailable(), maxContentWidth: Math.max(640, parseInt(options.maxContentWidth)), triliumVersion: packageJson.version, diff --git a/src/views/desktop.ejs b/src/views/desktop.ejs index 514f72695..f56f68eb6 100644 --- a/src/views/desktop.ejs +++ b/src/views/desktop.ejs @@ -21,29 +21,7 @@
- +<%- include("./partials/windowGlobal.ejs", locals) %>