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 Club Site Updates #1245

Merged
merged 1,088 commits into from
Sep 18, 2021
Merged

BrickHack Club Site Updates #1245

merged 1,088 commits into from
Sep 18, 2021

Conversation

sjmiller7
Copy link
Contributor

BrickHack Club site updates + changing the BrickHack event dates on the BH8 Preregister site.

peterkos and others added 30 commits December 15, 2020 17:52
Signed-off-by: Peter Kos <pkos91@icloud.com>
Signed-off-by: Peter Kos <pkos91@icloud.com>

# Conflicts:
#	sass/main.scss
- arrows not aligned
- code is kinda wonky

Signed-off-by: Peter Kos <pkos91@icloud.com>
- 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>
cbaudouinjr and others added 22 commits June 28, 2021 22:45
* Moving window!

* Update browserlist cache

* Fix footer dispapearing on mobile

* Fix unused code move to todo

* newline EOF

* Update index.js

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

* Update index.js

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

* De semicolonification, fix out of range bug

Co-authored-by: Claire Gallup <colbygallup@gmail.com>
* Moving window!

* Update browserlist cache

* Fix footer dispapearing on mobile

* Fix unused code move to todo

* newline EOF

* Update index.js

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

* Update index.js

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

* De semicolonification, fix out of range bug

Co-authored-by: Claire Gallup <colbygallup@gmail.com>
* Altered Mailchimp code

* bh rit -> BrickHack Interest audience
* 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
@sjmiller7 sjmiller7 self-assigned this Sep 18, 2021
@netlify
Copy link

netlify bot commented Sep 18, 2021

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

🔨 Explore the source changes: fbc172a

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

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

# 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.
@sjmiller7 sjmiller7 merged commit d58c019 into master Sep 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants