Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge develop into main #200

Merged
merged 24 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
38533b9
upgrade design-tokens
takumi-hatta-dig Nov 8, 2024
ca6d9c5
update examples
takumi-hatta-dig Nov 8, 2024
1de8ae8
upgrade dependencies
takumi-hatta-dig Nov 8, 2024
a9fd185
chore(deps): upgrade tailwindcss
johnykei Nov 19, 2024
2cdb7af
chore(deps): upgrade cross-spawn to fix security issue
johnykei Nov 19, 2024
108b3b8
chore(deps): upgrade postcss and vite
johnykei Nov 19, 2024
9f29d8a
Merge pull request #186 from digital-go-jp/feature/upgrade-dependencies
johnykei Nov 19, 2024
5b5f1ba
feat: put compiled files under the `examples` directory and use them
johnykei Nov 20, 2024
113aafc
chore: update README
johnykei Nov 20, 2024
67d2aed
chore(deps): upgrade cross-spawn to fix security issue
johnykei Nov 20, 2024
bdf33cc
chore(deps): upgrade dependencies on examples
johnykei Nov 20, 2024
ff107c6
Merge pull request #187 from digital-go-jp/feature/update-examples
johnykei Nov 20, 2024
a2cf694
chore(deps): upgrade design-tokens to 0.4.0
johnykei Nov 25, 2024
e27ac7b
feat: use the latest design tokens
johnykei Nov 25, 2024
d18a0de
feat: update examples
johnykei Nov 25, 2024
b2c3b60
feat: add OpacityGray and FontFamily to Tailwind CSS
johnykei Nov 25, 2024
87fcbb8
chore: update example and remove unnecessary config to set mono font
johnykei Nov 25, 2024
44aa171
feat: add new keys for LineHeight
johnykei Nov 25, 2024
bf4a5d1
Merge pull request #190 from digital-go-jp/feature/upgrade-design-tokens
johnykei Nov 26, 2024
6b3f6a5
chore(deps): update design-tokens to v1.0.0
johnykei Nov 29, 2024
017c490
chore: update examples
johnykei Nov 29, 2024
19ae14d
Merge pull request #199 from digital-go-jp/feature/upgrade-design-tokens
johnykei Nov 29, 2024
6e51763
feat: update version in README
johnykei Nov 29, 2024
d71282c
0.2.1
johnykei Nov 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ npm install @digital-go-jp/tailwind-theme-plugin

| Figma のバージョン | パッケージのバージョン |
| ------------------ | ---------------- |
| 2.0.4 | 0.2.1 |
| 2.0.3 | 0.2.0 |
| 2.0.2 | 0.1.17 |
| 2.0.1 | 0.1.16 |
Expand Down
4 changes: 2 additions & 2 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
## セットアップ

```
sh setup.sh
$ npm install
```

## 実行

```
npm run dev
$ npm run dev
```
538 changes: 207 additions & 331 deletions examples/package-lock.json

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@vitejs/plugin-react": "^4.3.3",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.47",
"tailwindcss": "^3.4.14",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.15",
"typescript": "^5.6.3",
"vite": "^5.4.10"
"vite": "^5.4.11"
}
}
13 changes: 0 additions & 13 deletions examples/setup.sh

This file was deleted.

16 changes: 8 additions & 8 deletions examples/src/elevation/ElevationSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@ export const ElevationSection = () => {
</div>
<div className='flex flex-wrap gap-8'>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-1'} />
<div className={'h-32 w-32 shadow-1'} />
<span className='text-dns-14N-130'>Style 1</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-2'} />
<div className={'h-32 w-32 shadow-2'} />
<span className='text-dns-14N-130'>Style 2</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-3'} />
<div className={'h-32 w-32 shadow-3'} />
<span className='text-dns-14N-130'>Style 3</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-4'} />
<div className={'h-32 w-32 shadow-4'} />
<span className='text-dns-14N-130'>Style 4</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-5'} />
<div className={'h-32 w-32 shadow-5'} />
<span className='text-dns-14N-130'>Style 5</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-6'} />
<div className={'h-32 w-32 shadow-6'} />
<span className='text-dns-14N-130'>Style 6</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-7'} />
<div className={'h-32 w-32 shadow-7'} />
<span className='text-dns-14N-130'>Style 7</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 shadow-8'} />
<div className={'h-32 w-32 shadow-8'} />
<span className='text-dns-14N-130'>Style 8</span>
</div>
</div>
Expand Down
18 changes: 13 additions & 5 deletions examples/src/radius/RadiusSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,31 @@ export const RadiusSection = () => {
</div>
<div className='flex flex-wrap gap-8'>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 bg-solid-gray-400'} />
<div className={'h-32 w-32 bg-solid-gray-400'} />
<span className='text-dns-14N-130'>none</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 bg-solid-gray-400 rounded-8'} />
<div className={'h-32 w-32 bg-solid-gray-400 rounded-4'} />
<span className='text-dns-14N-130'>4px</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-32 w-32 bg-solid-gray-400 rounded-8'} />
<span className='text-dns-14N-130'>8px</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 bg-solid-gray-400 rounded-16'} />
<div className={'h-32 w-32 bg-solid-gray-400 rounded-16'} />
<span className='text-dns-14N-130'>16px</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 bg-solid-gray-400 rounded-32'} />
<div className={'h-32 w-32 bg-solid-gray-400 rounded-24'} />
<span className='text-dns-14N-130'>24px</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-32 w-32 bg-solid-gray-400 rounded-32'} />
<span className='text-dns-14N-130'>32px</span>
</div>
<div className='flex flex-col gap-2'>
<div className={'h-14 w-14 bg-solid-gray-400 rounded-full'} />
<div className={'h-32 w-32 bg-solid-gray-400 rounded-full'} />
<span className='text-dns-14N-130'>full</span>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions examples/tailwind-theme-plugin/index.cjs.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions examples/tailwind-theme-plugin/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
declare const daPlugin: {
handler: import("tailwindcss/types/config").PluginCreator;
config?: Partial<import("tailwindcss/types/config").Config>;
};
export default daPlugin;
Loading
Loading