From ba273c3b3c1a6ea696fb6225b9e9a6a40038f934 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Thu, 13 Jun 2024 20:16:52 +0800 Subject: [PATCH 1/5] Ensure layout doesnt change if siteicons arent set or fail to load --- packages/web/components/nav-containers/home.tsx | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/web/components/nav-containers/home.tsx b/packages/web/components/nav-containers/home.tsx index 41e353b87..a20efbe0c 100644 --- a/packages/web/components/nav-containers/home.tsx +++ b/packages/web/components/nav-containers/home.tsx @@ -673,6 +673,7 @@ const SourceInfo = (props: HomeItemViewProps & SourceInfoProps) => ( alignment="center" css={{ gap: '8px', + height: '16px', cursor: 'pointer', flex: '1', overflow: 'hidden', @@ -681,10 +682,7 @@ const SourceInfo = (props: HomeItemViewProps & SourceInfoProps) => ( }} > {props.homeItem.source.icon && ( - + )} - {props.source.icon && ( - - )} + {props.source.icon && } Date: Thu, 13 Jun 2024 20:23:21 +0800 Subject: [PATCH 2/5] Fix some spacing issues in left menu --- .../templates/navMenu/NavigationMenu.tsx | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/packages/web/components/templates/navMenu/NavigationMenu.tsx b/packages/web/components/templates/navMenu/NavigationMenu.tsx index 303d50c85..9ba894bed 100644 --- a/packages/web/components/templates/navMenu/NavigationMenu.tsx +++ b/packages/web/components/templates/navMenu/NavigationMenu.tsx @@ -98,13 +98,9 @@ export function NavigationMenu(props: NavigationMenuProps): JSX.Element { css={{ width: '100%', px: '15px', - pb: '17px', + pb: '10px', pt: '15px', lineHeight: '1', - '@mdDown': { - pb: '0px', - px: '15px', - }, }} > @@ -127,18 +123,6 @@ export function NavigationMenu(props: NavigationMenuProps): JSX.Element { - {/* This spacer pushes library content to the right of - the fixed left side menu. */} - ) } From bbdf598918391b67233f32866c5b01afaa864a61 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Thu, 13 Jun 2024 20:49:11 +0800 Subject: [PATCH 3/5] Update icons of left menu --- .../elements/icons/ArchiveSectionIcon.tsx | 6 ++--- .../elements/icons/FollowingIcon.tsx | 13 +++++----- .../elements/icons/HighlightsIcon.tsx | 21 ++++++++-------- .../components/elements/icons/HomeIcon.tsx | 9 ++++--- .../components/elements/icons/LibraryIcon.tsx | 11 ++++----- .../elements/icons/NavMoreButtonDown.tsx | 2 +- .../elements/icons/NavMoreButtonUp.tsx | 2 +- .../elements/icons/TrashSectionIcon.tsx | 10 ++++---- .../components/templates/NavigationLayout.tsx | 24 ++++++++++++------- .../templates/navMenu/NavigationMenu.tsx | 16 +++++++++---- 10 files changed, 63 insertions(+), 51 deletions(-) diff --git a/packages/web/components/elements/icons/ArchiveSectionIcon.tsx b/packages/web/components/elements/icons/ArchiveSectionIcon.tsx index b37c0447b..52ad5c73d 100644 --- a/packages/web/components/elements/icons/ArchiveSectionIcon.tsx +++ b/packages/web/components/elements/icons/ArchiveSectionIcon.tsx @@ -11,18 +11,18 @@ export class ArchiveSectionIcon extends React.Component { return ( diff --git a/packages/web/components/elements/icons/FollowingIcon.tsx b/packages/web/components/elements/icons/FollowingIcon.tsx index e9fca6c04..2de2f0bbe 100644 --- a/packages/web/components/elements/icons/FollowingIcon.tsx +++ b/packages/web/components/elements/icons/FollowingIcon.tsx @@ -6,33 +6,32 @@ import React from 'react' export class FollowingIcon extends React.Component { render() { - const size = (this.props.size || 26).toString() const color = (this.props.color || '#2A2A2A').toString() return ( { render() { - const size = (this.props.size || 26).toString() const color = (this.props.color || '#2A2A2A').toString() return ( @@ -17,32 +16,32 @@ export class HighlightsIcon extends React.Component { fill="none" xmlns="http://www.w3.org/2000/svg" > - + { render() { - const size = (this.props.size || 26).toString() const color = (this.props.color || '#2A2A2A').toString() return ( diff --git a/packages/web/components/elements/icons/LibraryIcon.tsx b/packages/web/components/elements/icons/LibraryIcon.tsx index c3a24a013..858c170de 100644 --- a/packages/web/components/elements/icons/LibraryIcon.tsx +++ b/packages/web/components/elements/icons/LibraryIcon.tsx @@ -6,24 +6,23 @@ import React from 'react' export class LibraryIcon extends React.Component { render() { - const size = (this.props.size || 26).toString() const color = (this.props.color || '#2A2A2A').toString() return ( diff --git a/packages/web/components/elements/icons/NavMoreButtonDown.tsx b/packages/web/components/elements/icons/NavMoreButtonDown.tsx index 4d76c4c0a..97b6d9a57 100644 --- a/packages/web/components/elements/icons/NavMoreButtonDown.tsx +++ b/packages/web/components/elements/icons/NavMoreButtonDown.tsx @@ -20,7 +20,7 @@ export class NavMoreButtonDownIcon extends React.Component { diff --git a/packages/web/components/elements/icons/NavMoreButtonUp.tsx b/packages/web/components/elements/icons/NavMoreButtonUp.tsx index 4270cad1e..467321bf0 100644 --- a/packages/web/components/elements/icons/NavMoreButtonUp.tsx +++ b/packages/web/components/elements/icons/NavMoreButtonUp.tsx @@ -19,7 +19,7 @@ export class NavMoreButtonUpIcon extends React.Component { diff --git a/packages/web/components/elements/icons/TrashSectionIcon.tsx b/packages/web/components/elements/icons/TrashSectionIcon.tsx index a42cea548..d0627bb8c 100644 --- a/packages/web/components/elements/icons/TrashSectionIcon.tsx +++ b/packages/web/components/elements/icons/TrashSectionIcon.tsx @@ -10,19 +10,19 @@ export class TrashSectionIcon extends React.Component { return ( diff --git a/packages/web/components/templates/NavigationLayout.tsx b/packages/web/components/templates/NavigationLayout.tsx index c3a8b09d0..e1b5742b9 100644 --- a/packages/web/components/templates/NavigationLayout.tsx +++ b/packages/web/components/templates/NavigationLayout.tsx @@ -19,6 +19,7 @@ import { DEFAULT_HEADER_HEIGHT } from './homeFeed/HeaderSpacer' import { Button } from '../elements/Button' import { List } from '@phosphor-icons/react' import { usePersistedState } from '../../lib/hooks/usePersistedState' +import { LIBRARY_LEFT_MENU_WIDTH } from './navMenu/LibraryLegacyMenu' export type NavigationSection = | 'home' @@ -144,13 +145,20 @@ export function NavigationLayout(props: NavigationLayoutProps): JSX.Element { /> {!isLoading && showNavMenu && ( - {}} - showMenu={showNavMenu} - setShowMenu={setShowNavMenu} - /> + <> + {}} + showMenu={showNavMenu} + setShowMenu={setShowNavMenu} + /> + + )} {props.children} {showLogoutConfirmation ? ( @@ -181,7 +189,7 @@ const Header = (props: HeaderProps): JSX.Element => { alignment="start" distribution="start" css={{ - zIndex: 5, + zIndex: 2, position: 'fixed', left: '15px', top: '15px', diff --git a/packages/web/components/templates/navMenu/NavigationMenu.tsx b/packages/web/components/templates/navMenu/NavigationMenu.tsx index 9ba894bed..ea0a5f054 100644 --- a/packages/web/components/templates/navMenu/NavigationMenu.tsx +++ b/packages/web/components/templates/navMenu/NavigationMenu.tsx @@ -153,28 +153,36 @@ const LibraryNav = (props: NavigationMenuProps): JSX.Element => { text="Home" section="home" isSelected={props.section == 'home'} - icon={} + icon={} /> } + icon={ + + } /> } + icon={ + + } /> } + icon={ + + } /> - + )} + {/* - - - + */} + + {props.homeItem.canArchive && ( + + )} + {props.homeItem.canDelete && ( + + )} + {props.homeItem.canShare && ( + + )}