Skip to content

Commit 6a9bab1

Browse files
authored
Merge pull request #253 from digital-go-jp/v2
merge v2 into main
2 parents b25d391 + 2d41396 commit 6a9bab1

File tree

12 files changed

+18
-20
lines changed

12 files changed

+18
-20
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "npm"
9-
directory: "/" # Location of package manifests
8+
- package-ecosystem: 'npm'
9+
directory: '/' # Location of package manifests
1010
schedule:
11-
interval: "weekly"
11+
interval: 'monthly'
12+
ignore:
13+
- dependency-name: 'tailwindcss'
14+
update-types: ['version-update:semver-major']
15+
versions: ['4.x']

.storybook/dadsTheme.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ import { create } from 'storybook/theming/create';
33
export default create({
44
base: 'light',
55

6-
brandTitle: 'デジタル庁デザインシステム',
7-
brandImage: 'logo.svg',
6+
brandTitle: 'デジタル庁デザインシステム コードスニペット(React版)',
87
brandTarget: '_self',
98

109
fontBase: "var(--font-family-sans), sans-serif",

.storybook/manager-head.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<link rel="icon" href="/favicon.ico" type="image/x-icon" sizes="16x16 24x24 32x32 48x48 64x64 128x128 256x256">
12
<link rel="preconnect" href="https://fonts.googleapis.com" />
23
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
34
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:[email protected]&family=Noto+Sans+Mono:[email protected]&display=swap" rel="stylesheet" />
@@ -8,7 +9,7 @@
89
#root > div {
910
color-scheme: normal;
1011
}
11-
12+
1213
/* パネル間のボーダー色 */
1314
#root > div > div:has(nav) {
1415
border-right-color: var(--color-neutral-solid-gray-420);
@@ -78,4 +79,4 @@
7879
</style>
7980
<script>
8081
document.documentElement.setAttribute("lang", "ja");
81-
</script>
82+
</script>

.storybook/prose.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@
403403
}
404404
}
405405
.prose .sbdocs-a:active {
406-
color: var(--color-primitive-orange-700);
406+
color: var(--color-primitive-orange-800);
407407
text-decoration-thickness: calc(1 / 16 * 1rem);
408408
}
409409
.prose .sbdocs-a:focus-visible {
@@ -441,4 +441,4 @@
441441
font: inherit;
442442
font-family: var(--font-family-mono), monospace;
443443
letter-spacing: 0;
444-
}
444+
}

public/favicon.ico

102 KB
Binary file not shown.

public/favicon.svg

Lines changed: 1 addition & 0 deletions
Loading

public/logo.svg

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/components/Accordion/Accordion.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export const AccordionBackLink = (props: AccordionBackLinkProps) => {
9393
flex items-start w-fit gap-1.5
9494
text-blue-1000 underline underline-offset-[calc(3/16*1rem)]
9595
hover:text-blue-1000 hover:decoration-[calc(3/16*1rem)]
96-
active:text-orange-700 active:decoration-1
96+
active:text-orange-800 active:decoration-1
9797
focus-visible:rounded-4 focus-visible:outline focus-visible:outline-4 focus-visible:outline-black focus-visible:outline-offset-[calc(2/16*1rem)] focus-visible:bg-yellow-300 focus-visible:text-blue-1000 focus-visible:ring-[calc(2/16*1rem)] focus-visible:ring-yellow-300
9898
${className ?? ''}
9999
`}

src/components/Breadcrumbs/Breadcrumbs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const BreadcrumbItem = ({
4545
export const breadcrumbLinkStyle = `
4646
text-blue-1000 text-oln-16N-100 underline underline-offset-[calc(3/16*1rem)]
4747
hover:text-blue-900 hover:decoration-[calc(3/16*1rem)]
48-
active:text-orange-700 active:decoration-1
48+
active:text-orange-800 active:decoration-1
4949
focus-visible:rounded-4 focus-visible:outline focus-visible:outline-4 focus-visible:outline-black focus-visible:outline-offset-[calc(2/16*1rem)] focus-visible:bg-yellow-300 focus-visible:text-blue-1000 focus-visible:ring-[calc(2/16*1rem)] focus-visible:ring-yellow-300
5050
`;
5151

src/components/Disclosure/Disclosure.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const DisclosureBackLink = (props: DisclosureBackLinkProps) => {
6969
flex items-start w-fit gap-1.5
7070
text-blue-1000 underline underline-offset-[calc(3/16*1rem)]
7171
hover:text-blue-1000 hover:decoration-[calc(3/16*1rem)]
72-
active:text-orange-700 active:decoration-1
72+
active:text-orange-800 active:decoration-1
7373
focus-visible:rounded-4 focus-visible:outline focus-visible:outline-4 focus-visible:outline-black focus-visible:outline-offset-[calc(2/16*1rem)] focus-visible:bg-yellow-300 focus-visible:text-blue-1000 focus-visible:ring-[calc(2/16*1rem)] focus-visible:ring-yellow-300
7474
${className ?? ''}
7575
`}

0 commit comments

Comments
 (0)