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

[#59907] fix: User hovercard behind Meeting participants overlay #17385

Merged
merged 1 commit into from
Dec 9, 2024
Merged

[#59907] fix: User hovercard behind Meeting participants overlay #17385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/components/users/hover_card_component.sass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// modal overlay will darken the background while the hover card is active, since its semi-transparent bg shading is
// added on top of the other dialog background shaders. We don't want an additional spot modal background here,
// so we disable it for this edge case.
.controller-projects.action-index
.controller-projects.action-index, .controller-meetings.action-show
.spot-modal-overlay:not(:has(.op-user-hover-card))
background: transparent

Expand Down
11 changes: 9 additions & 2 deletions modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
class: 'Overlay-form'
) do |f|
flex_layout(mt: 3) do |form_container|

form_container.with_row do
flex_layout(justify_content: :flex_end) do |header|
header.with_column(style: "width: 90px;", text_align: :center) do
Expand Down Expand Up @@ -47,7 +48,8 @@
existing_participant.with_column(flex: 1, classes: 'ellipsis') do
render(Users::AvatarComponent.new(
user: participant.user,
classes: 'op-principal_flex'
classes: 'op-principal_flex',
hover_card: { active: true, target: :custom }
))
end
existing_participant.with_column(style: "width: 90px;", text_align: :center) do
Expand Down Expand Up @@ -84,7 +86,8 @@
new_participant.with_column(flex: 1, classes: 'ellipsis') do
render(Users::AvatarComponent.new(
user:,
classes: 'op-principal_flex'
classes: 'op-principal_flex',
hover_card: { active: true, target: :custom }
))
end

Expand All @@ -109,6 +112,10 @@
end
end
end

form_container.with_row do
helpers.angular_component_tag 'opce-custom-modal-overlay'
end
end
end
end
Expand Down
Loading