Skip to content

Commit

Permalink
微調整・Page 2 のCSS を追加
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaku-Kunimi committed Dec 10, 2023
1 parent b76a0e9 commit 192ab7b
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ yarn-error.log*
*.tsbuildinfo
next-env.d.ts
.node-version
cache/cache.json
4 changes: 2 additions & 2 deletions src/components/Page1.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ function Side({ view }: Props) {
{talks.map((talk) => (
<div
key={talk.id}
className="text-right w-[750px] bg-Hibiya-Green px-3 pt-1 my-3"
className="text-right w-[750px] bg-Hibiya-Green px-3 pt-1 my-3 font-ryo-gothic-plusn"
>
<div className="flex flex-row">
<div className="text-left basis-1/2 text-white text-xs">
<div className="text-left basis-1/2 text-white text-xs font-din-2014 font-light">
{getTimeStr(talk.startTime)} - {getTimeStr(talk.endTime)}
</div>
<div className="basis-1/2 text-white text-xs">
Expand Down
12 changes: 7 additions & 5 deletions src/components/Page2.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ function Body({ view }: Props) {
return <></>
}
return (
<div className="my-20 font-ryo-gothic-plusn">
<div className=" mt-10 font-ryo-gothic-plusn">
<div className="text-left w-[450px] bg-Magenta-2023 pr-3 py-8">
<div className="text-right text-white font-bold font-din-2014 tracking-wide text-1.5xl">
UPCOMING SESSION
</div>
</div>
<div className="basis-1/2 ml-[100px] mt-7 text-xl font-ryo-gothic-plusn">
{getTimeStr(talk.startTime)}-{getTimeStr(talk.endTime)} の各セッション
<div className="text-right text-white font-bold font-din-2014 text-1.5xl">
{getTimeStr(talk.startTime)}-{getTimeStr(talk.endTime)}
</div>
</div>
<div className="grid grid-cols-2 gap8">
{view.allTracks.map((track) => {
Expand Down Expand Up @@ -88,7 +88,9 @@ function Track({ talk, track, speakers }: TrackProps) {
/>
</div>
<div className="basis-2/3">
<div className="text-2xl my-5">Track {track.name}</div>
<div className="text-1.5xl my-2 w-[600px] text-black opacity-30 font-din-2014 font-bold ">
TRACK {track.name}
</div>
<div className="text-xl font-bold">
{talk.speakers.map((s) => s.name).join(', ')}
</div>
Expand Down
15 changes: 12 additions & 3 deletions src/components/PageHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,24 @@ export default function Header({ view }: Props) {
}
return (
<div className="flex flex-row items-center h-[180px] text-white font-din-2014 font-bold">
<div className="basis-1/3 ">
<div className="pl-30 basis-3/12 ">
<div className="text-base text-center opacity-75 font-ryo-gothic-plusn">
トラック
</div>
<div className="text-4xl text-center font-video-cond">
{view.selectedTrack.name}
</div>
</div>
<div className="basis-1/3">

<div className=" basis-2/12 ">
<div className="text-base text-left opacity-75 font-ryo-gothic-plusn">
ハッシュタグ
</div>
<div className="text-2xl text-left font-din-2014">
{config.eventAbbr.toUpperCase()}_{view.selectedTrack.name}
</div>
</div>
<div className="basis-1/4">
<div className="text-lg text-center font-din-2014 opacity-75">
{config.eventAbbr.toUpperCase()}
</div>
Expand All @@ -41,7 +50,7 @@ export default function Header({ view }: Props) {
</div>
</div>
<div className="basis-1/4 pr-4">
<div className="text-lg text-left font-light">
<div className="text-lg text-left">
{getTimeStr(talk.startTime)} - {getTimeStr(talk.endTime)}
</div>
<div className="text-base text-left mt-2 font-ryo-gothic-plusn ">
Expand Down

0 comments on commit 192ab7b

Please sign in to comment.