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

Fixes #10677: Fixed profile picture on profile page #10802

Merged
merged 4 commits into from
Apr 12, 2022
Merged

Fixes #10677: Fixed profile picture on profile page #10802

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f58240
Fixes #10677: Fixed profile picture on profile page
KarishmaVanwari Mar 20, 2022
6f3ef0c
Used img tag again
KarishmaVanwari Apr 6, 2022
f401212
Merge branch 'main' into profile
jywarren Apr 12, 2022
369019d
restore explicit <img tag
jywarren Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/users/profile.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
<div class="offset-md-1 order-first order-md-last col-md-4 text-center">
<div class="text-center d-none d-lg-block">
<%if @content_approved or (!current_user.nil? && current_user.id == @profile_user.id)%>
<%= image_tag(@profile_user.profile_image, class:'rounded-circle', id:'profile-photo', style:"width:50%;margin-bottom:10px;") %>
<img src="<%= @profile_user.profile_image %>" class="rounded-circle" id="profile-photo" style="width:50%;margin-bottom:10px;" />
<%end%>
<h4 class="mt-3"><strong>@<%= @profile_user.name %> <%= @profile_user.new_contributor %></strong></h4>
</div>
<div style="text-align:center;" class="d-lg-none">
<%if @content_approved or (!current_user.nil? && current_user.id == @profile_user.id)%>
<%= image_tag(@profile_user.profile_image(:medium), class:'rounded-circle', id:'profile-photo', style:"width:50%;margin-bottom:20px;") %>
<img src="<%= @profile_user.profile_image(:medium) %>" class="rounded-circle" id="profile-photo" style="width:50%;margin-bottom:20px;" />
TildaDares marked this conversation as resolved.
Show resolved Hide resolved
<%end%>
<h4 class="mt-3"><strong>@<%= @profile_user.name %> <%= @profile_user.new_contributor %></strong></h4>
</div>
Expand Down