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.

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

Fixing branches #80

Merged
merged 16 commits into from
Jun 9, 2020
Merged

Fixing branches #80

merged 16 commits into from
Jun 9, 2020

Conversation

maryharebear
Copy link
Member

Trying to merge and fix the branches from team page and about us

maryharebear and others added 15 commits May 21, 2020 21:33
The code is not responsive, so I will / we will have to change it later on.
I used a different source online that had code for a responsive hexagon design, and edited it. I also added media queries for the Header of the component, "Our Team", so the font-size changes based on a specified resolution's width. We also decided not to use the linkedIn photos because the default resolution on those are too small, and would need to be scaled. For now, there are placeholders because members need to upload their photos into our Google Drive.
Created Team Pics component for Home-page
@maryharebear maryharebear self-assigned this Jun 8, 2020
@maryharebear maryharebear added the bug Something isn't working label Jun 8, 2020
@github-actions github-actions bot added the react label Jun 8, 2020
@maryharebear maryharebear changed the base branch from master to develop June 9, 2020 06:02
@adriandarian adriandarian self-requested a review June 9, 2020 06:02

.fa {
color: white;
font-size: 35px !important;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bad practice to use !important

@maryharebear maryharebear merged commit 302242d into develop Jun 9, 2020
@delete-merged-branch delete-merged-branch bot deleted the feat/home-page branch June 9, 2020 06:33
adriandarian pushed a commit that referenced this pull request Oct 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working react
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants