Skip to content

Commit 83e2838

Browse files
Mandy-cyberhelenm1NelsonDong41Aaryan1203kzeng24
authored
Update Event Schedule (#328)
* Remove Background Image (#240) * Landing page refresh (#242) * changed title/headers and apply button * add images + light mode toggle * added textbox, diver, bubble3 * made requested changes (changed H11 to be H6, removed commented line in ExploreSection.styles, moved changes for red btn to SecondaryButton.styles, merge into under-the-sea instead of main) made requested changes (changed H11 to be H6, removed commented line in ExploreSection.styles, m oved changes for red btn to SecondaryButton.styles, merge into under-the-sea instead of main) --------- Co-authored-by: unknown <nelsondong158@gmail.com> * Meet the team (#251) * Added Linkein's to every user and removed tooltip * Forgot to add these files to commit * FIxed linkedin links and changed font for linkedin text * Updated testimonial section * styling checks * Reverted changes * [Feature] Past Project Section Refresh (#243) * initial styling * more styling * more changes * made sure treasure box never covered text * fixed treasure chest padding and made sure it did not go into FAQ section * Mandy refresh primary button style (#257) * added transparent prop and changed styling accordingly * adding new colors for primary buttons * [Feature] Desktop + Mobile About Section Refresh (#259) changed mobile and desktop view to match theme * Staggered images in mobile view (#267) * revert * Revert "revert" This reverts commit e4ac623. * Nelson event calender (#270) * Events Calender Section update * update seaweed palcement * add images and colors * mobile view * update formatting on resolutions * fix formatting * format changes --------- Co-authored-by: NelsonDong41 <nelsondong41@gmail.com> * Testimonial Section Refresh (#261) * Testimonial Section Refresh * Got rid of unnecessary conditionals * [Feature] Desktop + Mobile About Section Updated Shells (#264) * changed mobile and desktop view to match theme * updated shell images * added margin to prevent contain arrows in screen * [Feature] FAQ Refresh ... again (#271) * added subheadings within faq section and adjusted font styling * beginning contact us button styling * added lighthouse and octopus svgs into images folder * adjusted sizing and positioning of octopus, lighthouse, and plus signs * reverted the contact us button back to primary button, fixed font styling of outreach caption * removed comment, replaced React.Fragment with empty tag, resized lighthouse * removing unused import and making PR for under-the-sea * added yarn.lock files --------- Co-authored-by: Johny Sargent <johnysargent@nat-wireless-guest-reg-153-51.bu.edu> Co-authored-by: Johny Sargent <johnysargent@MacBook-Pro-3.local> Co-authored-by: audrey-codez <123320296+audrey-codez@users.noreply.github.com> * [Feature] Bottom of the page (#263) * initial changes for PR * fixing title alignment and adding shell and styling * fixing width issues for large screen sizes --------- Co-authored-by: Johny Sargent <johnysargent@MacBook-Pro-3.local> * [Feature] Countdown in Landing page (#265) * added countdown and hourglass svg to loading section * accidentally hardcoded target date for countdown * removing :( * deep clean (#273) * Update Fonts (#274) * update meet the team button font * update meet the team button font * update fonts * fixes * [Feature] Header + Footer Component Refresh (#268) * changed mobile and desktop view to match theme * updated shell images * initial commit * footer and header initial changes * made sure header was responsive and the buttons were matching padding * added margin to prevent contain arrows in screen * made font in header bigger * added missing about section shells * commented out star style from previous theme * commented out star style from previous theme * added check that footer links exist before applying map and changed href for code of conduct * renamed code of conduct label * added div ids to ensure navigation to existing page * added div id to new sponsors section * merge conflicts * made sure contact us points to email and fixed about / sponsors section merge conflicts * updated plugin * included more packages * updated gatsby-plugin-manifest package * added styling package * package updates in live and main site * updated live site packages * reverting packages * packages for fixing building error * added babel-plugin to live site * added yarn locks * deleted yarn lock and node modules folder, then yarn installed * trying again * added package.json back * commented out star style from previous theme * Making sure the shell images in the About section update in mobile view (#313) * commented out star style from previous theme * ensured that the shell images moving with arrow click * setting up * updating dates and labels to match design * updating tags and their colors * adding new colors * changing styling of schedule box/tabs * fixing positioning, text background colors, and arrow color * fixing description formatting and colors * merge conflict * fixed conflicts * fixing more merge conflicts * adjusting mobile view design * fixing tablet view + creating new breakpoint --------- Co-authored-by: Helen Miao <95582910+helenm1@users.noreply.github.com> Co-authored-by: unknown <nelsondong158@gmail.com> Co-authored-by: Aaryan Jain <76594216+Aaryan1203@users.noreply.github.com> Co-authored-by: aaryan1203 <aaryanjain1203@gmail.com> Co-authored-by: Katherine Zeng <52469441+kzeng24@users.noreply.github.com> Co-authored-by: NelsonDong41 <68518070+NelsonDong41@users.noreply.github.com> Co-authored-by: NelsonDong41 <nelsondong41@gmail.com> Co-authored-by: jmsargent10 <120346417+jmsargent10@users.noreply.github.com> Co-authored-by: Johny Sargent <johnysargent@nat-wireless-guest-reg-153-51.bu.edu> Co-authored-by: Johny Sargent <johnysargent@MacBook-Pro-3.local> Co-authored-by: audrey-codez <123320296+audrey-codez@users.noreply.github.com> Co-authored-by: Mike <103906123+mike10911@users.noreply.github.com> Co-authored-by: Alyssa Mui <82426237+alyssamui@users.noreply.github.com> Co-authored-by: Mandy-cyber <92461362+PeriodPrideJa@users.noreply.github.com>
1 parent 86114e4 commit 83e2838

File tree

16 files changed

+24092
-517
lines changed

16 files changed

+24092
-517
lines changed

‎live-site/components/event-schedule-section/EventScheduleMockData.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ export interface EventDate {
77
export const mockData: EventDate[] = [
88
{
99
id: 0,
10-
title: 'FRI 10',
11-
content: 'FRIDAY FEB 10'
10+
title: 'FRI 11',
11+
content: 'FRIDAY - FEBRUARY 11'
1212
},
1313
{
1414
id: 2,
15-
title: 'SAT 11',
16-
content: 'SATURDAY FEB 11'
15+
title: 'SAT 12',
16+
content: 'SATURDAY - FEBRUARY 12'
1717
},
1818
{
1919
id: 3,
20-
title: 'SUN 12',
21-
content: 'SUNDAY FEB 12'
20+
title: 'SUN 13',
21+
content: 'SUNDAY - FEBRUARY 13'
2222
}
2323
];

‎live-site/components/event-schedule-section/EventScheduleSection.styles.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const StyledEventScheduleHeader = styled(H3)`
2828
`;
2929

3030
const StyledEventScheduleSubText = styled(P)`
31-
color: ${colors.TEXT_BROWN};
31+
color: ${colors.WHITE};
3232
margin-right: 7em;
3333
@media ${max.tablet} {
3434
text-align: left;
@@ -38,7 +38,7 @@ const StyledEventScheduleSubText = styled(P)`
3838
`;
3939

4040
const StyledBoldSubText = styled(P)`
41-
color: ${colors.TEXT_BROWN};
41+
color: ${colors.WHITE};
4242
font-weight: bold;
4343
margin: 0;
4444
@media ${max.tablet} {

‎live-site/components/event-schedule-section/EventScheduleSection.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ const EventScheduleSection: React.FC = () => {
1919
<EventScheduleTextButtonContainer>
2020
<StyledEventScheduleSubText>
2121
Dates and times are displayed in your local timezone. Schedule in EST
22-
can be found here.
22+
can be found here. The password for all Zoom meetings can be found pinned in
23+
the #announcements Slack channel.
2324
<br />
24-
<StyledBoldSubText>
25-
Please be sure to attend all events labeled "Everyone".
26-
</StyledBoldSubText>
25+
<b>Please be sure to attend all events labeled "Everyone".</b>
2726
</StyledEventScheduleSubText>
2827
<ButtonContainer>
2928
<PrimaryButton

‎live-site/components/event-schedule-section/event-item-tag/EventItemTag.styles.ts‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ const tagColor = (tagType: string): string => {
1010
return colors.FIREBRICK;
1111
break;
1212
case 'Beginner-Friendly':
13-
return colors.GREEN;
13+
return colors.TEXT_LIGHT_GREEN;
1414
break;
1515
case 'Workshop':
16-
return colors.PURPLE_TAG;
16+
return colors.BRIGHT_PURPLE;
1717
break;
1818
case 'Action Item':
1919
return colors.RED;
@@ -33,13 +33,27 @@ const tagColor = (tagType: string): string => {
3333
};
3434

3535
const StyledTag = styled.div<StyledTagAndTagTextProps>`
36-
background-color: white;
37-
border-color: ${(StyledTagAndTagTextProps): string => {
38-
return tagColor(StyledTagAndTagTextProps.tag);
39-
}};
40-
border-style: solid;
36+
background-color: ${colors.LIGHT_GREY};
4137
border-radius: 2em;
42-
height: 2em;
38+
padding-top: 0.25em;
39+
height: 2.5em;
40+
41+
@media ${max.tabletLg} {
42+
height: 2em;
43+
}
44+
45+
@media ${max.tablet} {
46+
height: 2.2em;
47+
}
48+
49+
@media ${max.mobile} {
50+
height: 1.5em;
51+
padding-bottom: 0.4em;
52+
display: inline;
53+
margin-top: -1em;
54+
margin-bottom: 1em;
55+
margin-left: 0.6em;
56+
}
4357
`;
4458

4559
const StyledTagText = styled(P)<StyledTagAndTagTextProps>`
@@ -64,8 +78,8 @@ const StyledTagText = styled(P)<StyledTagAndTagTextProps>`
6478
padding-top: 0.2em;
6579
}
6680
@media ${max.tablet} {
67-
font-size: 0.5em;
68-
padding-top: 1.33em;
81+
font-size: 0.8em;
82+
padding-top: 0.6em;
6983
}
7084
@media (max-width: 471px) {
7185
font-size: 0.32em;

‎live-site/components/event-schedule-section/event-item/EventItem.styles.ts‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,17 @@ const StyledEventItemContainer = styled.div`
1010
margin-top: 1em;
1111
border-radius: 2em;
1212
height: 8em;
13-
background-color: ${colors.WHITE};
13+
background-color: ${colors.SAND_HIGHLIGHTS};
1414
@media (max-width: 460px) {
1515
display: flex;
1616
flex-direction: column;
1717
height: 15em;
1818
} ;
19+
20+
@media ${max.mobile} {
21+
height: auto;
22+
padding-bottom: 0.25em;
23+
}
1924
`;
2025

2126
const StyledEventItemLeftSideContainer = styled.div`
@@ -28,6 +33,7 @@ const StyledEventItemLeftSideContainer = styled.div`
2833
2934
@media ${max.tablet} {
3035
display: block;
36+
padding-left: 1em;
3137
}
3238
3339
@media ${max.tabletXs} {
@@ -62,19 +68,25 @@ const StyledEventTimeTopicContainer = styled.div`
6268
display: flex;
6369
padding-right: 0;
6470
padding-bottom: 0;
71+
padding-top: 1.5em;
72+
padding-left: 0.7em;
6573
}
6674
6775
@media ${max.mobile} {
6876
display: flex;
69-
padding-bottom: 0.5em;
77+
padding-bottom: 0em;
78+
padding-left: 1em;
79+
padding-top: 2em;
7080
} ;
7181
`;
7282

7383
const StyledEventItemHeader = styled(H3)`
7484
padding-left: 2em;
7585
color: ${colors.BLACK}; // placeholder color plz remove when time
7686
padding-top: 1em;
87+
margin-bottom: 0.25em;
7788
font-size: 1.7em;
89+
color: ${colors.OFF_BLACK};
7890
7991
@media ${max.tabletLg} {
8092
font-size: 1.4em;
@@ -85,7 +97,14 @@ const StyledEventItemHeader = styled(H3)`
8597
@media ${max.tablet} {
8698
font-size: 1.2em;
8799
padding: 0;
100+
margin-top: -0.5em;
101+
padding-left: 0.5em;
88102
} ;
103+
104+
@media ${max.mobile} {
105+
margin-top: 0em;
106+
padding-left: 0em;
107+
}
89108
`;
90109

91110
const StyledEventItemLocation = styled(P)`
@@ -97,8 +116,8 @@ const StyledEventItemLocation = styled(P)`
97116
padding-left: 0.5em;
98117
}
99118
100-
@media ${max.tabletSm} {
101-
padding-left: 0;
119+
@media ${max.tablet} {
120+
padding-left: 0.4em;
102121
}
103122
104123
@media ${max.mobile} {
@@ -138,17 +157,19 @@ const StyledPinpoint = styled.img`
138157
height: 20%;
139158
140159
@media ${max.tabletLg} {
141-
padding-left: 1.2em;
160+
padding-left: 1.5em;
142161
}
143162
144163
@media ${max.tablet} {
145164
padding: 0;
146165
height: 1.5em;
147166
padding-right: 0.5em;
167+
padding-left: 0.6em;
148168
}
149169
150170
@media ${max.mobile} {
151171
height: 1em;
172+
padding-left: 0.1em;
152173
} ;
153174
`;
154175

@@ -161,13 +182,13 @@ const StyledArrow = styled.img<styledArrowProps>`
161182
width: 20px;
162183
}
163184
padding-top: ${(styledArrowProps): string =>
164-
styledArrowProps.isOpen ? `0` : `3em`};
185+
styledArrowProps.isOpen ? `0` : `3.5em`};
165186
padding-right: ${(styledArrowProps): string =>
166187
styledArrowProps.isOpen ? `0` : `3em`};
167188
padding-bottom: ${(styledArrowProps): string =>
168-
styledArrowProps.isOpen ? `3em` : `0`};
189+
styledArrowProps.isOpen ? `3.5em` : `0`};
169190
padding-left: ${(styledArrowProps): string =>
170-
styledArrowProps.isOpen ? `3em` : `0`};
191+
styledArrowProps.isOpen ? `3.5em` : `0`};
171192
float: right;
172193
transform: ${(styledArrowProps): string =>
173194
styledArrowProps.isOpen ? `rotate(180deg)` : `rotate(0deg)`};
@@ -197,7 +218,7 @@ const StyledTagsContainer = styled.div`
197218
} ;
198219
`;
199220
const StyledEventItemDescription = styled.div`
200-
background-color: white;
221+
background-color: ${colors.DUNE_HIGHLIGHT};
201222
border-radius: 2em;
202223
margin-left: 1em;
203224
margin-right: 1em;

‎live-site/components/event-schedule-section/event-schedule-tab/EventScheduleTab.styles.tsx‎

Lines changed: 48 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,46 @@ const StyledTabTitle = styled(P)`
2525
display: flex;
2626
@media ${max.tablet} {
2727
display: inline;
28-
margin-left: 1.75em;
28+
margin-left: 1.6em;
29+
background-color: ${colors.BORDER_BROWN};
30+
border: 1px solid ${colors.BORDER_BROWN};
31+
border-radius: 0px 0.75em 0px 0px;
32+
}
33+
@media ${max.mobile} {
34+
display: inline;
35+
margin-left: 1.8em;
36+
background-color: ${colors.BORDER_BROWN};
37+
border: 1px solid ${colors.BORDER_BROWN};
38+
border-radius: 0px 0.75em 0px 0px;
39+
padding-left: 0.25em;
2940
}
3041
`;
3142
const StyledTabTitleWrapper = styled.label<StyledTabTitleWrapperProps>`
32-
border: 2px solid ${colors.HEADER_FOOTER_BLUE};
43+
border: 2px solid ${colors.TRANSPARENT};
3344
border-radius: 0.75em 0px 0px 0.75em;
3445
width: 2.9em;
3546
padding-top: 1em;
3647
padding-left: 0.4em;
3748
padding-right: 0.4em;
49+
margin-right: 0.2em;
3850
text-align: center;
3951
font-size: 0.8em;
4052
box-sizing: border-box;
4153
transition-duration: 0.2s;
4254
transition-timing-function: linear;
4355
color: ${(StyledTabTitleWrapperProps): string =>
4456
StyledTabTitleWrapperProps.isSelected
45-
? `${colors.BLACK}`
57+
? `${colors.TEXT_DARKER_BROWN}`
4658
: `${colors.WHITE}`};
4759
background-color: ${(StyledTabTitleWrapperProps): string =>
4860
StyledTabTitleWrapperProps.isSelected
49-
? `${colors.BUTTON_GREEN}`
50-
: `${colors.BUTTON_DARK_GREEN}`};
51-
height: 14.27em;
61+
? `${colors.YELLOW_GREEN}`
62+
: `${colors.DARK_YELLOW_GREEN}`};
63+
font-weight: ${(StyledTabTitleWrapperProps): string =>
64+
StyledTabTitleWrapperProps.isSelected
65+
? `bold`
66+
: `normal`};
67+
height: 16em;
5268
cursor: pointer;
5369
box-shadow: ${(StyledTabTitleWrapperProps): string =>
5470
StyledTabTitleWrapperProps.isLastIndex
@@ -58,40 +74,52 @@ const StyledTabTitleWrapper = styled.label<StyledTabTitleWrapperProps>`
5874
@media ${max.tablet} {
5975
padding-top: 0em;
6076
width: 50em;
61-
border-radius: 0em 0.75em 0em 0em;
6277
margin-left: -0.25em;
6378
padding-right: 2em;
6479
box-shadow: none;
65-
border-bottom: none;
6680
padding-bottom: 0.12em;
81+
font-size: 0.8em;
82+
border: 3px solid ${colors.BORDER_BROWN};
83+
border-radius: 0px 1em 2px 2px;
6784
}
6885
@media (max-width: 338px) {
6986
padding-right: 1em;
87+
border: 2px solid ${colors.BORDER_BROWN};
7088
}
71-
@media ${max.mobile} {
72-
font-size: 0.8em;
73-
} ;
7489
`;
7590
const StyledTabContent = styled(P)`
7691
padding-left: 1em;
77-
padding-top: 0.5em;
78-
color: ${colors.BLACK};
92+
padding-top: 0.75em;
93+
color: ${colors.TEXT_DARKER_BROWN};
94+
font-weight: bold;
95+
96+
@media ${max.tablet} {
97+
border-bottom-style: solid;
98+
border-bottom-color: ${colors.BORDER_BROWN};
99+
padding-bottom: 0.5em;
100+
}
79101
`;
80102
const StyledTabContentContainer = styled.div`
81-
background-color: ${colors.BUTTON_GREEN};
82-
height: 47.7em;
103+
background-color: ${colors.YELLOW_GREEN};
104+
height: 53.5em;
83105
width: 100%;
84106
margin-right: 5em;
85-
border: 2px solid ${colors.HEADER_FOOTER_BLUE};
107+
border: 2px solid ${colors.TRANSPARENT};
86108
border-left: none;
87109
border-radius: 0px 0.75em 0.75em 0em;
88-
110+
89111
@media ${max.tablet} {
90-
margin-left: 2em;
112+
margin-left: 1.9em;
91113
width: auto;
92-
border-left: 2px solid ${colors.HEADER_FOOTER_BLUE};
114+
border: 4px solid ${colors.BORDER_BROWN};
93115
margin-right: 2em;
94-
border-radius: 0em 0.75em 0em 0em;
116+
padding-bottom: 2em;
117+
margin-top: 1.75em;
118+
}
119+
@media ${max.mobile} {
120+
margin-left: 2em;
121+
padding-bottom: 1.5em;
122+
margin-top: 0em;
95123
}
96124
overflow-y: scroll;
97125
`;

‎live-site/images/arrow.svg‎

Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)