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

Fix timeline, improve display on small screens #184

Merged
merged 2 commits into from
Jan 13, 2025
Merged

Fix timeline, improve display on small screens #184

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
b48d449
Fix timeline, improve display on small screens
mvaivre Jan 13, 2025
7249169
Remove OneKey banner
mvaivre Jan 13, 2025
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
23 changes: 17 additions & 6 deletions src/components/pages/hackathon/HackathonInfoSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,14 @@ const HackathonInfoSection = ({ className }: HackathonInfoSectionProps) => (
</ScheduleItem>
</ScheduleItems>
<ScheduleItems>
<ScheduleItemsHeader>Saturday - 9:30 - 20:00</ScheduleItemsHeader>
<ScheduleItemsHeader>Saturday - 9:00 - 20:00</ScheduleItemsHeader>
<ScheduleItem>
<ScheduleItemDot />
<ScheduleItemText>
<h4>9:00</h4>
<p>Opening</p>
</ScheduleItemText>
</ScheduleItem>
<ScheduleItem>
<ScheduleItemDot />
<ScheduleItemText>
Expand All @@ -256,21 +263,21 @@ const HackathonInfoSection = ({ className }: HackathonInfoSectionProps) => (
<ScheduleItem>
<ScheduleItemDot />
<ScheduleItemText>
<h4>17:00-20:00</h4>
<p>Review</p>
<h4>17:00</h4>
<p>Submission deadline</p>
</ScheduleItemText>
</ScheduleItem>
<ScheduleItem>
<ScheduleItemDot />
<ScheduleItemText>
<h4>20:00-20:30</h4>
<p>Submission deadline</p>
<h4>17:00-20:00</h4>
<p>Review</p>
</ScheduleItemText>
</ScheduleItem>
<ScheduleItem>
<ScheduleItemDot />
<ScheduleItemText>
<h4>17:00</h4>
<h4>20:00-20:30</h4>
<p>Winner announcement on the main stage</p>
</ScheduleItemText>
</ScheduleItem>
Expand Down Expand Up @@ -312,6 +319,10 @@ const TimeLinesWrapper = styled.div`
display: flex;
gap: 20px;
align-items: flex-start;

@media ${deviceBreakPoints.mobile} {
flex-direction: column;
}
`

const ScheduleItems = styled.div`
Expand Down
8 changes: 4 additions & 4 deletions src/content/homepage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
topBanner:
text: 'Get the OneKey Classic 1S Alephium Limited Edition for 59$ (-40%) by using the discount code "ALEPHIUM"'
linkText: 'Shop'
url: 'https://shop.onekey.so/products/alephium-x-onekey'
color: '#45E555'
text: ''
linkText: ''
url: ''
color: ''
headerSection:
dark:
title: 'Scalable for devs.
Expand Down
6 changes: 1 addition & 5 deletions src/pages/crypto-xr.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@ import styled, { ThemeProvider } from 'styled-components'
import { graphql, PageProps } from 'gatsby'

import GlobalStyle, { deviceBreakPoints } from '../styles/global-style'
import { hackathonTheme, lightTheme } from '../styles/themes'
import { hackathonTheme } from '../styles/themes'

import Seo from '../components/Seo'
import HackathonLandingSection from '../components/pages/hackathon/HackathonLandingSection'
import HackathonInfoSection, {
HackathonInfoSectionContentType
} from '../components/pages/hackathon/HackathonInfoSection'
import HackathonJudgingSection from '../components/pages/hackathon/HackathonJudgingSection'
import GettingStartedSection, {
GettingStartedSectionContentType
} from '../components/pages/hackathon/GettingStartedSection'
import NavigationMenu from '../components/NavigationMenu'
import Footer from '../components/Footer'
import HackathonSectionContainer from '../components/pages/hackathon/HackathonSectionContainer'
Expand All @@ -23,7 +20,6 @@ interface HackathonPageProps extends PageProps {
nodes: {
frontmatter: {
hackathonInfo: HackathonInfoSectionContentType
gettingStarted: GettingStartedSectionContentType
}
html: string
}[]
Expand Down
Loading