Skip to content

Commit 8b7d333

Browse files
authored
Merge pull request #213 from digital-go-jp/v2
merge v2 into main
2 parents 5d073f9 + f26fa10 commit 8b7d333

38 files changed

+811
-316
lines changed

.storybook/globals.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;500;700&display=swap");
22
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+Mono:wght@400;700&display=swap");
33

4+
@import "@digital-go-jp/design-tokens";
5+
46
@tailwind base;
57
@tailwind components;
68
@tailwind utilities;

.storybook/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { StorybookConfig } from '@storybook/react-vite';
22

33
const config: StorybookConfig = {
4-
stories: ['../src/docs/*.stories.@(js|jsx|ts|tsx)', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
4+
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
55
addons: ['@storybook/addon-links', '@storybook/addon-a11y', '@storybook/addon-docs'],
66

77
framework: {

.storybook/preview.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { Preview } from '@storybook/react-vite';
22
import './globals.css';
3+
import "./prose.css";
34

45
const preview: Preview = {
56
parameters: {
@@ -15,7 +16,10 @@ const preview: Preview = {
1516
options: {
1617
storySort: {
1718
order: [
18-
'Getting Started',
19+
'Documents',
20+
[
21+
'はじめに'
22+
],
1923
'Component',
2024
[
2125
'アコーディオン',

0 commit comments

Comments
 (0)