Skip to content

Commit c0cece8

Browse files
authored
[Feature] Desktop + Mobile About Section Refresh (#259)
changed mobile and desktop view to match theme
1 parent 3c809f6 commit c0cece8

File tree

10 files changed

+31
-29
lines changed

10 files changed

+31
-29
lines changed

main-site/components/about-section/AboutSection.styles.ts

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import styled from '@emotion/styled';
22
import { H2, H3, P } from '../../../shared-ui/style/typography';
3-
import { min } from '../../../shared-ui/lib/responsive';
3+
import { max, min } from '../../../shared-ui/lib/responsive';
44

55
const StyledAboutSectionContainer = styled.div`
6-
margin-top: 2em;
6+
margin-top: 10em;
77
padding-bottom: 10em;
88
position: relative;
99
overflow: hidden;
1010
@media ${min.tablet} {
11-
margin-top: 6em;
11+
margin-top: 10em;
1212
}
1313
`;
1414

@@ -36,6 +36,7 @@ const StyledItemTextContainer = styled.div`
3636
`;
3737

3838
const StyledTitle = styled(H2)`
39+
color: white;
3940
text-align: center;
4041
`;
4142

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

5556
const StyledItemDescription = styled(P)`
56-
margin: 1em 2em 0 2em;
57+
margin: 4em 2em 0 2em;
5758
@media ${min.tablet} {
5859
margin: 0;
60+
font-size: 1.125em;
5961
}
6062
`;
6163

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

9496
const StyledLeftImage = styled(StyledMobileImage)`
9597
left: -14em;
98+
9699
@media ${min.tabletSm} {
97100
left: -20em;
98101
}
99102
`;
100103

101104
const StyledRightImage = styled(StyledMobileImage)`
102105
right: -14em;
106+
103107
@media ${min.tabletSm} {
104108
right: -20em;
105109
}
106110
`;
107111

108112
const StyledArrowDescriptionContainer = styled.div`
109113
display: flex;
114+
margin-left: -4.5em;
115+
margin-right: -4.5em;
116+
margin-top: -3.7em;
110117
`;
111118

112119
const StyledRedRocks = styled.img`
@@ -126,6 +133,7 @@ const StyledRedRocks = styled.img`
126133

127134
const StyledItemTitle = styled(H3)`
128135
font-size: 1.7em;
136+
margin-bottom: 1em;
129137
`;
130138

131139
export {

main-site/components/about-section/AboutSection.tsx

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import {
1414
StyledLeftImage,
1515
StyledRightImage,
1616
StyledArrowDescriptionContainer,
17-
StyledRedRocks,
1817
StyledItemTitle
1918
} from './AboutSection.styles';
2019
import { aboutSectionData } from '../../lib/data';
@@ -23,8 +22,8 @@ import Exploration from '../../../shared-ui/images/exploration.png';
2322
import Growth from '../../../shared-ui/images/growth.png';
2423
import { AboutSectionData } from '../../lib/types';
2524
import Arrow from '../../../shared-ui/components/arrow/Arrow';
26-
import RedRocks from '../../../shared-ui/images/red-rocks.svg';
2725
import { getLeftOrRight } from '../../lib/utils';
26+
import Shell from '../../../shared-ui/images/shell.png';
2827

2928
function getImage(title: string): string {
3029
if (title === 'Community') {
@@ -48,15 +47,11 @@ const AboutSection: React.FC = () => {
4847
<StyledTitle>HackBeanpot is about...</StyledTitle>
4948
{!isDesktop && (
5049
<StyledItemsContainer>
51-
<StyledLeftImage
52-
src={getImage(
53-
getLeftOrRight('left', aboutSectionData, currItem).title
54-
)}
55-
/>
50+
<StyledLeftImage src={Shell} />
5651
<StyledItemContainer>
57-
<StyledCenterImage src={getImage(currItem.title)} />
52+
<StyledCenterImage src={Shell} />
5853
<StyledItemTextContainer>
59-
<StyledItemTitle color={colors.TEXT_BROWN}>
54+
<StyledItemTitle color={colors.WHITE}>
6055
{currItem.title}
6156
</StyledItemTitle>
6257

@@ -69,7 +64,7 @@ const AboutSection: React.FC = () => {
6964
)
7065
}
7166
/>
72-
<StyledItemDescription color={colors.TEXT_BROWN}>
67+
<StyledItemDescription color={colors.WHITE}>
7368
{currItem.description}
7469
</StyledItemDescription>
7570
<Arrow
@@ -83,32 +78,27 @@ const AboutSection: React.FC = () => {
8378
</StyledArrowDescriptionContainer>
8479
</StyledItemTextContainer>
8580
</StyledItemContainer>
86-
<StyledRightImage
87-
src={getImage(
88-
getLeftOrRight('right', aboutSectionData, currItem).title
89-
)}
90-
/>
81+
<StyledRightImage src={Shell} />
9182
</StyledItemsContainer>
9283
)}
9384

9485
{isDesktop && (
9586
<StyledItemsContainer>
9687
{aboutSectionData.map((curr) => (
9788
<StyledItemContainer key={curr.title}>
98-
<StyledItemImage src={getImage(curr.title)} />
89+
<StyledItemImage src={Shell} />
9990
<StyledItemTextContainer>
100-
<StyledItemTitle color={colors.TEXT_BROWN}>
91+
<StyledItemTitle color={colors.WHITE}>
10192
{curr.title}
10293
</StyledItemTitle>
103-
<StyledItemDescription color={colors.TEXT_BROWN}>
94+
<StyledItemDescription color={colors.WHITE}>
10495
{curr.description}
10596
</StyledItemDescription>
10697
</StyledItemTextContainer>
10798
</StyledItemContainer>
10899
))}
109100
</StyledItemsContainer>
110101
)}
111-
<StyledRedRocks src={RedRocks} />
112102
</StyledAboutSectionContainer>
113103
</div>
114104
);

main-site/components/past-projects-section/PastProjectsSection.styles.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import { max, min } from '../../../shared-ui/lib/responsive';
66
const StyledArrowContainer = styled.div`
77
display: flex;
88
position: relative;
9+
margin-top: 2.1em;
910
`;
1011

11-
const StyledPastProjectsHeader = styled(H3)`
12+
const StyledPastProjectsHeader = styled(H2)`
1213
color: ${colors.WHITE};
1314
padding-bottom: 1em;
1415
text-align: center;
@@ -75,7 +76,6 @@ const StyledPastProjectsTitle = styled(H2)`
7576
width: 100%;
7677
7778
@media ${max.tablet} {
78-
margin-top: 1.5em;
7979
text-align: center;
8080
};
8181
`;
@@ -169,10 +169,12 @@ const StyledPastProjectsPhotos = styled.img`
169169
float: none;
170170
position: relative;
171171
display: inline-block;
172+
margin-bottom: 1.5em;
172173
}
173174
174175
@media ${max.tabletLg} {
175176
width: 19em;
177+
margin-bottom: 1.5em;
176178
}
177179
`;
178180

main-site/components/past-projects-section/PastProjectsSection.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ const PastProjectsSection: React.FC = () => {
4040
return (
4141
<div>
4242
<StyledPirateFlag src={PirateFlag} />
43-
{/* <StyledTreasureChest src={TreasureChest} /> */}
4443
<StyledPastProjectsHeader>Past Projects</StyledPastProjectsHeader>
4544
<StyledPastProjectsSection>
4645
{isDesktop &&

shared-ui/components/arrow/Arrow.styles.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ import styled from 'styled-components';
33
const StyledArrow = styled.img`
44
z-index: 5;
55
cursor: pointer;
6+
width: 35px;
7+
height: 30px;
68
`;
79

810
export { StyledArrow };

shared-ui/components/arrow/Arrow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { ArrowProps } from '../../lib/types';
3-
import LeftArrow from '../../images/left-arrow.svg';
4-
import RightArrow from '../../images/right-arrow.svg';
3+
import LeftArrow from '../../images/arrowLeft.png';
4+
import RightArrow from '../../images/arrowRight.png';
55
import { StyledArrow } from './Arrow.styles';
66

77
const Arrow: React.FC<ArrowProps> = ({ left = true, onClick }) => {

shared-ui/images/arrowLeft.png

17.5 KB
Loading

shared-ui/images/arrowRight.png

17.3 KB
Loading

shared-ui/images/shell.png

14.4 KB
Loading

shared-ui/style/typography.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const H2 = styled.h2`
2525
margin: 0;
2626
@media ${min.tablet} {
2727
letter-spacing: 0.1em;
28+
font-size: 2.5em;
2829
}
2930
`;
3031

@@ -80,7 +81,7 @@ const P = styled.p`
8081
line-height: 1.4em;
8182
color: ${(props): string => (props.color ? props.color : colors.WHITE)};
8283
@media ${min.mobile} {
83-
font-size: 0.8em;
84+
font-size: 1.3em;
8485
}
8586
@media ${min.tablet} {
8687
font-size: 1.4em;

0 commit comments

Comments
 (0)