Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 13 additions & 5 deletions main-site/components/about-section/AboutSection.styles.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import styled from '@emotion/styled';
import { H2, H3, P } from '../../../shared-ui/style/typography';
import { min } from '../../../shared-ui/lib/responsive';
import { max, min } from '../../../shared-ui/lib/responsive';

const StyledAboutSectionContainer = styled.div`
margin-top: 2em;
margin-top: 10em;
padding-bottom: 10em;
position: relative;
overflow: hidden;
@media ${min.tablet} {
margin-top: 6em;
margin-top: 10em;
}
`;

const StyledItemsContainer = styled.div`
display: flex;
margin-top: 5em;
margin: 5em;
justify-content: center;
`;

Expand All @@ -36,6 +36,7 @@ const StyledItemTextContainer = styled.div`
`;

const StyledTitle = styled(H2)`
color: white;
text-align: center;
`;

Expand All @@ -53,9 +54,10 @@ const StyledItemImage = styled.img`
`;

const StyledItemDescription = styled(P)`
margin: 1em 2em 0 2em;
margin: 4em 2em 0 2em;
@media ${min.tablet} {
margin: 0;
font-size: 1.125em;
}
`;

Expand Down Expand Up @@ -93,20 +95,25 @@ const StyledCenterImage = styled(StyledMobileImage)`

const StyledLeftImage = styled(StyledMobileImage)`
left: -14em;

@media ${min.tabletSm} {
left: -20em;
}
`;

const StyledRightImage = styled(StyledMobileImage)`
right: -14em;

@media ${min.tabletSm} {
right: -20em;
}
`;

const StyledArrowDescriptionContainer = styled.div`
display: flex;
margin-left: -4.5em;
margin-right: -4.5em;
margin-top: -3.7em;
`;

const StyledRedRocks = styled.img`
Expand All @@ -126,6 +133,7 @@ const StyledRedRocks = styled.img`

const StyledItemTitle = styled(H3)`
font-size: 1.7em;
margin-bottom: 1em;
`;

export {
Expand Down
17 changes: 7 additions & 10 deletions main-site/components/about-section/AboutSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@ import {
StyledLeftImage,
StyledRightImage,
StyledArrowDescriptionContainer,
StyledRedRocks,
StyledItemTitle
} from './AboutSection.styles';
import { aboutSectionData } from '../../lib/data';
import Community from '../../../shared-ui/images/community.png';
import Exploration from '../../../shared-ui/images/exploration.png';
import Growth from '../../../shared-ui/images/growth.png';
import Community from '../../../shared-ui/images/communityShell.png';
import Exploration from '../../../shared-ui/images/explorationShell.png';
import Growth from '../../../shared-ui/images/growthShell.png';
import { AboutSectionData } from '../../lib/types';
import Arrow from '../../../shared-ui/components/arrow/Arrow';
import RedRocks from '../../../shared-ui/images/red-rocks.svg';
import { getLeftOrRight } from '../../lib/utils';

function getImage(title: string): string {
Expand Down Expand Up @@ -56,7 +54,7 @@ const AboutSection: React.FC = () => {
<StyledItemContainer>
<StyledCenterImage src={getImage(currItem.title)} />
<StyledItemTextContainer>
<StyledItemTitle color={colors.TEXT_BROWN}>
<StyledItemTitle color={colors.WHITE}>
{currItem.title}
</StyledItemTitle>

Expand All @@ -69,7 +67,7 @@ const AboutSection: React.FC = () => {
)
}
/>
<StyledItemDescription color={colors.TEXT_BROWN}>
<StyledItemDescription color={colors.WHITE}>
{currItem.description}
</StyledItemDescription>
<Arrow
Expand Down Expand Up @@ -97,18 +95,17 @@ const AboutSection: React.FC = () => {
<StyledItemContainer key={curr.title}>
<StyledItemImage src={getImage(curr.title)} />
<StyledItemTextContainer>
<StyledItemTitle color={colors.TEXT_BROWN}>
<StyledItemTitle color={colors.WHITE}>
{curr.title}
</StyledItemTitle>
<StyledItemDescription color={colors.TEXT_BROWN}>
<StyledItemDescription color={colors.WHITE}>
{curr.description}
</StyledItemDescription>
</StyledItemTextContainer>
</StyledItemContainer>
))}
</StyledItemsContainer>
)}
<StyledRedRocks src={RedRocks} />
</StyledAboutSectionContainer>
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import { max, min } from '../../../shared-ui/lib/responsive';
const StyledArrowContainer = styled.div`
display: flex;
position: relative;
margin-top: 2.1em;
`;

const StyledPastProjectsHeader = styled(H3)`
const StyledPastProjectsHeader = styled(H2)`
color: ${colors.WHITE};
padding-bottom: 1em;
text-align: center;
Expand Down Expand Up @@ -75,7 +76,6 @@ const StyledPastProjectsTitle = styled(H2)`
width: 100%;

@media ${max.tablet} {
margin-top: 1.5em;
text-align: center;
};
`;
Expand Down Expand Up @@ -169,10 +169,12 @@ const StyledPastProjectsPhotos = styled.img`
float: none;
position: relative;
display: inline-block;
margin-bottom: 1.5em;
}

@media ${max.tabletLg} {
width: 19em;
margin-bottom: 1.5em;
}
`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ const PastProjectsSection: React.FC = () => {
return (
<div>
<StyledPirateFlag src={PirateFlag} />
{/* <StyledTreasureChest src={TreasureChest} /> */}
<StyledPastProjectsHeader>Past Projects</StyledPastProjectsHeader>
<StyledPastProjectsSection>
{isDesktop &&
Expand Down
2 changes: 2 additions & 0 deletions shared-ui/components/arrow/Arrow.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import styled from 'styled-components';
const StyledArrow = styled.img`
z-index: 5;
cursor: pointer;
width: 35px;
height: 30px;
`;

export { StyledArrow };
4 changes: 2 additions & 2 deletions shared-ui/components/arrow/Arrow.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { ArrowProps } from '../../lib/types';
import LeftArrow from '../../images/left-arrow.svg';
import RightArrow from '../../images/right-arrow.svg';
import LeftArrow from '../../images/arrowLeft.png';
import RightArrow from '../../images/arrowRight.png';
import { StyledArrow } from './Arrow.styles';

const Arrow: React.FC<ArrowProps> = ({ left = true, onClick }) => {
Expand Down
Binary file added shared-ui/images/arrowLeft.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shared-ui/images/arrowRight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shared-ui/images/communityShell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shared-ui/images/explorationShell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shared-ui/images/growthShell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added shared-ui/images/shell.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion shared-ui/style/typography.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ const H2 = styled.h2`
margin: 0;
@media ${min.tablet} {
letter-spacing: 0.1em;
font-size: 2.5em;
}
`;

Expand Down Expand Up @@ -80,7 +81,7 @@ const P = styled.p`
line-height: 1.4em;
color: ${(props): string => (props.color ? props.color : colors.WHITE)};
@media ${min.mobile} {
font-size: 0.8em;
font-size: 1.3em;
}
@media ${min.tablet} {
font-size: 1.4em;
Expand Down