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={ + + } />