Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for schedule and workshop #107

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Fixes for schedule and workshop #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97befaf
Schedule and workshop layout
ryjogo Nov 3, 2023
43b2394
Updated modal with talkLocation
ryjogo Nov 3, 2023
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
45 changes: 26 additions & 19 deletions src/components/pages/schedule/schedule/schedule.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,16 +558,9 @@ const Schedule = ({ location }) => {

</h3>
<div className="mt-auto flex items-center gap-x-4 sm:gap-x-7">
<span className="rounded-full bg-rasin px-2 py-2 text-[13px] font-semibold leading-none tracking-tighter text-white text-primary-1 md:text-xs">
{duration}
</span>
{talkLocation && (
<span className="rounded-full bg-gray-10 px-4 py-2 text-xs font-semibold leading-none tracking-tighter text-rasin sm:hidden">
{talkLocation}
</span>
)}

{speakers && speakers.length > 0 && (
<ul className="relative inline-flex ml-5 gap-x-5 before:absolute before:top-0 before:bottom-0 before:-left-4 before:my-auto before:h-1 before:w-1 before:rounded-full before:bg-primary-3 sm:gap-x-4">
<ul className="relative inline-flex ml-0 gap-x-5 sm:gap-x-4">
{speakers.map(({ name, photo }, index) => (
<li className="" key={index}>
<figure className="flex items-center gap-x-2">
Expand All @@ -588,6 +581,17 @@ const Schedule = ({ location }) => {
</ul>
)}
</div>

<div className="mt-0 flex items-center gap-x-4 sm:gap-x-2">
<span className="rounded-full bg-rasin px-2 py-2 text-[13px] font-semibold leading-none tracking-tighter text-white text-primary-1 md:text-xs">
{duration}
</span>
{talkLocation && (
<span className="rounded-full bg-gray-10 px-4 py-2 text-xs font-semibold leading-none tracking-tighter text-rasin">
{talkLocation}
</span>
)}
</div>
</div>
{coincidedEvent && (
<div
Expand Down Expand Up @@ -622,16 +626,8 @@ const Schedule = ({ location }) => {

</h3>
<div className="mt-auto flex items-center gap-x-4 sm:gap-x-7">
<span className="rounded-full bg-rasin px-2 py-2 text-[13px] font-semibold leading-none tracking-tighter text-white text-primary-1 md:text-xs">
{coincidedEvent.duration}
</span>
{coincidedEvent.talkLocation && (
<span className="rounded-full bg-gray-10 px-4 py-2 text-xs font-semibold leading-none tracking-tighter text-rasin sm:hidden">
{coincidedEvent.talkLocation}
</span>
)}
{coincidedEvent.speakers && coincidedEvent.speakers.length > 0 && (
<ul className="relative ml-5 inline-flex gap-x-5 before:absolute before:top-0 before:bottom-0 before:-left-4 before:my-auto before:h-1 before:w-1 before:rounded-full before:bg-primary-3 sm:gap-x-4">
{coincidedEvent.speakers && coincidedEvent.speakers.length > 0 && (
<ul className="relative ml-0 inline-flex gap-x-5 sm:gap-x-4">
{coincidedEvent.speakers.map(({ name, photo }, index) => (
<li className="" key={index}>
<figure className="flex items-center gap-x-2">
Expand All @@ -652,6 +648,17 @@ const Schedule = ({ location }) => {
</ul>
)}
</div>
<div className="mt-0 flex items-center gap-x-4 sm:gap-x-2">
<span className="rounded-full bg-rasin px-2 py-2 text-[13px] font-semibold leading-none tracking-tighter text-white text-primary-1 md:text-xs">
{coincidedEvent.duration}
</span>
{coincidedEvent.talkLocation && (
<span className="rounded-full bg-gray-10 px-4 py-2 text-xs font-semibold leading-none tracking-tighter text-rasin">
{coincidedEvent.talkLocation}
</span>
)}

</div>
</div>
)}
</div>
Expand Down
Loading