Skip to content

Commit

Permalink
Merge pull request #46 from sanctuarycomputer/hotfix-divider
Browse files Browse the repository at this point in the history 
hotfix: divider
@nahbee10
nahbee10 authored Dec 13, 2024
2 parents f380f67 + 017495d commit 4df669c
Showing 4 changed files with 35,321 additions and 14,138 deletions.
49,272 changes: 35,223 additions & 14,049 deletions assets/shared-bundle.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "Copenhagen",
"author": "Sanctuary Computer",
"version": "4.2.28",
"version": "4.2.29",
"api_version": 4,
"default_locale": "en-us",
"settings": [
161 changes: 85 additions & 76 deletions src/modules/homepage/HomepageModule.tsx
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
Layers,
} from './Icons';
import { HomepageData, ColoredCardsColor, Article } from '../../lib/types';
import ConnectBlock from './ConnectBlock';

Check warning on line 16 in src/modules/homepage/HomepageModule.tsx

GitHub Actions / Lint JS files 

'ConnectBlock' is defined but never used
import { HeaderBackgroundMobile } from './HeaderBackgroundMobile';

type Props = {
@@ -114,92 +114,101 @@
</div>
)}
{homepageData.coloredCardsBlock && homepageData.coloredCardsBlock.cards.length > 0 ? (
<div className="ColoredCardBlock default-grid py-padding-x-large">
{homepageData.coloredCardsBlock.cards.map((card) => {
const textColorName = getColorName(card.color);
<>
<div className="ColoredCardBlock default-grid py-padding-x-large">
{homepageData.coloredCardsBlock.cards.map((card) => {
const textColorName = getColorName(card.color);

return (
<a
key={card.title}
href={card.url}
className={cn(
'ColoredCard rounded-large p-padding-medium col-span-4 md:col-span-2',
{
'bg-light-pink-fade dark:bg-dark-pink-fade hover:bg-light-accent-2-hovered dark:hover:bg-dark-accent-2-hovered':
card.color === 'pink',
'bg-light-green dark:bg-dark-green hover:bg-light-green-base-hovered dark:hover:bg-dark-green-base-hovered':
card.color === 'green',
'bg-light-blue dark:bg-dark-blue hover:bg-light-blue-base-hovered dark:hover:bg-dark-blue-base-hovered':
card.color === 'blue',
'bg-light-orange-fade dark:bg-dark-orange-fade hover:bg-light-orange-base-hovered dark:hover:bg-dark-orange-base-hovered':
card.color === 'orange',
}
)}
>
<ColoredCardsIconMap icon={card.icon} className="w-6 h-6" color={textColorName} />
<div className="mt-[1.875rem]">
<h3
className={cn('subheading-1', {
'text-light-orange-vibrant dark:text-dark-orange-vibrant':
textColorName === 'orange-vibrant',
'text-blue-base dark:text-blue-base': textColorName === 'blue-vibrant',
'text-green-base dark:text-green-vibrant': textColorName === 'green-base',
'text-light-pink-vibrant dark:text-dark-pink-vibrant':
textColorName === 'pink-vibrant',
})}
>
{card.title}
</h3>
<p className="body-3 text-light-neutral-2 dark:text-dark-neutral-2">
{card.description}
</p>
</div>
</a>
);
})}
</div>
) : null}
<Divider />
{faqArticles && faqArticles.length > 0 ? (
<div className="FAQBlock py-padding-x-large">
<div className="flex flex-row items-center">
<GraduationCap className="w-6 h-6 mr-2" color="neutral-1" />
<h3 className="heading-2 text-light-neutral-1 dark:text-dark-neutral-2">FAQ</h3>
</div>
<div className="default-grid gap-4 mt-padding-x-large">
{faqArticles.map((article) => (
<ArticleLinkCard
key={article.title}
title={article.title}
description={article.snippet}
url={article.url}
/>
))}
return (
<a
key={card.title}
href={card.url}
className={cn(
'ColoredCard rounded-large p-padding-medium col-span-4 md:col-span-2',
{
'bg-light-pink-fade dark:bg-dark-pink-fade hover:bg-light-accent-2-hovered dark:hover:bg-dark-accent-2-hovered':
card.color === 'pink',
'bg-light-green dark:bg-dark-green hover:bg-light-green-base-hovered dark:hover:bg-dark-green-base-hovered':
card.color === 'green',
'bg-light-blue dark:bg-dark-blue hover:bg-light-blue-base-hovered dark:hover:bg-dark-blue-base-hovered':
card.color === 'blue',
'bg-light-orange-fade dark:bg-dark-orange-fade hover:bg-light-orange-base-hovered dark:hover:bg-dark-orange-base-hovered':
card.color === 'orange',
}
)}
>
<ColoredCardsIconMap icon={card.icon} className="w-6 h-6" color={textColorName} />
<div className="mt-[1.875rem]">
<h3
className={cn('subheading-1', {
'text-light-orange-vibrant dark:text-dark-orange-vibrant':
textColorName === 'orange-vibrant',
'text-blue-base dark:text-blue-base': textColorName === 'blue-vibrant',
'text-green-base dark:text-green-vibrant': textColorName === 'green-base',
'text-light-pink-vibrant dark:text-dark-pink-vibrant':
textColorName === 'pink-vibrant',
})}
>
{card.title}
</h3>
<p className="body-3 text-light-neutral-2 dark:text-dark-neutral-2">
{card.description}
</p>
</div>
</a>
);
})}
</div>
</div>
<Divider />
</>
) : null}
<Divider />
{homepageData.guidesBlock && homepageData.guidesBlock.promotedArticles.length > 0 ? (
<div className="FAQBlock py-padding-x-large">
<div className="flex flex-row items-center">
<BookOpen className="w-6 h-6 mr-2" color="neutral-1" />
<h3 className="heading-2 text-light-neutral-1 dark:text-dark-neutral-2">Guides</h3>
</div>
<div className="default-grid gap-4 mt-padding-x-large">
{homepageData.guidesBlock.promotedArticles.map((article) => {
return (

{faqArticles && faqArticles.length > 0 ? (
<>
<div className="FAQBlock py-padding-x-large">
<div className="flex flex-row items-center">
<GraduationCap className="w-6 h-6 mr-2" color="neutral-1" />
<h3 className="heading-2 text-light-neutral-1 dark:text-dark-neutral-2">FAQ</h3>
</div>
<div className="default-grid gap-4 mt-padding-x-large">
{faqArticles.map((article) => (
<ArticleLinkCard
key={article.id}
key={article.title}
title={article.title}
description={article.snippet}
url={article.url}
/>
);
})}
))}
</div>
</div>
</div>
<Divider />
</>
) : null}

{homepageData.guidesBlock && homepageData.guidesBlock.promotedArticles.length > 0 ? (
<>
<div className="FAQBlock py-padding-x-large">
<div className="flex flex-row items-center">
<BookOpen className="w-6 h-6 mr-2" color="neutral-1" />
<h3 className="heading-2 text-light-neutral-1 dark:text-dark-neutral-2">Guides</h3>
</div>
<div className="default-grid gap-4 mt-padding-x-large">
{homepageData.guidesBlock.promotedArticles.map((article) => {
return (
<ArticleLinkCard
key={article.id}
title={article.title}
description={article.snippet}
url={article.url}
/>
);
})}
</div>
</div>
<Divider />
</>
) : null}
<Divider />

{homepageData.topicsBlock && homepageData.topicsBlock.categories.length > 0 ? (
<div className="FAQBlock py-padding-x-large md:mb-16">
<div className="flex flex-row items-center">
24 changes: 12 additions & 12 deletions style.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4df669c

Please sign in to comment.