diff --git a/app/assets/icons/bot.svg b/app/assets/icons/bot.svg index 20ee38de..e61f29ac 100644 --- a/app/assets/icons/bot.svg +++ b/app/assets/icons/bot.svg @@ -1,9 +1,9 @@ - - - - - - - - + + + + + + + + diff --git a/app/components/Article/KeepGoing/index.tsx b/app/components/Article/KeepGoing/index.tsx index 4d96776e..96c9cb52 100644 --- a/app/components/Article/KeepGoing/index.tsx +++ b/app/components/Article/KeepGoing/index.tsx @@ -16,7 +16,7 @@ type NextArticleProps = { const NextArticle = ({section, next, first}: NextArticleProps) => next && ( <> -

Keep going! 👉

+

Keep going! 👉

{first ? 'Start' : 'Continue'} with the {first ? 'first' : 'next'} article in{' '} {section?.category} @@ -46,18 +46,24 @@ export const KeepGoing = ({pageid, relatedQuestions}: Question) => { } return ( -
+
{!skipNext && ( )} {next && hasRelated && !skipNext && ( -
Or jump to a related question
+
Or jump to a related question
)} {hasRelated && !skipNext && ( - +
+ +
+ )} + {skipNext && ( +
+ +
)} - {skipNext && }
) } diff --git a/app/components/Article/article.css b/app/components/Article/article.css index d4ef8641..f7ad0e28 100644 --- a/app/components/Article/article.css +++ b/app/components/Article/article.css @@ -1,12 +1,10 @@ article { max-width: 47.43vw; + margin: auto; } .article-wrapper { - padding-top: var(--spacing-40); - margin-left: 5.56vw; - margin-right: 13.33vw; - gap: 10.69vw; + padding: var(--spacing-80); } article .meta { @@ -35,6 +33,7 @@ article .tags { flex-direction: row; flex-wrap: wrap; gap: var(--spacing-8); + margin-top: var(--spacing-40); } article .tag { @@ -42,7 +41,7 @@ article .tag { background-color: var(--colors-teal-50); border-color: var(--colors-teal-100); color: var(--colors-teal-500); - padding: 0 var(--spacing-8); + padding: 0 var(--spacing-16); } article .tag:hover { diff --git a/app/components/Article/index.tsx b/app/components/Article/index.tsx index f9e3585e..ae062a92 100644 --- a/app/components/Article/index.tsx +++ b/app/components/Article/index.tsx @@ -21,7 +21,7 @@ const ArticleFooter = (question: Question) => { return ( !isLoading(question) && ( -
+
{date &&
{`Updated ${date}`}
}
diff --git a/app/components/Grid/grid.css b/app/components/Grid/grid.css index 79308ae5..c747ffc2 100644 --- a/app/components/Grid/grid.css +++ b/app/components/Grid/grid.css @@ -11,7 +11,9 @@ .grid-item { cursor: pointer; text-align: left; - padding: 32.5px 32px; + padding: var(--spacing-32) var(--spacing-32); + min-width: var(--spacing-288); + min-height: var(--spacing-288); text-decoration: none; } @@ -29,7 +31,7 @@ .grid { display: grid; - gap: 50px 50px; + gap: var(--spacing-56) var(--spacing-56); grid-template-columns: repeat(3, 1fr); justify-content: space-around; } diff --git a/app/components/Nav/index.tsx b/app/components/Nav/index.tsx index ea60de58..364d9cb7 100644 --- a/app/components/Nav/index.tsx +++ b/app/components/Nav/index.tsx @@ -1,7 +1,7 @@ import {Link} from '@remix-run/react' import {MenuItem} from '~/components/Menu' import OpenBookIcon from '~/components/icons-generated/OpenBook' -import ChatBoxIcon from '~/components/icons-generated/Chatbot' +import BotIcon from '~/components/icons-generated/Bot' import AISafetyIcon from '~/components/icons-generated/Aisafety' import ArticlesDropdown from '~/components/ArticlesDropdown' import type {TOCItem} from '~/routes/questions.toc' @@ -32,7 +32,7 @@ export const Nav = ({toc, categories}: NavProps) => { } + icon={} text="Stampy chatbot" />
  • diff --git a/app/components/Table/listTable.module.css b/app/components/Table/listTable.module.css index f77d9551..2d87ee97 100644 --- a/app/components/Table/listTable.module.css +++ b/app/components/Table/listTable.module.css @@ -10,6 +10,9 @@ .entry:hover { background-color: var(--colors-teal-50); } +.entry svg { + min-width: var(--spacing-16); +} .container > .entry:last-child { border-bottom: none; diff --git a/app/components/Widget/Stampy.tsx b/app/components/Widget/Stampy.tsx index 90ae0e87..e796b57b 100644 --- a/app/components/Widget/Stampy.tsx +++ b/app/components/Widget/Stampy.tsx @@ -40,7 +40,6 @@ export const WidgetStampy = () => { />
    • -
    diff --git a/app/components/icons-generated/Bot.tsx b/app/components/icons-generated/Bot.tsx index 991aa73b..c056c92a 100644 --- a/app/components/icons-generated/Bot.tsx +++ b/app/components/icons-generated/Bot.tsx @@ -1,19 +1,19 @@ import type {SVGProps} from 'react' const SvgBot = (props: SVGProps) => ( - + - + - - + + ) export default SvgBot diff --git a/app/components/icons-generated/Group.tsx b/app/components/icons-generated/Group.tsx index 316952f8..b00dc0d3 100644 --- a/app/components/icons-generated/Group.tsx +++ b/app/components/icons-generated/Group.tsx @@ -1,6 +1,6 @@ import type {SVGProps} from 'react' const SvgGroup = (props: SVGProps) => ( - + ) => ( maskType: 'alpha', }} > - + diff --git a/app/components/icons-generated/index.ts b/app/components/icons-generated/index.ts index bdb2c0f3..c57367da 100644 --- a/app/components/icons-generated/index.ts +++ b/app/components/icons-generated/index.ts @@ -19,6 +19,7 @@ export {default as Edit} from './Edit' export {default as Ellipsis} from './Ellipsis' export {default as Flag} from './Flag' export {default as Followup} from './Followup' +export {default as Group} from './Group' export {default as GroupTopEcplise} from './GroupTopEcplise' export {default as Hide} from './Hide' export {default as Like} from './Like' diff --git a/app/hooks/useToC.tsx b/app/hooks/useToC.tsx index 18cf64db..306b30ea 100644 --- a/app/hooks/useToC.tsx +++ b/app/hooks/useToC.tsx @@ -36,9 +36,9 @@ const useToC = () => { next?: TOCItem } const findNext = (prev: string | undefined, item: TOCItem): NextItem => { - if (pageid === prev) return {current: prev, next: item} + if (item.hasText && pageid === prev) return {current: prev, next: item} - let previous: string | undefined = item.pageid + let previous: string | undefined = item.hasText ? item.pageid : prev for (const child of item.children || []) { const {next, current} = findNext(previous, child) if (next) return {next, current} diff --git a/app/routes/$questionId.tsx b/app/routes/$questionId.tsx index 96b7c159..9f10ff78 100644 --- a/app/routes/$questionId.tsx +++ b/app/routes/$questionId.tsx @@ -2,7 +2,7 @@ import {Await, useLoaderData, useParams} from '@remix-run/react' import {Suspense, useEffect, useState} from 'react' import Page from '~/components/Page' import {loader} from '~/routes/questions.$questionId' -import {ArticlesNav, EmtpyArticlesNav} from '~/components/ArticlesNav/Menu' +import {ArticlesNav} from '~/components/ArticlesNav/Menu' import Article from '~/components/Article' import Error from '~/components/Error' import {fetchGlossary} from '~/routes/questions.glossary' @@ -37,11 +37,7 @@ export default function RenderArticle() { return (
    - {section ? ( - - ) : ( - - )} + {section && } } diff --git a/app/routes/_index.tsx b/app/routes/_index.tsx index 8542ce9a..28d73e1a 100644 --- a/app/routes/_index.tsx +++ b/app/routes/_index.tsx @@ -42,8 +42,8 @@ export default function App() { -
    -

    Advanced content

    +
    +

    Advanced content