You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/11/24 03:37:49 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2712] alerts overlapping is fixed
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 08d3670 [OPENMEETINGS-2712] alerts overlapping is fixed
08d3670 is described below
commit 08d36706fdb211324005799231a0f38de1ae14cd
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Nov 24 10:37:35 2021 +0700
[OPENMEETINGS-2712] alerts overlapping is fixed
---
openmeetings-web/src/main/webapp/css/raw-chat.css | 8 ++++----
openmeetings-web/src/main/webapp/css/raw-general.css | 1 +
openmeetings-web/src/main/webapp/css/raw-variables.css | 1 +
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/openmeetings-web/src/main/webapp/css/raw-chat.css b/openmeetings-web/src/main/webapp/css/raw-chat.css
index 4b3d707..ecc9ada 100644
--- a/openmeetings-web/src/main/webapp/css/raw-chat.css
+++ b/openmeetings-web/src/main/webapp/css/raw-chat.css
@@ -1,15 +1,12 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
#chatPanel {
position: fixed;
- z-index: 2000;
+ z-index: var(--chat-zindex);
bottom: 0px;
right: 10px;
width: var(--chat-width);
height: var(--chat-height);
}
-.chat-delete.confirmation {
- z-index: 2001;
-}
#chatPanel #chatPopup {
height: 100%;
}
@@ -204,3 +201,6 @@ html[dir="rtl"] .main.room #chatPanel {
.chat-toolbar .chat-btn.under, .wysiwyg-toolbar .tool-btn.under {
text-decoration: underline;
}
+.chat-delete.confirmation {
+ z-index: calc(var(--chat-zindex) + 1);
+}
diff --git a/openmeetings-web/src/main/webapp/css/raw-general.css b/openmeetings-web/src/main/webapp/css/raw-general.css
index b998b62..c93d171 100644
--- a/openmeetings-web/src/main/webapp/css/raw-general.css
+++ b/openmeetings-web/src/main/webapp/css/raw-general.css
@@ -752,6 +752,7 @@ select.messages.selector {
position: fixed;
right: 0;
bottom: 0;
+ z-index: calc(var(--chat-zindex) + 2);
}
.popover.confirmation.show {
z-index: 3000; /* FIXME TODO move this to variables */
diff --git a/openmeetings-web/src/main/webapp/css/raw-variables.css b/openmeetings-web/src/main/webapp/css/raw-variables.css
index 5ffa8f3..28b8703 100644
--- a/openmeetings-web/src/main/webapp/css/raw-variables.css
+++ b/openmeetings-web/src/main/webapp/css/raw-variables.css
@@ -14,6 +14,7 @@ body {
--chat-tools-height: 40px;
--chat-msg-height: 80px;
--chat-send-width: 32px;
+ --chat-zindex: 2000;
}
body.no-header {
--header-height: 0px;