diff --git a/app/[leaflet_id]/actions/HelpButton.tsx b/app/[leaflet_id]/actions/HelpButton.tsx index 64d15a09..4639601a 100644 --- a/app/[leaflet_id]/actions/HelpButton.tsx +++ b/app/[leaflet_id]/actions/HelpButton.tsx @@ -9,6 +9,7 @@ import { ActionButton } from "components/ActionBar/ActionButton"; import { HelpSmall } from "../../../components/Icons/HelpSmall"; import { isMac } from "src/utils/isDevice"; import { useIsMobile } from "src/hooks/isMobile"; +import { HelpContent } from "components/ActionBar/DesktopNavigation"; export const HelpButton = (props: { noShortcuts?: boolean }) => { let entity_set = useEntitySetContext(); @@ -25,22 +26,7 @@ export const HelpButton = (props: { noShortcuts?: boolean }) => {
- {/* about links */} - - - - - {/* contact links */} -
- - -
+ {/* keyboard shortcuts: desktop only */} {!props.noShortcuts && ( diff --git a/app/globals.css b/app/globals.css index 107c3663..e2d5a0f5 100644 --- a/app/globals.css +++ b/app/globals.css @@ -70,12 +70,7 @@ width: -webkit-fill-available; width: -moz-available; width: stretch; -} - -@utility h-fill { - height: -webkit-fill-available; - height: -moz-available; - height: stretch; + width: 100%; } /* diff --git a/components/ActionBar/DesktopNavigation.tsx b/components/ActionBar/DesktopNavigation.tsx index e0bd2859..4d1f425d 100644 --- a/components/ActionBar/DesktopNavigation.tsx +++ b/components/ActionBar/DesktopNavigation.tsx @@ -144,7 +144,7 @@ const HelpPopover = () => { asChild side={isMobile ? "top" : "right"} align={isMobile ? "center" : "start"} - className="w-xs max-sw-full z-[60]!" + className="w-xs max-sw-full pt-3 z-[60]!" trigger={ } > -
-

Welcome to Leaflet!

-
- An expressive tool for publishing blogs and newsletters -
-
- + + ); +}; + +export const HelpContent = () => { + return ( +
+

Welcome to Leaflet!

+
+ An expressive tool for publishing blogs and newsletters +
+
-
-
- - Terms + Sign up for our Newsletter + + +
+ {/*
*/} +
+ + Terms + + {/* + THIS SHOULD GO TO THE LANDING PAGE + + Learn More - {/* - THIS SHOULD GO TO THE LANDING PAGE - - Learn More - - */} - - Contact - -
+ */} + + Email +
- +
); }; diff --git a/components/ActionBar/Sidebar.tsx b/components/ActionBar/Sidebar.tsx index 4a0b3c01..131eb745 100644 --- a/components/ActionBar/Sidebar.tsx +++ b/components/ActionBar/Sidebar.tsx @@ -30,7 +30,7 @@ export function Sidebar(props: { return ( Navigation - +