Skip to content

Feature/schedule #126

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

Merged
TuxedoFish merged 2 commits into from
Dec 22, 2019
Merged

Feature/schedule #126

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
fa5eaa7
Updated schedule + sorted sizing out
TuxedoFish Dec 22, 2019
db71095
Updated schedule + sorted sizing out
TuxedoFish Dec 22, 2019
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
4 changes: 2 additions & 2 deletions src/components/HomePage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,8 @@ export default class HomePage extends React.Component {
<TextView text="Challenges" heading="1" />
{
categories.map((category, i) =>
<CardView width={"1-" + categories.length} minWidth="300px" key={i} height="420px" style={{ padding: `20px 0`}} snapAlign>
<Row height={`420px`} noPadding >
<CardView width={"1-" + categories.length} minWidth="300px" key={i} height="450px" style={{ padding: `20px 0`}} snapAlign>
<Row height={`450px`} noPadding >
<Column width='2-3' horizontalAlignment='center' verticalAlignment='center'>
<ImageView width={categoryImageSize} height={categoryImageSize} src={category.image} />
<TextView text={category.title} heading={1} align='center' />
Expand Down
6 changes: 3 additions & 3 deletions src/components/layout/data/Schedule.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const dayoneschedule = [
},
{
time: "1PM-2PM",
activity: "Lunch",
activity: "Lunch (provided)",
location: "South Cloisters",
},
{
Expand Down Expand Up @@ -59,12 +59,12 @@ export const daytwoschedule = [
},
{
time: "8AM-10AM",
activity: "Breakfast",
activity: "Breakfast (provided)",
location: "South Cloisters",
},
{
time: "1PM",
activity: "Lunch",
activity: "Lunch (provided)",
location: "South Cloisters",
},
{
Expand Down