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.

Sign up for GitHub

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

Jump to bottom

Inboxstyling #20

Open
wants to merge 270 commits into
base: master
Choose a base branch
from
Open

Inboxstyling #20

wants to merge 270 commits into from

Conversation

jUnion44
Copy link

Sorry for the delay but the conversation pane on the left should now properly cut off long messages in the preview.

Rae and others added 30 commits November 1, 2021 19:16
Merge pull request #5 from Hack4Impact-UMD/more_side_menu_changes
368e209 
More side menu changes
Merge pull request #4 from Hack4Impact-UMD/BrowseProfileTweaks
5aab459 
Browse Profile Tweaks
Merge pull request #6 from Hack4Impact-UMD/Yoel/EditProfile
bf2be8c 
Yoel/edit profile
Merge branch 'master' into Account-Settings-Cards
5695a8f
Merge pull request #7 from Hack4Impact-UMD/Account-Settings-Cards
a785c3b 
Profile card layout
@popoviciyoel
favoriteProfile page header
059b724
@popoviciyoel
light box update
3a9c83a
@popoviciyoel
favoriteProfile page header
2c8136a 
rebase
messed with package stuff
d0b890f
@Sean-ha
Remove changes from profile, added to settings
9c0a010
@Sean-ha
Merge branch 'Account-Settings-Cards' of https://github.com/Hack4Impa…
9d1b292 
…ct-UMD/unstoppable_ui into Account-Settings-Cards
@Sean-ha
Adjust dropdown styling
a99f797
@Sean-ha
Uncomment some things
7c66301
Merge branch 'master' into Side-menu-dropdown
e80ce08
Merge pull request #8 from Hack4Impact-UMD/Account-Settings-Cards
f842d59 
Account settings cards
Merge pull request #9 from Hack4Impact-UMD/Side-menu-dropdown
a1e57e5 
Side menu dropdown
Revert "Merge pull request #9 from Hack4Impact-UMD/Side-menu-dropdown"
8362273 
This reverts commit a1e57e5, reversing
changes made to f842d59.
added accordian, created buttons and other fields needed
075f6e5
@Sean-ha
Fix package errors
1fce659
@andrewyuantw
Updated Profile Cards to fit Figma
6514ffd
@ananyanadig
Changes to forgot password and username
130c121
@andrewyuantw
Fixed minors bugs plus added colored cards for different cancer types
f5c3724
minor styling changes, still needs more styling changes and logic
a9aef3d
Merge pull request #12 from Hack4Impact-UMD/BrowseProfileTweaks
5af8b71 
Browse profile tweaks - Updated Profile Cards
fixed extra space on the root
92d4d22
Merge pull request #11 from Hack4Impact-UMD/forgot_identification
6c29ce8 
Changes to forgot password and username
advanced options created and/or hidden in drop down
aed73ca 
- dummy text comprises the buttons currently
- some global overrides/styling was done
- attempted to add in fields to make the browse profiles functional
	-> todo: finish this later
preliminary work (not working)
f90ec37
@popoviciyoel
added profiler cards to page and cleaned header up a bit
bee5f68
@popoviciyoel
pagination bar
f90758f
codingdn and others added 30 commits March 2, 2022 12:03
@codingdn
Merge pull request #48 from Hack4Impact-UMD/sign-up-revision
a08484e 
Sign up revision
@jUnion44
Fixed account settings zoom
71bad1f
@andrewyuantw
Updated Edit Profile Popup UI
d53d5e4 
Does not save properly though, still need to look at that
@andrewyuantw
Merge branch 'master' into AndrewYuan/EditProfile
66ff5c1
@codingdn
Merge pull request #49 from Hack4Impact-UMD/AndrewYuan/EditProfile
2770a6b 
Edit Profile Popup Box
@alemtani
Update progress bar for steps
5f904af
@alemtani
Merge branch 'master' into alex_tanimoto
a1544df
@codingdn
Merge pull request #50 from Hack4Impact-UMD/alex_tanimoto
453313c 
Update progress bar for registration
@jUnion44
inbox styling + rgb
5c35094
@popoviciyoel
added footer section on browse profile page
0a696c1
@jUnion44
Merge branch 'master' of https://github.com/Hack4Impact-UMD/unstoppab…
f207b98 
…le_ui into fixrgb
@jUnion44
Login Fix
cf73e07
@codingdn
Merge pull request #52 from Hack4Impact-UMD/fixrgb
8d9bf30 
inbox styling + rgb
@codingdn
Delete settings.json
088eace 
not needed
@codingdn
Merge pull request #53 from Hack4Impact-UMD/fixzoom
c9f049f 
Fixed account settings zoom
@codingdn
Merge pull request #54 from Hack4Impact-UMD/Yoel/Browse2
cbd5b07 
added footer section on browse profile page
@popoviciyoel
favorites page edits
4545ab7
@codingdn
Merge pull request #56 from Hack4Impact-UMD/Yoel/FavoriteProfile
9e7903d 
favorites page edits
@andrewyuantw
Reformatted Messages Sidebar to Remove Divider
3caa594
@andrewyuantw
Merge branch 'master' into AndrewYuan/MessageDivider
80b34e3
@andrewyuantw
Message Truncation
8564d13
@andrewyuantw
Merge branch 'AndrewYuan/MessageDivider' of https://github.com/Hack4I…
54435a0 
…mpact-UMD/unstoppable_ui into AndrewYuan/MessageDivider
@andrewyuantw
Change char limit to 30
8ce2774
@andrewyuantw
Change char limit to 20
dbc3aca
@alemtani
Restyle messages, navbar, and text
829a119
@codingdn
Merge pull request #57 from Hack4Impact-UMD/AndrewYuan/MessageDivider
d0d4827 
Reformatted Messages Sidebar to Remove Divider
@jUnion44
Merge branch 'master' into loginfix
1a8924c
@codingdn
Merge pull request #58 from Hack4Impact-UMD/message-style
9425fb5 
Restyle messages, navbar, and text
@codingdn
Merge pull request #55 from Hack4Impact-UMD/loginfix
45b8efe 
Loginfix
@jUnion44
Fixed message preview runoff
41add37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@jUnion44 @popoviciyoel @Sean-ha @andrewyuantw @ananyanadig @codingdn @alemtani