diff --git a/packages/web/components/elements/icons/ArchiveSectionIcon.tsx b/packages/web/components/elements/icons/ArchiveSectionIcon.tsx new file mode 100644 index 000000000..b37c0447b --- /dev/null +++ b/packages/web/components/elements/icons/ArchiveSectionIcon.tsx @@ -0,0 +1,32 @@ +/* eslint-disable functional/no-class */ +/* eslint-disable functional/no-this-expression */ +import { IconProps } from './IconProps' + +import React from 'react' + +export class ArchiveSectionIcon extends React.Component { + render() { + const color = (this.props.color || '#2A2A2A').toString() + + return ( + + + + + + + ) + } +} diff --git a/packages/web/components/elements/icons/HomeIcon.tsx b/packages/web/components/elements/icons/HomeIcon.tsx index 0f9e7ce0d..2bba94f9f 100644 --- a/packages/web/components/elements/icons/HomeIcon.tsx +++ b/packages/web/components/elements/icons/HomeIcon.tsx @@ -1,5 +1,6 @@ /* eslint-disable functional/no-class */ /* eslint-disable functional/no-this-expression */ +import { SpanBox } from '../LayoutPrimitives' import { IconProps } from './IconProps' import React from 'react' @@ -19,7 +20,7 @@ export class HomeIcon extends React.Component { > diff --git a/packages/web/components/elements/icons/NavMoreButtonDown.tsx b/packages/web/components/elements/icons/NavMoreButtonDown.tsx new file mode 100644 index 000000000..4d76c4c0a --- /dev/null +++ b/packages/web/components/elements/icons/NavMoreButtonDown.tsx @@ -0,0 +1,31 @@ +/* eslint-disable functional/no-class */ +/* eslint-disable functional/no-this-expression */ +import { IconProps } from './IconProps' + +import React from 'react' + +export class NavMoreButtonDownIcon extends React.Component { + render() { + const color = (this.props.color || '#2A2A2A').toString() + + return ( + + + + + + ) + } +} diff --git a/packages/web/components/elements/icons/NavMoreButtonUp.tsx b/packages/web/components/elements/icons/NavMoreButtonUp.tsx new file mode 100644 index 000000000..4270cad1e --- /dev/null +++ b/packages/web/components/elements/icons/NavMoreButtonUp.tsx @@ -0,0 +1,29 @@ +/* eslint-disable functional/no-class */ +/* eslint-disable functional/no-this-expression */ +import { IconProps } from './IconProps' + +import React from 'react' + +export class NavMoreButtonUpIcon extends React.Component { + render() { + const color = (this.props.color || '#2A2A2A').toString() + + return ( + + + + ) + } +} diff --git a/packages/web/components/elements/icons/ShortcutFolderClosed.tsx b/packages/web/components/elements/icons/ShortcutFolderClosed.tsx new file mode 100644 index 000000000..558cd8acf --- /dev/null +++ b/packages/web/components/elements/icons/ShortcutFolderClosed.tsx @@ -0,0 +1,29 @@ +/* eslint-disable functional/no-class */ +/* eslint-disable functional/no-this-expression */ +import { IconProps } from './IconProps' + +import React from 'react' + +export class ShortcutFolderClosed 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/templates/PrimaryDropdown.tsx b/packages/web/components/templates/PrimaryDropdown.tsx index e2510ea7c..2785f8a57 100644 --- a/packages/web/components/templates/PrimaryDropdown.tsx +++ b/packages/web/components/templates/PrimaryDropdown.tsx @@ -20,8 +20,6 @@ import { ThemeSelector } from './article/ReaderSettingsControl' type PrimaryDropdownProps = { children?: ReactNode - showThemeSection: boolean - showFullThemeSection: boolean layout?: LayoutType updateLayout?: (layout: LayoutType) => void @@ -194,8 +192,7 @@ export function PrimaryDropdown(props: PrimaryDropdownProps): JSX.Element { - {props.showThemeSection && } - {props.showFullThemeSection && } + headerDropdownActionHandler('navigate-to-install')} title="Install" diff --git a/packages/web/components/templates/navMenu/Footer.tsx b/packages/web/components/templates/navMenu/Footer.tsx index 273514a6c..4a1c4f754 100644 --- a/packages/web/components/templates/navMenu/Footer.tsx +++ b/packages/web/components/templates/navMenu/Footer.tsx @@ -29,10 +29,7 @@ export const NavMenuFooter = (props: NavMenuFooterProps): JSX.Element => { }, }} > - + { style="articleActionIcon" css={{ display: 'flex', - ml: '15px', width: '100%', + + gap: '10px', + maxWidth: '100%', + height: '34px', + px: '15px', + + fontSize: '15px', + fontWeight: 'regular', + fontFamily: '$display', + + color: '$thLibraryMenuUnselected', + '&:hover': { + opacity: '1', + color: '$thLibraryMenuUnselected', backgroundColor: '$thBackground4', }, }} @@ -238,11 +257,19 @@ const LibraryNav = (props: LibraryFilterMenuProps): JSX.Element => { event.preventDefault() }} > - + {moreFoldersOpenState ? ( - + ) : ( - + )} More @@ -254,14 +281,20 @@ const LibraryNav = (props: LibraryFilterMenuProps): JSX.Element => { text="Archive" section="archive" isSelected={props.section == 'archive'} - icon={} + icon={ + + } /> } + icon={ + + } /> )} @@ -748,8 +781,7 @@ const NodeItemContents = (props: NodeItemContentsProps): JSX.Element => { }} > {props.node.isClosed ? ( - ) : ( diff --git a/packages/web/components/templates/reader/ReaderHeader.tsx b/packages/web/components/templates/reader/ReaderHeader.tsx index 75c776241..99a00d533 100644 --- a/packages/web/components/templates/reader/ReaderHeader.tsx +++ b/packages/web/components/templates/reader/ReaderHeader.tsx @@ -144,12 +144,6 @@ function ControlButtonBox(props: ReaderHeaderProps): JSX.Element { color={theme.colors.thHighContrast.toString()} /> - - - )