Skip to content

Commit

Permalink
Merge pull request #201 from kufu/add-avater-img-bg-color
Browse files Browse the repository at this point in the history
  • Loading branch information
yamakeeeeeeeeen authored May 15, 2024
2 parents 8e32bbc + 9267254 commit 4164296
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
3 changes: 1 addition & 2 deletions app/views/profiles/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<div class="flex flex-wrap p-2 gap-4">
<% @profile.friend_profiles.each do |friend| %>
<a href="/profiles/<%= friend.name %>">
<img src="<%= friend.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black" />
<img src="<%= friend.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black bg-white" />
</a>
<% end %>
</div>
Expand Down Expand Up @@ -200,4 +200,3 @@
</div>
</div>
<% end %>

2 changes: 1 addition & 1 deletion app/views/schedules/_card.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<div class="flex flex-wrap pl-4">
<% @team.active_profiles.each do |profile| %>
<% if @member_schedules_map[profile.id].include?(schedule.id) %>
<img src="<%= profile.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black ml-[-16px] mt-1" />
<img src="<%= profile.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black bg-white ml-[-16px] mt-1" />
<% end %>
<% end %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/teams/_mobile_table_row.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<% if filtered_profiles.any? %>
<div class="p-2 pl-4 flex flex-wrap">
<% filtered_profiles.each do |prof| %>
<img src="<%= prof.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black ml-[-16px] mt-1" />
<img src="<%= prof.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black bg-white ml-[-16px] mt-1" />
<% end %>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/teams/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<p class="text-sm font-bold text-[rgb(112,109,101)] text-left"><%= row.timezone %></p>
<div class="p-2 pl-4 flex flex-wrap">
<% @team.active_profiles.reject { |prof| row.schedules.any? { @member_schedules_map[prof.id].include?(_1.id) } }.each do |prof| %>
<img src="<%= prof.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black ml-[-16px] mt-1" />
<img src="<%= prof.avatar_url %>" class="h-12 w-12 rounded-full border-2 border-black bg-white ml-[-16px] mt-1" />
<% end %>
</div>
</div>
Expand Down

0 comments on commit 4164296

Please sign in to comment.