Skip to content

Profile image no collapse#29

Closed
utsavm9 wants to merge 2 commits into
masterfrom
profile-image-no-collapse
Closed

Profile image no collapse#29
utsavm9 wants to merge 2 commits into
masterfrom
profile-image-no-collapse

Conversation

@utsavm9

@utsavm9 utsavm9 commented Apr 12, 2019

Copy link
Copy Markdown
Contributor

Profile photo now does not collapse and edit button is now edit icon.

@mattxwang mattxwang left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Hey Utsav,

This PR looks alright, but the implementation is a bit sketchy - we shouldn't rely on an outside image host (i.e. imgur) for any component of our site (what if imgur went down, adds an extra outside request, could mess with caching, etc.). I'd either download the image and put it into the public folder, or use some alternative (i.e. using Font Awesome or something else).

(also, I'm not sure how I feel about the absolute positioning stuff, but that's workable for now).

@mattxwang

Copy link
Copy Markdown
Member

Alternatively, just leave the edit button as the word for now, and we can revisit this later - it's semi-important that we get this change through somewhat early.

@utsavm9

utsavm9 commented Apr 16, 2019

Copy link
Copy Markdown
Contributor Author

Merging this branch with the font-awesome branch...

@utsavm9

utsavm9 commented Apr 16, 2019

Copy link
Copy Markdown
Contributor Author

All changes of this branch are now in font-awesome branch. Merge that when complete to stable/master.

@utsavm9 utsavm9 closed this Apr 16, 2019
@mattxwang

Copy link
Copy Markdown
Member

Hey Utsav,

You should avoid merging different feature branches into the same PR in the future - but since you've already made the changes, I'll allow it this time.

@mattxwang mattxwang deleted the profile-image-no-collapse branch April 16, 2019 18:19
@utsavm9

utsavm9 commented Apr 16, 2019

Copy link
Copy Markdown
Contributor Author

Sorry! I though this was the quickest way to bring font awesome edit icon into this.

@mattxwang

Copy link
Copy Markdown
Member

Yeah, I understand that, and it's a bit tricky. In the future, you can remerge master back into this branch, use git cherry pick, or use a few other workarounds to make it all work out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants