Merge develop into master
#1234
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Navbar + Footer fixes
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Clip refactor
Signed-off-by: Peter Kos <[email protected]> # Conflicts: # sass/main.scss
- arrows not aligned - code is kinda wonky Signed-off-by: Peter Kos <[email protected]>
- No arrows on mobile gallery (affordance + swipe convention is clear) Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Added back old hiring message
Signed-off-by: Peter Kos <[email protected]>
Signed-off-by: Peter Kos <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
Co-authored-by: Claire Gallup <[email protected]>
BH8 Preregistration Site
BH8 Preregistration Site
* 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 <[email protected]> * Update index.js Co-authored-by: Claire Gallup <[email protected]> * De semicolonification, fix out of range bug Co-authored-by: Claire Gallup <[email protected]>
* 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 <[email protected]> * Update index.js Co-authored-by: Claire Gallup <[email protected]> * De semicolonification, fix out of range bug Co-authored-by: Claire Gallup <[email protected]>
* 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 <[email protected]> * Events Section - BrickHack Club Site (#1219) * events section * fixes * typo fix Co-authored-by: Peter Kos <[email protected]> Co-authored-by: Peter Kos <[email protected]> * 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 <[email protected]>
# Conflicts: # index.html
* Rename club stuff * bhclub -> club * Fix remaining bhclub->club
|
✔️ Deploy Preview for infallible-lumiere-e9d357 ready! 🔨 Explore the source changes: 5590162 🔍 Inspect the deploy log: https://app.netlify.com/sites/infallible-lumiere-e9d357/deploys/612a3c7c4ead22000758eabe 😎 Browse the preview: https://deploy-preview-1234--infallible-lumiere-e9d357.netlify.app |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@peterkos why are there 1k commits for 19 additions and 19 deletions