From 75efdb2e0b1e9b3edbf544c8f5b24888ab952415 Mon Sep 17 00:00:00 2001 From: Rui-32 <166376337+Rui-32@users.noreply.github.com> Date: Fri, 14 Mar 2025 22:53:57 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B3=AA=E5=95=8F=E7=AE=B1=E3=82=92peing?= =?UTF-8?q?=E3=81=8B=E3=82=89=E3=83=9E=E3=82=B7=E3=83=A5=E3=83=9E=E3=83=AD?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/marshmallow.svg | 1 + src/components/common/button/LinkButton.astro | 4 +++- .../common/button/MarshmallowLink.astro | 15 +++++++++++++++ src/components/common/button/PeingLink.astro | 2 +- src/components/contact/ContactSection.astro | 4 ++-- src/components/faq/FaqSection.astro | 4 ++-- tailwind.config.cjs | 3 +++ 7 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 src/assets/icons/marshmallow.svg create mode 100644 src/components/common/button/MarshmallowLink.astro diff --git a/src/assets/icons/marshmallow.svg b/src/assets/icons/marshmallow.svg new file mode 100644 index 0000000..9e1f1d5 --- /dev/null +++ b/src/assets/icons/marshmallow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/common/button/LinkButton.astro b/src/components/common/button/LinkButton.astro index 0675a4e..677628e 100644 --- a/src/components/common/button/LinkButton.astro +++ b/src/components/common/button/LinkButton.astro @@ -2,7 +2,7 @@ import type { HTMLAttributes } from 'astro/types' type Props = Omit, 'slot'> & { - variant?: 'primary' | 'white' | 'black' | 'discord' | 'peing' + variant?: 'primary' | 'white' | 'black' | 'discord' | 'peing' | 'marshmallow' } const { variant = 'primary', ...attrs } = Astro.props @@ -22,6 +22,8 @@ const { variant = 'primary', ...attrs } = Astro.props variant === 'discord', 'bg-peing text-white drop-shadow-peing-light hover:drop-shadow-peing-heavy': variant === 'peing', + 'bg-marshmallow drop-shadow-marshmallow-light hover:drop-shadow-marshumallow-heavy text-white': + variant === 'marshmallow', }, 'active:drop-shadow-none', 'transition-[filter,transform] ease-in-out active:translate-y-1', diff --git a/src/components/common/button/MarshmallowLink.astro b/src/components/common/button/MarshmallowLink.astro new file mode 100644 index 0000000..13d5cbf --- /dev/null +++ b/src/components/common/button/MarshmallowLink.astro @@ -0,0 +1,15 @@ +--- +import Icon from '@/components/common/Icon.astro' +import LinkButton from './LinkButton.astro' +--- + + + + + 質問箱 + + diff --git a/src/components/common/button/PeingLink.astro b/src/components/common/button/PeingLink.astro index 0a2741a..d9a524d 100644 --- a/src/components/common/button/PeingLink.astro +++ b/src/components/common/button/PeingLink.astro @@ -6,6 +6,6 @@ import LinkButton from './LinkButton.astro' - 質問箱 + 旧質問箱 diff --git a/src/components/contact/ContactSection.astro b/src/components/contact/ContactSection.astro index b024f26..23f16e7 100644 --- a/src/components/contact/ContactSection.astro +++ b/src/components/contact/ContactSection.astro @@ -2,7 +2,7 @@ import Section from '@/components/common/Section.astro' import DiscordJoinLink from '@/components/common/button/DiscordJoinLink.astro' import XLink from '@/components/common/button/XLink.astro' -import PeingLink from '@/components/common/button/PeingLink.astro' +import MarshmallowLink from '../common/button/MarshmallowLink.astro' ---
@@ -22,7 +22,7 @@ import PeingLink from '@/components/common/button/PeingLink.astro'
- +

メールでご連絡いただくことも可能です。

diff --git a/src/components/faq/FaqSection.astro b/src/components/faq/FaqSection.astro index 30df358..cb22cd4 100644 --- a/src/components/faq/FaqSection.astro +++ b/src/components/faq/FaqSection.astro @@ -1,9 +1,9 @@ --- import Section from '@/components/common/Section.astro' import XLink from '@/components/common/button/XLink.astro' -import PeingLink from '@/components/common/button/PeingLink.astro' import InlineLink from '@/components/common/InlineLink.astro' import FaqCard from './FaqCard.astro' +import MarshmallowLink from '../common/button/MarshmallowLink.astro' ---
@@ -13,7 +13,7 @@ import FaqCard from './FaqCard.astro'

- +

    diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 888f3e5..881724d 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -6,6 +6,7 @@ const colors = { secondary: '#f1f2f7', discord: '#5865f2', peing: '#5eb9ba', + marshmallow: '#F3979B', } const dropShadowLight = (color) => `0 4px 8px ${rgba(color, 0.6)}` @@ -34,6 +35,8 @@ module.exports = { 'discord-heavy': dropShadowHeavy(colors.discord), 'peing-light': dropShadowLight(colors.peing), 'peing-heavy': dropShadowHeavy(colors.peing), + 'marshmallow-light': dropShadowLight(colors.marshmallow), + 'marshmallow-heavy': dropShadowHeavy(colors.marshmallow), }, typography: (theme) => ({ DEFAULT: { From 5e2fb2505294886bc5d13f2c0db7d52ae3c469a8 Mon Sep 17 00:00:00 2001 From: Rui-32 <166376337+Rui-32@users.noreply.github.com> Date: Fri, 14 Mar 2025 22:58:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=83=83=E3=83=88=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/button/LinkButton.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/common/button/LinkButton.astro b/src/components/common/button/LinkButton.astro index 677628e..80bb95c 100644 --- a/src/components/common/button/LinkButton.astro +++ b/src/components/common/button/LinkButton.astro @@ -22,7 +22,7 @@ const { variant = 'primary', ...attrs } = Astro.props variant === 'discord', 'bg-peing text-white drop-shadow-peing-light hover:drop-shadow-peing-heavy': variant === 'peing', - 'bg-marshmallow drop-shadow-marshmallow-light hover:drop-shadow-marshumallow-heavy text-white': + 'hover:drop-shadow-marshumallow-heavy bg-marshmallow text-white drop-shadow-marshmallow-light': variant === 'marshmallow', }, 'active:drop-shadow-none',