diff --git a/app/root.tsx b/app/root.tsx index c25fb7daa..bcc7c129f 100644 --- a/app/root.tsx +++ b/app/root.tsx @@ -45,7 +45,7 @@ export const links: LinksFunction = () => { export const meta: MetaFunction = () => ({ charset: "utf-8", title: "sendou.ink", - viewport: "width=device-width,initial-scale=1,minimum-scale=1.0", + viewport: "width=device-width,initial-scale=1", }); export interface RootLoaderData { diff --git a/app/routes/plus/suggestions.tsx b/app/routes/plus/suggestions.tsx index 5761fa6e4..40c9c5fb8 100644 --- a/app/routes/plus/suggestions.tsx +++ b/app/routes/plus/suggestions.tsx @@ -221,7 +221,7 @@ export default function PlusSuggestionsPage() { {canSuggestNewUserFE({ user, suggestions: data.suggestions }) ? ( // TODO: resetScroll={false} https://twitter.com/ryanflorence/status/1527775882797907969 @@ -366,7 +366,7 @@ function SuggestedUser({ className="plus__comment-button" tiny variant="outlined" - to={`comment/${tier}/${suggested.suggestedUser.id}`} + to={`comment/${tier}/${suggested.suggestedUser.id}?tier=${tier}`} data-cy="comment-button" prefetch="render" > diff --git a/app/routes/plus/suggestions/comment.$tier.$userId.tsx b/app/routes/plus/suggestions/comment.$tier.$userId.tsx index fbea18b55..5a3b919dd 100644 --- a/app/routes/plus/suggestions/comment.$tier.$userId.tsx +++ b/app/routes/plus/suggestions/comment.$tier.$userId.tsx @@ -60,7 +60,7 @@ export const action: ActionFunction = async ({ request }) => { ...nextNonCompletedVoting(new Date()), }); - return redirect(plusSuggestionPage()); + return redirect(plusSuggestionPage(data.tier)); }; export default function PlusCommentModalPage() { diff --git a/app/styles/layout.css b/app/styles/layout.css index 03cbde3a5..a3302ef9b 100644 --- a/app/styles/layout.css +++ b/app/styles/layout.css @@ -104,26 +104,25 @@ } .layout__menu { - position: absolute; + position: fixed; z-index: 500; top: 0; right: 0; width: max-content; height: max-content; margin-top: 10rem; - margin-right: -12rem; - backdrop-filter: blur(10px) brightness(75%); background-color: var(--bg-lighter); background-image: url("/svg/background-pattern.svg"); border-end-start-radius: var(--rounded); border-start-start-radius: var(--rounded); overflow-y: auto; - transition: margin-right 0.5s; + transform: translateX(100%); + transition: transform 0.5s; transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); } .layout__menu.expanded { - margin-right: 0; + transform: none; } .layout__menu__link__icon {