merge v2 into main

.github/dependabot.yml

@@ -5,7 +5,11 @@
 
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/" # Location of package manifests
+  - package-ecosystem: 'npm'
+    directory: '/' # Location of package manifests
     schedule:
-      interval: "weekly"
+      interval: 'monthly'
+    ignore:
+      - dependency-name: 'tailwindcss'
+        update-types: ['version-update:semver-major']
+        versions: ['4.x']

.storybook/dadsTheme.ts

@@ -3,8 +3,7 @@ import { create } from 'storybook/theming/create';
 export default create({
   base: 'light',
 
-  brandTitle: 'デジタル庁デザインシステム',
-  brandImage: 'logo.svg',
+  brandTitle: 'デジタル庁デザインシステム　コードスニペット（React版）',
   brandTarget: '_self',
 
   fontBase: "var(--font-family-sans), sans-serif",

.storybook/manager-head.html

@@ -1,3 +1,4 @@
+<link rel="icon" href="/favicon.ico" type="image/x-icon" sizes="16x16 24x24 32x32 48x48 64x64 128x128 256x256">
 <link rel="preconnect" href="https://fonts.googleapis.com" />
 <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
 <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@100..900&family=Noto+Sans+Mono:wght@100..900&display=swap" rel="stylesheet" />
@@ -8,7 +9,7 @@
   #root > div {
     color-scheme: normal;
   }
-  
+
   /* パネル間のボーダー色 */
   #root > div > div:has(nav) {
     border-right-color: var(--color-neutral-solid-gray-420);
@@ -78,4 +79,4 @@
 </style>
 <script>
   document.documentElement.setAttribute("lang", "ja");
-</script>
+</script>

.storybook/prose.css

@@ -403,7 +403,7 @@
   }
 }
 .prose .sbdocs-a:active {
-  color: var(--color-primitive-orange-700);
+  color: var(--color-primitive-orange-800);
   text-decoration-thickness: calc(1 / 16 * 1rem);
 }
 .prose .sbdocs-a:focus-visible {
@@ -441,4 +441,4 @@
   font: inherit;
   font-family: var(--font-family-mono), monospace;
   letter-spacing: 0;
-}
+}

src/components/Accordion/Accordion.tsx

@@ -93,7 +93,7 @@ export const AccordionBackLink = (props: AccordionBackLinkProps) => {
         flex items-start w-fit gap-1.5
         text-blue-1000 underline underline-offset-[calc(3/16*1rem)]
         hover:text-blue-1000 hover:decoration-[calc(3/16*1rem)]
-        active:text-orange-700 active:decoration-1
+        active:text-orange-800 active:decoration-1
         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
         ${className ?? ''}
       `}

src/components/Breadcrumbs/Breadcrumbs.tsx

@@ -45,7 +45,7 @@ export const BreadcrumbItem = ({
 export const breadcrumbLinkStyle = `
   text-blue-1000 text-oln-16N-100 underline underline-offset-[calc(3/16*1rem)]
   hover:text-blue-900 hover:decoration-[calc(3/16*1rem)]
-  active:text-orange-700 active:decoration-1
+  active:text-orange-800 active:decoration-1
   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
 `;
 

src/components/Disclosure/Disclosure.tsx

@@ -69,7 +69,7 @@ export const DisclosureBackLink = (props: DisclosureBackLinkProps) => {
         flex items-start w-fit gap-1.5
         text-blue-1000 underline underline-offset-[calc(3/16*1rem)]
         hover:text-blue-1000 hover:decoration-[calc(3/16*1rem)]
-        active:text-orange-700 active:decoration-1
+        active:text-orange-800 active:decoration-1
         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
         ${className ?? ''}
       `}

src/components/Link/Link.tsx

@@ -6,7 +6,7 @@ export const linkVisitedStyle = 'visited:text-magenta-900';
 export const linkHoverStyle = 'hover:text-blue-1000 hover:decoration-[calc(3/16*1rem)]';
 export const linkFocusStyle =
   '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';
-export const linkActiveStyle = 'active:text-orange-700 active:decoration-1';
+export const linkActiveStyle = 'active:text-orange-800 active:decoration-1';
 
 export const linkStyle = `
   ${linkDefaultStyle}

src/components/StatusBadge/index.ts

@@ -1,2 +1 @@
-export type { StatusBadgeProps } from './StatusBadge';
 export { StatusBadge } from './StatusBadge';