diff --git a/src/app.css b/src/app.css index 6e7e3ab..889ba35 100644 --- a/src/app.css +++ b/src/app.css @@ -209,7 +209,6 @@ transition-duration: 500ms; syntax: "*"; inherits: false; - scrollbar-color: var(--color-text) var(--color-base); } ::selection { @@ -224,14 +223,6 @@ background-color: var(--color-text); color: var(--color-crust); } -#center-body { - scrollbar-width: thin; - scrollbar-gutter: stable both-edges; -} -#center-body:has(.blog-overide) { - scrollbar-width: none !important; - scrollbar-gutter: unset !important; -} #rightbar-content { scrollbar-width: none; } diff --git a/src/app.tsx b/src/app.tsx index 74ccf5c..936320b 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -16,6 +16,7 @@ import { BarsProvider, useBars } from "./context/bars"; import { DarkModeProvider } from "./context/darkMode"; import { createWindowWidth, isMobile } from "~/lib/resize-utils"; import { MOBILE_CONFIG } from "./config"; +import CustomScrollbar from "./components/CustomScrollbar"; function AppLayout(props: { children: any }) { const { @@ -167,7 +168,13 @@ function AppLayout(props: { children: any }) { onTouchEnd={handleCenterTapRelease} > }> - {props.children} + + {props.children} + diff --git a/src/routes/blog/[title]/index.tsx b/src/routes/blog/[title]/index.tsx index 55837fb..9f6fca3 100644 --- a/src/routes/blog/[title]/index.tsx +++ b/src/routes/blog/[title]/index.tsx @@ -286,199 +286,197 @@ export default function PostPage() { }; return ( - - - - + + + + } + > + {(loadedData) => { + if ("redirect" in loadedData()) { + return ; } - > - {(loadedData) => { - if ("redirect" in loadedData()) { - return ; - } - return ( - } - > - {(p) => { - const postData = loadedData(); + return ( + } + > + {(p) => { + const postData = loadedData(); - const userCommentMap = new Map( - postData.userCommentArray || [] - ); - const reactionMap = new Map( - postData.reactionArray || [] - ); + const userCommentMap = new Map( + postData.userCommentArray || [] + ); + const reactionMap = new Map( + postData.reactionArray || [] + ); - return ( - <> - - {p().title.replaceAll("_", " ")} | Michael Freno - - + return ( + <> + + {p().title.replaceAll("_", " ")} | Michael Freno + + - - - - - - {p().title.replaceAll("_", " ")} - - - {p().subtitle} - - - - - - - - - - - - - Written {new Date(p().date).toDateString()} - - - - Edited:{" "} - {new Date( - p().last_edited_date - ).toDateString()} - - - - - - By Michael Freno - - - - - {(tag) => { - const tagValue = tag.value; - return tagValue ? ( - - {tagValue} - - ) : null; - }} - - + + + + + + {p().title.replaceAll("_", " ")} + + + {p().subtitle} - - - - - - - - {postData.reads || 0}{" "} - {postData.reads === 1 ? "Hit" : "Hits"} - - - - - { - document - .getElementById("comments") - ?.scrollIntoView({ behavior: "smooth" }); - }} - class="tooltip flex flex-col items-center" - > - - - - - {postData.comments.length}{" "} - {postData.comments.length === 1 - ? "Comment" - : "Comments"} - - - - - - - - - - - {p().title.replaceAll("_", " ")} - - - {p().subtitle} - - - - - - - - - + - > - ); - }} - - ); - }} - - + + + + + + + + Written {new Date(p().date).toDateString()} + + + + Edited:{" "} + {new Date( + p().last_edited_date + ).toDateString()} + + + + + + By Michael Freno + + + + + {(tag) => { + const tagValue = tag.value; + return tagValue ? ( + + {tagValue} + + ) : null; + }} + + + + + + + + + + + {postData.reads || 0}{" "} + {postData.reads === 1 ? "Hit" : "Hits"} + + + + + { + document + .getElementById("comments") + ?.scrollIntoView({ behavior: "smooth" }); + }} + class="tooltip flex flex-col items-center" + > + + + + + {postData.comments.length}{" "} + {postData.comments.length === 1 + ? "Comment" + : "Comments"} + + + + + + + + + + + {p().title.replaceAll("_", " ")} + + + {p().subtitle} + + + + + + + + + + + + + > + ); + }} + + ); + }} + ); }