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

BrickHack 8 - Sponsorship Mini Section #1262

Merged
merged 1,093 commits into from
Feb 3, 2022
Merged

BrickHack 8 - Sponsorship Mini Section #1262

merged 1,093 commits into from
Feb 3, 2022

Conversation

sjmiller7
Copy link
Contributor

Getting prospectus out + hosting an outlined logo for our application portal

peterkos and others added 30 commits December 15, 2020 19:37
- No arrows on mobile gallery (affordance + swipe convention is clear)

Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Added back old hiring message
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>
Added "view gallery" button
Signed-off-by: Peter Kos <pkos91@icloud.com>

# Conflicts:
#	index.html
#	sass/main.scss
peterkos and others added 22 commits July 1, 2021 16:14
* Altered Mailchimp code

* bh rit -> BrickHack Interest audience
* file creation

* site outline

* making link from index

* fixing typos

* content outline + positioning navbar

* Navbar styling (normal + mobile)

* navbar functionality

* file cleanup

* more general styles

* making the navbar close when clicked outside of it

* fixes based on 7/22 design meeting

* Fixes

* footer

* filling out content section

* font spacing

* image alt text

* color fixes

* design changes

* attempting to avoid merge conflicts, pray for me

* broken fixes

* more fixes + making parcel work w/ temp fix

* undo the temporary fix

* fix clipping border radius

* About Section - BrickHack Club Site  (#1215)

* about section + cards

* about changes

* changes from design meeting 7/29

* nit from github

* more design fixes (colors + nav hover)

* join link text fix

* fixes

* design fixes

* fix for parcel

* fixes

* Landing Section - BrickHack Club Site (#1218)

* landing section

* Fix image scaling

* Text width on mobile fix, add some moblbtn padding

* content fixes

* changing email

Co-authored-by: Peter Kos <pkos91@icloud.com>

* Events Section - BrickHack Club Site (#1219)

* events section

* fixes

* typo fix

Co-authored-by: Peter Kos <pkos91@icloud.com>

Co-authored-by: Peter Kos <pkos91@icloud.com>

* Teams Section - BrickHack Club Site (#1220)

* html + svgs

* css

* starting to fix the dropdown

* fixing dropdown

* making team info show/hide

* updating svgs

* fixes

* BrickHack Club Site Fixes (#1222)

* logo updates

* fixes

Co-authored-by: Peter Kos <pkos91@icloud.com>
# Conflicts:
#	index.html
* Rename club stuff

* bhclub -> club

* Fix remaining bhclub->club
Fix BrickHack 8 site logo getting cut off on shorter devices
* make dropdown button be #ffffff white on default

* fixing transitions and hover colors

* put underline on the nonhovered text links

* make button width the same for each team

* typography fixes

* button padding fixes

* layout fixes

* meta tags

* twitter link

* fixing mobile navbar jumping

* fixes

* spacing fixes

* underline fix

* fixes
# Conflicts:
#	assets/club/design-team.svg
#	assets/club/logistics-team.svg
#	assets/club/marketing-team.svg
#	assets/club/sponsorship-team.svg
#	sass/club.scss
This reverts commit fd28fe8, reversing
changes made to ed27e8a.
* swapping files and start gutting bh7 copy

* more gutting of css

* style refactor

* logo update

* design fixes

* mobile navbar

* design fixes

* social cards being funky

* editing social card resolution

* adjusting social card

* favicon swap

* nav underline

* outline color fix

* remove login

* fixes

* comment fixes

* contact first attempt

* changing social links

* Revert "comment fixes"

This reverts commit 75f57c6.

* Revert "Revert "comment fixes""

This reverts commit 6c75a58.

* Revert "changing social links"

This reverts commit fef9a7b.

* Revert "contact first attempt"

This reverts commit d980e9a.

* BrickHack 8 Site - Hero Section (#1253)

* starting hero

* hero section

* swapping out loop file

* fixes

* design fixes

* spacing fix

* BrickHack 8 Site - About Section (#1254)

* inital about section

* card width

* fixes

* BrickHack 8 Site - FAQ Section (#1252)

* faq styling + ricky

* fixing mobile

* removing old padding class

* fixes

* fixing broken cards

* BrickHack 8 Site - Contact & Footer (#1256)

* contact section

* fixes

* newline eof

Co-authored-by: Skye Gallup <colbygallup@gmail.com>

* fixing aspect ratio code

Co-authored-by: Skye Gallup <colbygallup@gmail.com>

* design + js fixes

* design fixes

* trying to hide play button

* trying to hide play button 2

* trying to hide play button 3

* fixing faq ricky

* fixing mobile grayout opacity

* hiding mlh banner

* copyright date

* updating stats

* prepping for open applications

* content fixes for chris

* spelling error

Co-authored-by: Chris Baudouin, Jr. <cjb5326@rit.edu>

* fixing spelling error

* fixing faq padding

* hero content adjustments

* hero content addition

* centering hero on mobile

Co-authored-by: Skye Gallup <colbygallup@gmail.com>
Co-authored-by: Chris Baudouin, Jr. <cjb5326@rit.edu>
* sponsorship mini section draft

* design fixes

* swapping in new prospectus
* sponsorship mini section draft

* design fixes

* uploading outlined logo
@sjmiller7 sjmiller7 added the BH8 Ohhhh yea! label Jan 28, 2022
@sjmiller7 sjmiller7 self-assigned this Jan 28, 2022
@netlify
Copy link

netlify bot commented Jan 28, 2022

✔️ Deploy Preview for infallible-lumiere-e9d357 ready!

🔨 Explore the source changes: 60cd00a

🔍 Inspect the deploy log: https://app.netlify.com/sites/infallible-lumiere-e9d357/deploys/61fc522aaebe2c0007e71be0

😎 Browse the preview: https://deploy-preview-1262--infallible-lumiere-e9d357.netlify.app

Copy link

@skyegallup skyegallup left a comment

Choose a reason for hiding this comment

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

Providing a temporary approval to test if it'll fix merge issues; this PR is not approved to be merged into master yet

@peterkos peterkos merged commit b16c111 into master Feb 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BH8 Ohhhh yea! release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants