diff --git a/packages/app/src/Pages/Layout/RightColumn.tsx b/packages/app/src/Pages/Layout/RightColumn.tsx
index 9af138d2..8db43f44 100644
--- a/packages/app/src/Pages/Layout/RightColumn.tsx
+++ b/packages/app/src/Pages/Layout/RightColumn.tsx
@@ -3,10 +3,14 @@ import TrendingUsers from "@/Element/TrendingUsers";
import TrendingHashtags from "@/Element/TrendingHashtags";
import TrendingNotes from "@/Element/TrendingPosts";
import { FormattedMessage } from "react-intl";
+import classNames from "classnames";
-export default function RightColumn() {
+export default function RightColumn({ show = true }) {
return (
-
+
diff --git a/packages/app/src/Pages/Layout/index.tsx b/packages/app/src/Pages/Layout/index.tsx
index fc6f66ce..9133591a 100644
--- a/packages/app/src/Pages/Layout/index.tsx
+++ b/packages/app/src/Pages/Layout/index.tsx
@@ -29,7 +29,9 @@ export default function Index() {
useLoginFeed();
const hideHeaderPaths = ["/login", "/new"];
+ const hideRightColumnPaths = ["/login", "/new", "/messages", "/settings"];
const shouldHideHeader = hideHeaderPaths.some(path => location.pathname.startsWith(path));
+ const shouldHideRightColumn = hideRightColumnPaths.some(path => location.pathname.startsWith(path));
const pageClassPaths = useMemo(
() => ({
@@ -67,7 +69,7 @@ export default function Index() {
-
+
diff --git a/packages/app/src/Pages/Messages/MessagesPage.css b/packages/app/src/Pages/Messages/MessagesPage.css
index 1bcfcd6c..accb60ec 100644
--- a/packages/app/src/Pages/Messages/MessagesPage.css
+++ b/packages/app/src/Pages/Messages/MessagesPage.css
@@ -1,8 +1,7 @@
.dm-page {
- --full-height: calc(100vh - 42px - var(--header-padding-tb) - var(--header-padding-tb) - 16px);
display: grid;
grid-template-columns: 350px auto;
- height: var(--full-height);
+ height: 100vh;
/* 100vh - header - padding */
overflow: hidden;
padding: 4px;
@@ -16,6 +15,7 @@
@media (max-width: 768px) {
.dm-page {
grid-template-columns: 100vw;
+ height: calc(100vh - 62px);
}
.dm-page > div:nth-child(1) {