Skip to content

Commit

Permalink
Merge pull request #463 from jsconfjp/design/track-display
Browse files Browse the repository at this point in the history
スケジュールのタイトルデザイン
  • Loading branch information
yosuke-furukawa authored Oct 19, 2024
2 parents bfa5d1a + f59de7a commit a61d8cc
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 10 deletions.
20 changes: 18 additions & 2 deletions 2024/src/components/RoomLegend.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,22 @@ const Text = styled.span`
flex: 1;
margin-left: 10px;
font-weight: bold;
font-size: 2rem;
font-size: 1.8rem;
font-family: ${({ theme }) => theme.fonts.text};
`
const SubText = styled.span`
flex: 1;
margin-left: 10px;
font-size: 1.3rem;
text-align: center;
margin-top: -0.1rem;
font-family: ${({ theme }) => theme.fonts.text};
`
const TextBox = styled.div`
display: flex;
flex-direction: column;
justify-items: center;
`

type RoomProps = {
track: Rooms
Expand All @@ -43,7 +56,10 @@ export const Room = ({ track }: RoomProps) => {
return (
<RoomBox key={track}>
<Circle area={track} />
<Text>{t(`room${track}`)}</Text>
<TextBox>
<Text>{t(`room${track}`)}</Text>
<SubText>{t(`room${track}Sub`)}</SubText>
</TextBox>
</RoomBox>
)
}
Expand Down
12 changes: 8 additions & 4 deletions 2024/src/i18n/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ export const en = {
goToSpeakers: "Check all speakers",
schedule: "Schedule",
day1: "Day 1",
roomA: "Track A (7F party space)",
roomB: "Track B (3F 301)",
roomC: "Track C (3F 302)",
roomD: "Track D (2F)",
roomA: "Track A",
roomASub: "7F party space",
roomB: "Track B",
roomBSub: "3F 301",
roomC: "Track C",
roomCSub: "3F 302",
roomD: "Track D",
roomDSub: "2F",
"lang.en": "English",
"lang.ja": "Japanese",
"lang.en/ja": "English/Japanese",
Expand Down
12 changes: 8 additions & 4 deletions 2024/src/i18n/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ export const ja: {
becomeASponsor: "スポンサー申込みフォームへ",
schedule: "開催スケジュール",
slides: "スライド",
roomA: "トラックA(7F パーティスペース)",
roomB: "トラックB(3F 301 発表スペース)",
roomC: "トラックC(3F 302 発表スペース)",
roomD: "トラックD(2F 発表スペース)",
roomA: "トラックA",
roomASub: "7F パーティスペース",
roomB: "トラックB",
roomBSub: "3F 301 発表スペース",
roomC: "トラックC",
roomCSub: "3F 302 発表スペース",
roomD: "トラックD",
roomDSub: "2F 発表スペース",
"lang.en": "英語",
"lang.ja": "日本語",
"lang.en/ja": "英語 と 日本語",
Expand Down

0 comments on commit a61d8cc

Please sign in to comment.