Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/assets/icons/marshmallow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion src/components/common/button/LinkButton.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import type { HTMLAttributes } from 'astro/types'

type Props = Omit<HTMLAttributes<'a'>, 'slot'> & {
variant?: 'primary' | 'white' | 'black' | 'discord' | 'peing'
variant?: 'primary' | 'white' | 'black' | 'discord' | 'peing' | 'marshmallow'
}

const { variant = 'primary', ...attrs } = Astro.props
Expand All @@ -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',
'hover:drop-shadow-marshumallow-heavy bg-marshmallow text-white drop-shadow-marshmallow-light':
variant === 'marshmallow',
},
'active:drop-shadow-none',
'transition-[filter,transform] ease-in-out active:translate-y-1',
Expand Down
15 changes: 15 additions & 0 deletions src/components/common/button/MarshmallowLink.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
import Icon from '@/components/common/Icon.astro'
import LinkButton from './LinkButton.astro'
---

<LinkButton
href="https://marshmallow-qa.com/v24zz297et6zwk5?t=mK3qJ3&utm_medium=url_text&utm_source=promotion"
target="_blank"
variant="marshmallow"
>
<span class="flex items-center gap-2.5">
<Icon name="marshmallow" alt="マシュマロ" class="w-6" />
<span>質問箱</span>
</span>
</LinkButton>
2 changes: 1 addition & 1 deletion src/components/common/button/PeingLink.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ import LinkButton from './LinkButton.astro'
<LinkButton href="https://peing.net/ja/oucc" target="_blank" variant="peing">
<span class="flex items-center gap-2.5">
<Icon name="box" alt="Peing" class="w-6" />
<span>質問箱</span>
<span>旧質問箱</span>
</span>
</LinkButton>
4 changes: 2 additions & 2 deletions src/components/contact/ContactSection.astro
Original file line number Diff line number Diff line change
Expand Up @@ -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'
---

<Section background="white">
Expand All @@ -22,7 +22,7 @@ import PeingLink from '@/components/common/button/PeingLink.astro'
</div>
<div class="flex justify-center gap-6">
<XLink />
<PeingLink />
<MarshmallowLink />
</div>
<div>
<p>メールでご連絡いただくことも可能です。</p>
Expand Down
4 changes: 2 additions & 2 deletions src/components/faq/FaqSection.astro
Original file line number Diff line number Diff line change
@@ -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'
---

<Section background="white">
Expand All @@ -13,7 +13,7 @@ import FaqCard from './FaqCard.astro'
</p>
<p class="flex justify-center gap-6">
<XLink />
<PeingLink />
<MarshmallowLink />
</p>
<ul class="flex flex-wrap gap-5">
<FaqCard title="入部するにはどうしたら良いですか?">
Expand Down
3 changes: 3 additions & 0 deletions tailwind.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const colors = {
secondary: '#f1f2f7',
discord: '#5865f2',
peing: '#5eb9ba',
marshmallow: '#F3979B',
}

const dropShadowLight = (color) => `0 4px 8px ${rgba(color, 0.6)}`
Expand Down Expand Up @@ -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: {
Expand Down