diff --git a/app/javascript/flavours/glitch/components/router.tsx b/app/javascript/flavours/glitch/components/router.tsx index f09371651..36d94c25f 100644 --- a/app/javascript/flavours/glitch/components/router.tsx +++ b/app/javascript/flavours/glitch/components/router.tsx @@ -21,11 +21,7 @@ browserHistory.push = (path: string, state?: MastodonLocationState) => { state = state ?? {}; state.fromMastodon = true; - if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) { - originalPush(`/deck${path}`, state); - } else { - originalPush(path, state); - } + originalPush(path, state); }; browserHistory.replace = (path: string, state?: MastodonLocationState) => { @@ -34,11 +30,7 @@ browserHistory.replace = (path: string, state?: MastodonLocationState) => { state.fromMastodon = true; } - if (layoutFromWindow() === 'multi-column' && !path.startsWith('/deck')) { - originalReplace(`/deck${path}`, state); - } else { - originalReplace(path, state); - } + originalReplace(path, state); }; export const Router: React.FC = ({ children }) => { diff --git a/app/javascript/flavours/glitch/features/ui/index.jsx b/app/javascript/flavours/glitch/features/ui/index.jsx index 6f8050957..f88a78e9a 100644 --- a/app/javascript/flavours/glitch/features/ui/index.jsx +++ b/app/javascript/flavours/glitch/features/ui/index.jsx @@ -174,7 +174,7 @@ class SwitchingColumnsArea extends PureComponent { if (singleColumn) { redirect = ; } else { - redirect = ; + redirect = ; } } else if (singleUserMode && owner && initialState?.accounts[owner]) { redirect = ; @@ -189,9 +189,8 @@ class SwitchingColumnsArea extends PureComponent { {redirect} - {singleColumn ? : null} - {singleColumn && pathName.startsWith('/deck/') ? : null} - {!singleColumn && pathName === '/getting-started' ? : null} + {singleColumn ? : null} + {pathName.startsWith('/deck/') ? : null} diff --git a/public/index.html b/public/index.html index 6d434b492..abf988037 100644 --- a/public/index.html +++ b/public/index.html @@ -7,7 +7,7 @@ - +