Skip to content

Regression: Unread superposing announcement. #20306

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

Merged
ggazzo merged 1 commit into from
Jan 21, 2021
Merged

Regression: Unread superposing announcement. #20306

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
10 changes: 5 additions & 5 deletions app/theme/client/imports/general/base_old.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,13 +1310,12 @@
}

.rc-old .container-bars {
position: absolute;
position: relative;
z-index: 2;
top: 5px; /* --header-height */
right: 10px;
left: 10px;

margin: 5px 10px 0;

display: flex;
display: none;
visibility: hidden;
overflow: hidden;
flex-direction: column;
Expand All @@ -1334,6 +1333,7 @@
font-weight: bold;

&.show {
display: flex;
visibility: visible;

transform: translateY(0);
Expand Down
6 changes: 5 additions & 1 deletion client/views/room/Announcement/Announcement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ export const Announcement = ({ children, onClickOpen }) => {
export default ({ announcement, announcementDetails }) => {
const setModal = useSetModal();
const closeModal = useMutableCallback(() => setModal());
const handleClick = () => {
const handleClick = (e) => {
if (e.target.href) {
return;
}

if (window.getSelection().toString() !== '') {
return;
}
Expand Down