From 5fdaf7356107c158180a8d41517e1bfed3073f87 Mon Sep 17 00:00:00 2001 From: Claudio W Date: Sun, 1 Oct 2023 22:21:50 +0200 Subject: [PATCH] fix: merged js logos and fixed svgs (#5930) --- .../{color.stories.tsx => colors.stories.tsx} | 11 +- ...xt.stories.tsx => font-family.stories.tsx} | 11 +- components/__design__/hex-logos.stories.tsx | 38 ------ .../__design__/horizontal-logos.stories.tsx | 27 ---- components/__design__/js-logos.stories.tsx | 30 ----- components/__design__/node-logos.stories.tsx | 121 ++++++++++++++++++ .../__design__/platform-logos.stories.tsx | 87 +++++++------ .../__design__/social-logos.stories.tsx | 95 +++++++------- .../__design__/stacked-logos.stories.tsx | 40 ------ .../static/images/logos/horizontal-dark.svg | 39 +----- .../static/images/logos/horizontal-light.svg | 39 +----- public/static/images/logos/js-white.svg | 12 +- public/static/images/logos/platform-linux.svg | 1 + .../images/logos/social-github-dark.svg | 1 + public/static/images/logos/social-github.svg | 4 +- .../static/images/logos/social-linkedin.svg | 2 +- ...ocial-mastadon.svg => social-mastodon.svg} | 0 public/static/images/logos/social-x.svg | 4 +- 18 files changed, 231 insertions(+), 331 deletions(-) rename components/__design__/{color.stories.tsx => colors.stories.tsx} (97%) rename components/__design__/{text.stories.tsx => font-family.stories.tsx} (96%) delete mode 100644 components/__design__/hex-logos.stories.tsx delete mode 100644 components/__design__/horizontal-logos.stories.tsx delete mode 100644 components/__design__/js-logos.stories.tsx create mode 100644 components/__design__/node-logos.stories.tsx delete mode 100644 components/__design__/stacked-logos.stories.tsx create mode 100644 public/static/images/logos/platform-linux.svg create mode 100644 public/static/images/logos/social-github-dark.svg rename public/static/images/logos/{social-mastadon.svg => social-mastodon.svg} (100%) diff --git a/components/__design__/color.stories.tsx b/components/__design__/colors.stories.tsx similarity index 97% rename from components/__design__/color.stories.tsx rename to components/__design__/colors.stories.tsx index eb6824f6e818e..1727c19296a16 100644 --- a/components/__design__/color.stories.tsx +++ b/components/__design__/colors.stories.tsx @@ -1,8 +1,6 @@ import type { Meta as MetaObj, StoryObj } from '@storybook/react'; import type { CSSProperties } from 'react'; -export const Default: StoryObj = {}; - const containerStyle = { display: 'flex', flexDirection: 'row', @@ -24,9 +22,8 @@ const gridEntryStyle = { gap: '1rem', } satisfies CSSProperties; -export default { - title: 'Design System/Colors', - component: () => ( +export const Colors: StoryObj = { + render: () => (
@@ -102,4 +99,6 @@ export default {
), -} as MetaObj; +}; + +export default { title: 'Design System' } as MetaObj; diff --git a/components/__design__/text.stories.tsx b/components/__design__/font-family.stories.tsx similarity index 96% rename from components/__design__/text.stories.tsx rename to components/__design__/font-family.stories.tsx index b2714b20330f3..082ef6a1e6bfa 100644 --- a/components/__design__/text.stories.tsx +++ b/components/__design__/font-family.stories.tsx @@ -1,8 +1,6 @@ import type { Meta as MetaObj, StoryObj } from '@storybook/react'; import type { CSSProperties } from 'react'; -export const Default: StoryObj = {}; - const textStyles = { alignItems: 'center', display: 'flex', @@ -14,9 +12,8 @@ const textStyles = { width: '100%', } satisfies CSSProperties; -export default { - title: 'Design System/Text', - component: () => ( +export const FontFamily: StoryObj = { + render: () => (

Text XS/Regular

@@ -86,4 +83,6 @@ export default {
), -} as MetaObj; +}; + +export default { title: 'Design System' } as MetaObj; diff --git a/components/__design__/hex-logos.stories.tsx b/components/__design__/hex-logos.stories.tsx deleted file mode 100644 index 8134fcc6bd69d..0000000000000 --- a/components/__design__/hex-logos.stories.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import type { Meta as MetaObj, StoryObj } from '@storybook/react'; -import Image from 'next/image'; - -export const HexLogos: StoryObj = {}; - -export default { - title: 'Design System/Hex Logos', - component: () => { - return ( -
-
- Node.js -
-
- Node.js -
-
- Node.js -
-
- ); - }, -} as MetaObj; diff --git a/components/__design__/horizontal-logos.stories.tsx b/components/__design__/horizontal-logos.stories.tsx deleted file mode 100644 index 4246557a205f3..0000000000000 --- a/components/__design__/horizontal-logos.stories.tsx +++ /dev/null @@ -1,27 +0,0 @@ -import type { Meta as MetaObj, StoryObj } from '@storybook/react'; -import Image from 'next/image'; - -export const HorizontalLogos: StoryObj = {}; - -export default { - title: 'Design System/Logos', - component: () => { - return ( -
- Node.js - Node.js -
- ); - }, -} as MetaObj; diff --git a/components/__design__/js-logos.stories.tsx b/components/__design__/js-logos.stories.tsx deleted file mode 100644 index c33b661852977..0000000000000 --- a/components/__design__/js-logos.stories.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import type { Meta as MetaObj, StoryObj } from '@storybook/react'; -import Image from 'next/image'; - -export const JSLogos: StoryObj = {}; - -export default { - title: 'Design System/JS Logos', - component: () => { - return ( -
-
- Node.js -
-
- Node.js -
-
- ); - }, -} as MetaObj; diff --git a/components/__design__/node-logos.stories.tsx b/components/__design__/node-logos.stories.tsx new file mode 100644 index 0000000000000..4dd5184583223 --- /dev/null +++ b/components/__design__/node-logos.stories.tsx @@ -0,0 +1,121 @@ +import type { Meta as MetaObj, StoryObj } from '@storybook/react'; +import Image from 'next/image'; + +export const HorizontalLogos: StoryObj = { + render: () => ( +
+
+ Node.js +
+
+ Node.js +
+
+ ), +}; + +export const StackedLogos: StoryObj = { + render: () => ( +
+
+ Node.js +
+
+ Node.js +
+
+ Node.js +
+
+ Node.js +
+
+ ), +}; + +export const JSSymbols: StoryObj = { + render: () => ( +
+
+ Node.js +
+
+ Node.js +
+
+ ), +}; + +export const HexSymbols: StoryObj = { + render: () => ( +
+
+ Node.js +
+
+ Node.js +
+
+ Node.js +
+
+ ), +}; + +export default { title: 'Design System/Node.js Logos' } as MetaObj; diff --git a/components/__design__/platform-logos.stories.tsx b/components/__design__/platform-logos.stories.tsx index fb9077222451d..790906f73fdea 100644 --- a/components/__design__/platform-logos.stories.tsx +++ b/components/__design__/platform-logos.stories.tsx @@ -1,46 +1,51 @@ import type { Meta as MetaObj, StoryObj } from '@storybook/react'; import Image from 'next/image'; -export const PlatformLogos: StoryObj = {}; - -export default { - title: 'Design System/Platform Logos', - component: () => { - return ( +export const PlatformLogos: StoryObj = { + render: () => ( +
+
+ Ubuntu Logo +
+
+ Apple Logo +
-
- Apple Logo -
-
- Microsoft Logo -
-
- Homebrew Logo -
-
- Placeholder Logo -
+ Microsoft Logo
- ); - }, -} as MetaObj; +
+ Homebrew Logo +
+
+ Placeholder Logo +
+
+ ), +}; + +export default { title: 'Design System' } as MetaObj; diff --git a/components/__design__/social-logos.stories.tsx b/components/__design__/social-logos.stories.tsx index 57b42f32c89f3..79e13f25ea5d4 100644 --- a/components/__design__/social-logos.stories.tsx +++ b/components/__design__/social-logos.stories.tsx @@ -1,54 +1,51 @@ import type { Meta as MetaObj, StoryObj } from '@storybook/react'; import Image from 'next/image'; -export const SocialLogos: StoryObj = {}; - -export default { - title: 'Design System/Social Logos', - component: () => { - return ( +export const SocialMediaLogos: StoryObj = { + render: () => ( +
+
+ GitHub Logo +
+
+ Mastodon Logo +
-
- GitHub Logo -
-
- Mastadon Logo -
-
- LinkedIn Logo -
-
- Slack Logo -
-
- X Logo -
+ LinkedIn Logo
- ); - }, -} as MetaObj; +
+ Slack Logo +
+
+ X Logo +
+
+ ), +}; + +export default { title: 'Design System' } as MetaObj; diff --git a/components/__design__/stacked-logos.stories.tsx b/components/__design__/stacked-logos.stories.tsx deleted file mode 100644 index ce12226e01a30..0000000000000 --- a/components/__design__/stacked-logos.stories.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import type { Meta as MetaObj, StoryObj } from '@storybook/react'; -import Image from 'next/image'; - -export const StackedLogos: StoryObj = {}; - -export default { - title: 'Design System/Stacked Logos', - component: () => { - return ( -
-
- Node.js - Node.js - Node.js - Node.js -
-
- ); - }, -} as MetaObj; diff --git a/public/static/images/logos/horizontal-dark.svg b/public/static/images/logos/horizontal-dark.svg index 08d1d85b4bc62..bf2f5635ba473 100644 --- a/public/static/images/logos/horizontal-dark.svg +++ b/public/static/images/logos/horizontal-dark.svg @@ -1,38 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/public/static/images/logos/horizontal-light.svg b/public/static/images/logos/horizontal-light.svg index bd735e842ff00..d976f17b7ca41 100644 --- a/public/static/images/logos/horizontal-light.svg +++ b/public/static/images/logos/horizontal-light.svg @@ -1,38 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/public/static/images/logos/js-white.svg b/public/static/images/logos/js-white.svg index 201f3217c0062..ed74c1b853715 100644 --- a/public/static/images/logos/js-white.svg +++ b/public/static/images/logos/js-white.svg @@ -1,11 +1 @@ - - - - - - - - - - - + diff --git a/public/static/images/logos/platform-linux.svg b/public/static/images/logos/platform-linux.svg new file mode 100644 index 0000000000000..dd718b9e9bf1d --- /dev/null +++ b/public/static/images/logos/platform-linux.svg @@ -0,0 +1 @@ + diff --git a/public/static/images/logos/social-github-dark.svg b/public/static/images/logos/social-github-dark.svg new file mode 100644 index 0000000000000..f69bf084cf21d --- /dev/null +++ b/public/static/images/logos/social-github-dark.svg @@ -0,0 +1 @@ + diff --git a/public/static/images/logos/social-github.svg b/public/static/images/logos/social-github.svg index d2c0a25fe61fc..6dcf93b5f8a07 100644 --- a/public/static/images/logos/social-github.svg +++ b/public/static/images/logos/social-github.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + diff --git a/public/static/images/logos/social-linkedin.svg b/public/static/images/logos/social-linkedin.svg index 37b378d4445fa..2f285928d11d6 100644 --- a/public/static/images/logos/social-linkedin.svg +++ b/public/static/images/logos/social-linkedin.svg @@ -1 +1 @@ - + diff --git a/public/static/images/logos/social-mastadon.svg b/public/static/images/logos/social-mastodon.svg similarity index 100% rename from public/static/images/logos/social-mastadon.svg rename to public/static/images/logos/social-mastodon.svg diff --git a/public/static/images/logos/social-x.svg b/public/static/images/logos/social-x.svg index 6f38574b37352..6c12987798db6 100644 --- a/public/static/images/logos/social-x.svg +++ b/public/static/images/logos/social-x.svg @@ -1,3 +1 @@ - - - \ No newline at end of file +