Skip to content

Commit 60210a9

Browse files
abhix4abhix4
authored
Merge branch 'main' into fix/broken-scrollbar
2 parents b67af52 + f3fa461 commit 60210a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1712
-3136
lines changed

‎apps/frontpage/components/community/brand.tsx‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,42 +5,35 @@ import { Section } from './section';
55
export const BrandAndResources: FC = () => {
66
return (
77
<Section className="relative mb-8 md:mb-16" id="brand-resources">
8-
<h2 className="font-bold text-2xl mb-2">
8+
<h2 className="mb-2 text-2xl font-bold">
99
Use brand & presentation resources
1010
</h2>
1111
<p className="mb-8">
1212
The easiest way to get involved is to share Storybook with fellow
1313
developers, colleagues, and friends.
1414
</p>
15-
<div className="flex flex-col md:flex-row gap-8 mb-8">
16-
<div className="flex-1 border border-zinc-300 dark:border-slate-700 rounded p-6 md:p-8 flex gap-4 md:gap-6">
17-
<StorybookIcon className="w-10 h-10 text-[#ff4785]" />
15+
<div className="mb-8 flex flex-col gap-8 md:flex-row">
16+
<div className="flex flex-1 gap-4 rounded border border-zinc-300 p-6 md:gap-6 md:p-8 dark:border-slate-700">
17+
<StorybookIcon className="h-10 w-10 text-[#ff4785]" />
1818
<div className="flex-1">
19-
<h2 className="font-bold text-lg">Logo and brand</h2>
19+
<h2 className="text-lg font-bold">Logo and brand</h2>
2020
<p className="mb-3 text-zinc-500 dark:text-slate-400">
2121
Use the Storybook logo, typography, colors, and images.
2222
</p>
2323
<div className="flex items-center gap-4">
2424
<a
25-
className="flex gap-2 items-center text-blue-500"
25+
className="flex items-center gap-2 text-blue-500"
2626
href="https://github.com/storybookjs/brand"
2727
>
2828
Get logo
2929
<ChevronSmallRightIcon />
3030
</a>
31-
<a
32-
className="flex gap-2 items-center text-blue-500"
33-
href="https://github.com/storybookjs/design-system"
34-
>
35-
View design system
36-
<ChevronSmallRightIcon />
37-
</a>
3831
</div>
3932
</div>
4033
</div>
41-
<div className="flex-1 border border-zinc-300 dark:border-slate-700 rounded p-6 md:p-8 flex gap-4 md:gap-6">
34+
<div className="flex flex-1 gap-4 rounded border border-zinc-300 p-6 md:gap-6 md:p-8 dark:border-slate-700">
4235
<svg
43-
className="w-10 h-10"
36+
className="h-10 w-10"
4437
role="img"
4538
viewBox="0 0 48 48"
4639
xmlns="http://www.w3.org/2000/svg"
@@ -66,12 +59,12 @@ export const BrandAndResources: FC = () => {
6659
</g>
6760
</svg>
6861
<div className="flex-1">
69-
<h2 className="font-bold text-lg">Give a talk</h2>
62+
<h2 className="text-lg font-bold">Give a talk</h2>
7063
<p className="mb-3 text-zinc-500 dark:text-slate-400">
7164
Download presentation slides (Keynote, PDF).
7265
</p>
7366
<a
74-
className="flex gap-2 items-center text-blue-500"
67+
className="flex items-center gap-2 text-blue-500"
7568
href="https://github.com/storybookjs/brand/tree/master/presentation"
7669
>
7770
Download now

‎apps/frontpage/components/community/events.tsx‎

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import {
2-
ChevronSmallRightIcon,
3-
DiscordIcon,
4-
TwitterIcon,
5-
} from '@storybook/icons';
1+
import { ChevronSmallRightIcon, DiscordIcon, XIcon } from '@storybook/icons';
62
import type { FC } from 'react';
3+
import { BlueSkyIcon } from '@repo/ui';
74
import { Youtube } from '../logos/youtube';
85
import { Section } from './section';
96

@@ -33,40 +30,55 @@ export const Events: FC = () => {
3330
</div>
3431
</div>
3532
<div className="flex flex-1 gap-4 rounded border border-zinc-300 p-6 md:gap-6 md:p-8 dark:border-slate-700">
36-
<TwitterIcon className="h-10 w-10 text-[#4999e9]" />
33+
<DiscordIcon className="h-10 w-10 text-[#5a65ea]" />
3734
<div className="flex-1">
38-
<h2 className="text-lg font-bold">Twitter</h2>
35+
<h2 className="text-lg font-bold">Follow #announcements chat</h2>
3936
<p className="mb-3 text-zinc-500">
40-
Get the latest event updates from Storybook maintainers.
37+
Join our community chat to learn about live events and streams.
4138
</p>
4239
<a
4340
className="flex items-center gap-2 text-blue-500"
44-
href="https://twitter.com/storybookjs"
41+
href="https://discord.gg/storybook"
4542
>
46-
Follow now
43+
Chat now
4744
<ChevronSmallRightIcon />
4845
</a>
4946
</div>
5047
</div>
5148
</div>
5249
<div className="mb-8 flex flex-col gap-8 md:flex-row">
5350
<div className="flex flex-1 gap-4 rounded border border-zinc-300 p-6 md:gap-6 md:p-8 dark:border-slate-700">
54-
<DiscordIcon className="h-10 w-10 text-[#5a65ea]" />
51+
<BlueSkyIcon className="h-10 w-10" color="#0085ff" />
5552
<div className="flex-1">
56-
<h2 className="text-lg font-bold">Follow #announcements chat</h2>
53+
<h2 className="text-lg font-bold">Follow on BlueSky</h2>
5754
<p className="mb-3 text-zinc-500">
58-
Join our community chat to learn about live events and streams.
55+
Get the latest event updates from Storybook maintainers.
5956
</p>
6057
<a
6158
className="flex items-center gap-2 text-blue-500"
62-
href="https://discord.gg/storybook"
59+
href="https://bsky.app/profile/storybook.js.org"
6360
>
64-
Chat now
61+
Follow now
62+
<ChevronSmallRightIcon />
63+
</a>
64+
</div>
65+
</div>
66+
<div className="flex flex-1 gap-4 rounded border border-zinc-300 p-6 md:gap-6 md:p-8 dark:border-slate-700">
67+
<XIcon className="h-10 w-10" />
68+
<div className="flex-1">
69+
<h2 className="text-lg font-bold">Follow on X</h2>
70+
<p className="mb-3 text-zinc-500">
71+
Get the latest event updates from Storybook maintainers.
72+
</p>
73+
<a
74+
className="flex items-center gap-2 text-blue-500"
75+
href="https://twitter.com/storybookjs"
76+
>
77+
Follow now
6578
<ChevronSmallRightIcon />
6679
</a>
6780
</div>
6881
</div>
69-
<div className="flex-1 px-6 md:px-8" />
7082
</div>
7183
</Section>
7284
);

0 commit comments

Comments
 (0)