Skip to content

Merging Develop with Master#163

Merged
trumanjchan merged 28 commits intomasterfrom
develop
Apr 30, 2021
Merged

Merging Develop with Master#163
trumanjchan merged 28 commits intomasterfrom
develop

Conversation

@trumanjchan
Copy link
Copy Markdown
Contributor

Types of changes

What types of changes does your code introduce to HackMerced Hub?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING doc
  • Lint and unit tests pass locally with my changes
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)
  • Any dependent changes have been merged and published in downstream modules

Responsiveness

Check off the different browsers and devices you have tested on. Note: testing includes Horizontal and Vertical alignments

Browsers

  • Chrome
  • Firefox
  • Edge
  • Safari
  • Brave
  • Opera

Devices

Phones

  • Moto G4
  • Galaxy S5
  • Pixel 2
  • Pixel 2 XL
  • iPhone 5/SE
  • iPhone 6/7/8
  • iPhone 6/7/8 Plus
  • iPhone X

Tablets

  • iPad
  • iPad Pro

Desktops

  • Windows 10
  • MacOSX
  • Ubuntu

Screenshots

Before this PR:
image
After this PR:
image
Before with hexagon hover feature:
image
After with revised hexagon hover feature:
image
Before with navbar breaklines taking full width in mobile view, & navbar background color not changing, & subscribe button too clumped up with subtext:
image
After with navbar breaklines NOT taking full width in mobile view, & navbar background color change with dark-mode toggle, & margin updates with home header img, text, subtext, and subscribe button, & navbar hover animation:
image

Further comments

Welcome, new members!

maryharebear and others added 28 commits March 25, 2021 21:44
Mobile hexagon hover, where the user long-presses a hexagon and swipes somewhere outside of the hexagon and lets go, was making the hover text really large at lower resolutions like phones. So I had to move the texts upwards at different resolutions, and change text size.
Fixed responsiveness for desktop and mobile all the way down to 300px
Didn't need the opacity to be changed. The break-lines will be visible without changing the opacity for some reason...
Deleted opacity for break-lines on home page
Fixed up comments in the .scss file, added new members to hexagons, and fixed hexagons component centering.
Added Shawn's pic to hexagons. Saw that the HackMerced Tower was placed very low on the home page, so I changed the margins, height, and widths of it. Changed CSS and media queries so the tower, title img, title texts, and subscribe button have proper z-indexes when overlapping, and fixed minor responsiveness issues relating to that.
Now Clouds will always float OVER the Tower. Above 1030px width, Clouds float OVER and UNDER the title img, texts, and subscribe button, but under 1030px width Clouds always float under the title img, texts, and subscribe button (because z-index).
Added Shawn's pic to hexagons, cleaned up some CSS
The Home Heading's img, text, subtext, and subscribe button were too squished together. I had to change the height of the Home Heading component and add css to that, and fix the css margins between the subtext and subscribe button. By doing this we fill most of the empty space in our Heading component; especially when at lower resolutions.
Had to subtract the vh by the height of the navbar's height. Will not do vh for lower resolutions because lower resolutions are for phones and other devices. Apparently vh might not work on them and create visual bugs (because you can zoom-in and scroll out of the page using a phone, changing the view height).
Changed Home Heading height w/ heading subtext & button margin
Navbar colour changes in mobile view. The colours in dark and light themes are different.
The colour at present is set to "rgb(255, 177, 129)"
Implemented hover feature animation for the navbar. Fixed breaklines having full width of the div by using margins as inner div padding (this is needed because it doesn't make sense to have a full width breakline under "Home").
Added navbar hover feature, & fixed breaklines width in hamburger navbar
to the hexagons! Only two more members' pictures. I also made the backdrop filter for the hover feature more blurry, so the title is easier to read when on top of white backgrounds.
All hexagons are now finalized, but can be changed at any time if members want to edit their picture.
to the hexagons.
@trumanjchan trumanjchan added New Feature New feature Fix Fixing a known bug labels Apr 30, 2021
@trumanjchan trumanjchan self-assigned this Apr 30, 2021
@github-actions github-actions bot added the react label Apr 30, 2021
@trumanjchan trumanjchan merged commit 789b3c9 into master Apr 30, 2021
adriandarian pushed a commit that referenced this pull request Oct 18, 2021
Merging Develop with Master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fix Fixing a known bug New Feature New feature react

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants