diff --git a/packages/app/src/Pages/Layout/AccountHeader.tsx b/packages/app/src/Pages/Layout/AccountHeader.tsx
index 360a41a2..46f1ae88 100644
--- a/packages/app/src/Pages/Layout/AccountHeader.tsx
+++ b/packages/app/src/Pages/Layout/AccountHeader.tsx
@@ -96,7 +96,7 @@ const AccountHeader = () => {
);
};
-function HasNotificationsMarker() {
+export function HasNotificationsMarker() {
const readNotifications = useLogin(s => s.readNotifications);
const notifications = useSyncExternalStore(
c => Notifications.hook(c, "*"),
@@ -112,7 +112,11 @@ function HasNotificationsMarker() {
);
if (hasNotifications) {
- return ;
+ return (
+
+
+
+ );
}
}
diff --git a/packages/app/src/Pages/Layout/Layout.css b/packages/app/src/Pages/Layout/Layout.css
index 780e7837..73d1ee0d 100644
--- a/packages/app/src/Pages/Layout/Layout.css
+++ b/packages/app/src/Pages/Layout/Layout.css
@@ -43,21 +43,11 @@ header {
padding: 5px;
}
-.header-actions .btn .has-unread {
+.has-unread {
background: var(--highlight);
border-radius: 100%;
width: 9px;
height: 9px;
- position: relative;
- top: -4px;
- right: 7px;
-}
-
-@media (max-width: 520px) {
- .header-actions .btn .has-unread {
- top: 2px;
- right: 2px;
- }
}
.stalker {
diff --git a/packages/app/src/Pages/Layout/NavSidebar.tsx b/packages/app/src/Pages/Layout/NavSidebar.tsx
index f6a06014..abf7b0cd 100644
--- a/packages/app/src/Pages/Layout/NavSidebar.tsx
+++ b/packages/app/src/Pages/Layout/NavSidebar.tsx
@@ -8,6 +8,7 @@ import { useUserProfile } from "@snort/system-react";
import { NoteCreatorButton } from "../../Element/Event/NoteCreatorButton";
import { FormattedMessage } from "react-intl";
import classNames from "classnames";
+import { HasNotificationsMarker } from "@/Pages/Layout/AccountHeader";
const MENU_ITEMS = [
{
@@ -58,9 +59,6 @@ const getNavLinkClass = (isActive: boolean, narrow: boolean) => {
export default function NavSidebar({ narrow = false }) {
const { publicKey } = useLogin(s => ({
publicKey: s.publicKey,
- latestNotification: s.latestNotification,
- readNotifications: s.readNotifications,
- readonly: s.readonly,
}));
const profile = useUserProfile(publicKey);
const navigate = useNavigate();
@@ -82,6 +80,7 @@ export default function NavSidebar({ narrow = false }) {
return (
getNavLinkClass(isActive, narrow)}>
+ {item.label === "Notifications" && }
{!narrow && {item.label}}
);
diff --git a/packages/app/src/Pages/Layout/RightColumn.tsx b/packages/app/src/Pages/Layout/RightColumn.tsx
index 8db43f44..721a0b8f 100644
--- a/packages/app/src/Pages/Layout/RightColumn.tsx
+++ b/packages/app/src/Pages/Layout/RightColumn.tsx
@@ -5,7 +5,9 @@ import TrendingNotes from "@/Element/TrendingPosts";
import { FormattedMessage } from "react-intl";
import classNames from "classnames";
-export default function RightColumn({ show = true }) {
+export default function RightColumn() {
+ const hideRightColumnPaths = ["/login", "/new", "/messages", "/settings"];
+ const show = !hideRightColumnPaths.some(path => location.pathname.startsWith(path));
return (
location.pathname.startsWith(path));
- const shouldHideRightColumn = hideRightColumnPaths.some(path => location.pathname.startsWith(path));
const pageClassPaths = useMemo(
() => ({
@@ -69,7 +67,7 @@ export default function Index() {
-
+