From 8f4e6bab648a560806aeab88a6f0150fbaff0921 Mon Sep 17 00:00:00 2001 From: Ciffelia Date: Tue, 3 Oct 2023 23:18:26 +0900 Subject: [PATCH] =?UTF-8?q?``=E3=81=AB=E4=BB=BB=E6=84=8F=E3=81=AE?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E3=82=92=E8=A8=AD=E5=AE=9A=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E3=81=A8=E3=81=97=E3=80=81=E3=80=8CJoin=20OUCC!=E3=80=8D?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=8C=E3=82=B9=E3=83=9E=E3=83=9B?= =?UTF-8?q?=E3=81=A7=E5=B4=A9=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20fix=20#24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Icon.astro | 7 ++++--- src/components/button/DiscordJoinLink.astro | 4 +--- src/components/button/PeingLink.astro | 4 +--- src/components/button/TwitterLink.astro | 4 +--- src/features/activity/components/ActivityCard.astro | 4 +--- .../index/components/about/AboutSection.astro | 4 +--- src/features/layout/components/Footer.astro | 4 +--- src/features/layout/components/nav/Header.astro | 12 +++++++----- src/features/layout/components/nav/Navigation.astro | 6 ++---- src/features/workshop/components/WorkshopCard.astro | 4 +--- 10 files changed, 20 insertions(+), 33 deletions(-) diff --git a/src/components/Icon.astro b/src/components/Icon.astro index 74df665..0a426a3 100644 --- a/src/components/Icon.astro +++ b/src/components/Icon.astro @@ -1,7 +1,8 @@ --- +import type { HTMLAttributes } from 'astro/types' import { optimize } from 'svgo' -interface Props { +type Props = HTMLAttributes<'svg'> & { // `src/assets/icons`にあるSVGのファイル名 name: string @@ -9,7 +10,7 @@ interface Props { alt: string } -const { name, alt } = Astro.props +const { name, alt, ...attrs } = Astro.props const svgContent = (await import(`../assets/icons/${name}.svg?raw`)).default @@ -31,7 +32,7 @@ const { data: optimizedSvgContent } = optimize(svgContent, { attribute: { role: 'img', 'aria-label': alt, - style: 'width:100%;height:100%', + ...attrs, }, }, }, diff --git a/src/components/button/DiscordJoinLink.astro b/src/components/button/DiscordJoinLink.astro index d9d932d..63c5f4e 100644 --- a/src/components/button/DiscordJoinLink.astro +++ b/src/components/button/DiscordJoinLink.astro @@ -9,9 +9,7 @@ import LinkButton from './LinkButton.astro' variant="discord" > - - - + 公開サーバーに参加 diff --git a/src/components/button/PeingLink.astro b/src/components/button/PeingLink.astro index 8940d7c..32516d9 100644 --- a/src/components/button/PeingLink.astro +++ b/src/components/button/PeingLink.astro @@ -5,9 +5,7 @@ import LinkButton from './LinkButton.astro' - - - + 質問箱 diff --git a/src/components/button/TwitterLink.astro b/src/components/button/TwitterLink.astro index bce4a0c..c808a3b 100644 --- a/src/components/button/TwitterLink.astro +++ b/src/components/button/TwitterLink.astro @@ -5,9 +5,7 @@ import LinkButton from './LinkButton.astro' - - - + @OUCC diff --git a/src/features/activity/components/ActivityCard.astro b/src/features/activity/components/ActivityCard.astro index 3c5d479..c1816dd 100644 --- a/src/features/activity/components/ActivityCard.astro +++ b/src/features/activity/components/ActivityCard.astro @@ -15,9 +15,7 @@ const { title, image, link } = Astro.props

- - - + {title}

{ diff --git a/src/features/index/components/about/AboutSection.astro b/src/features/index/components/about/AboutSection.astro index 82a8180..a0199c2 100644 --- a/src/features/index/components/about/AboutSection.astro +++ b/src/features/index/components/about/AboutSection.astro @@ -43,9 +43,7 @@ const items: Item[] = [ items.map(({ icon, description }) => (
  • -
    - -
    + {description.map((x) => (

    {x}

    ))} diff --git a/src/features/layout/components/Footer.astro b/src/features/layout/components/Footer.astro index b40088a..4e70ab8 100644 --- a/src/features/layout/components/Footer.astro +++ b/src/features/layout/components/Footer.astro @@ -5,9 +5,7 @@ import FooterLink from './FooterLink.astro'