Load Oasis-Mobile-UX theme directly on mobile
Drops the conditional/selectable-theme loading that broke the CSS; matches the known-working build.
This commit is contained in:
parent
8aaba6585a
commit
9eb5123c03
2 changed files with 5 additions and 16 deletions
|
|
@ -1299,14 +1299,9 @@ const template = (titlePrefix, ...elements) => {
|
|||
const currentConfig = getConfig();
|
||||
const theme = currentConfig.themes.current || "Dark-SNH";
|
||||
const uxMode = currentConfig.ux?.current === "ainav" ? "ainav" : "blocks";
|
||||
const baseTheme = theme === "OasisMobileUX" ? "Dark-SNH" : theme;
|
||||
const mobileUXActive = process.env.OASIS_MOBILE === '1' ? theme !== "OasisMobile" : theme === "OasisMobileUX";
|
||||
const mobileUXLink = mobileUXActive
|
||||
? link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) })
|
||||
: "";
|
||||
const themeLink = link({
|
||||
rel: "stylesheet",
|
||||
href: `/assets/themes/${baseTheme}.css`
|
||||
href: `/assets/themes/${theme}.css`
|
||||
});
|
||||
const nodes = html(
|
||||
{ lang: "en" },
|
||||
|
|
@ -1315,7 +1310,7 @@ const template = (titlePrefix, ...elements) => {
|
|||
link({ rel: "stylesheet", href: "/assets/styles/style.css" }),
|
||||
themeLink,
|
||||
link({ rel: "stylesheet", href: "/assets/styles/mobile.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
|
||||
mobileUXLink,
|
||||
link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
|
||||
link({ rel: "icon", href: "/assets/images/favicon.svg" }),
|
||||
meta({ charset: "utf-8" }),
|
||||
meta({ name: "description", content: i18n.oasisDescription }),
|
||||
|
|
@ -1631,20 +1626,15 @@ exports.template = template;
|
|||
exports.ainavHomeView = ({ recentTags = [] } = {}) => {
|
||||
const currentConfig = getConfig();
|
||||
const theme = currentConfig.themes.current || "Dark-SNH";
|
||||
const baseTheme = theme === "OasisMobileUX" ? "Dark-SNH" : theme;
|
||||
const mobileUXActive = process.env.OASIS_MOBILE === '1' ? theme !== "OasisMobile" : theme === "OasisMobileUX";
|
||||
const mobileUXLink = mobileUXActive
|
||||
? link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) })
|
||||
: "";
|
||||
const placeholder = i18n.aiNavPlaceholder || 'Where do you want to go?';
|
||||
const nodes = html(
|
||||
{ lang: "en" },
|
||||
head(
|
||||
title(placeholder, " | Oasis"),
|
||||
link({ rel: "stylesheet", href: "/assets/styles/style.css" }),
|
||||
link({ rel: "stylesheet", href: `/assets/themes/${baseTheme}.css` }),
|
||||
link({ rel: "stylesheet", href: `/assets/themes/${theme}.css` }),
|
||||
link({ rel: "stylesheet", href: "/assets/styles/mobile.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
|
||||
mobileUXLink,
|
||||
link({ rel: "stylesheet", href: "/assets/themes/OasisMobileUX.css", ...(process.env.OASIS_MOBILE === '1' ? {} : { media: "(max-width: 768px)" }) }),
|
||||
link({ rel: "icon", href: "/assets/images/favicon.svg" }),
|
||||
meta({ charset: "utf-8" }),
|
||||
meta({ name: "description", content: i18n.oasisDescription }),
|
||||
|
|
|
|||
|
|
@ -37,8 +37,7 @@ const settingsView = ({ version, aiPrompt, fediverseAccount, fediverseError }) =
|
|||
option({ value: "Clear-SNH", selected: theme === "Clear-SNH" ? true : undefined }, "Clear-SNH"),
|
||||
option({ value: "Purple-SNH", selected: theme === "Purple-SNH" ? true : undefined }, "Purple-SNH"),
|
||||
option({ value: "Matrix-SNH", selected: theme === "Matrix-SNH" ? true : undefined }, "Matrix-SNH"),
|
||||
option({ value: "OasisMobile", selected: theme === "OasisMobile" ? true : undefined }, "Oasis-Mobile"),
|
||||
option({ value: "OasisMobileUX", selected: theme === "OasisMobileUX" ? true : undefined }, "Oasis-Mobile-UX")
|
||||
option({ value: "OasisMobile", selected: theme === "OasisMobile" ? true : undefined }, "Oasis-Mobile")
|
||||
];
|
||||
|
||||
const languageOption = (longName, shortName) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue