[Libreoffice-commits] online.git: loleaflet/css loleaflet/src

[Libreoffice Gerrit user]

 loleaflet/css/loleaflet.css  |    9 ++++++---
 loleaflet/src/core/Socket.js |    2 +-
 loleaflet/src/map/Map.js     |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 60dca5cf5edbdea1d7f9c5727776ccbb867ced6b
Author:     Alexandru Vlăduţu <alexandru.vladutu at 1and1.ro>
AuthorDate: Mon May 6 12:18:35 2019 +0300
Commit:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu May 16 16:12:27 2019 +0200

    loleaflet: minor followup changes after vex upgrade
    
    Change-Id: I9cee6ee5b0592f067718399a4ccaf1c25203c01c
    Reviewed-on: https://gerrit.libreoffice.org/71851
    Reviewed-by: Iván Sánchez Ortega <ivan.sanchez at collabora.com>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/loleaflet/css/loleaflet.css b/loleaflet/css/loleaflet.css
index 79b620422..68626261b 100644
--- a/loleaflet/css/loleaflet.css
+++ b/loleaflet/css/loleaflet.css
@@ -484,14 +484,17 @@ body {
 }
 /* Vex dialogs */
 .vex-open .vex-overlay {
-	z-index: 1001; /* required to be displayed over the document  */
+	/* TODO: remove specific z-index from our codebase
+	so that the following line can also be removed */
+	z-index: 1001;
 }
-.vex-open .vex-idle { /* dialog shown when user is idle */
+/* dialog shown when user is idle */
+.vex-open .loleaflet-user-idle {
 	background: rgba(0, 0, 0, 0)!important;
 	font-size: xx-large!important;
 	color: #fff!important;
 	text-align: center!important;
 }
-.vex-open .vex-idle .vex-dialog-buttons {
+.vex-open .loleaflet-user-idle .vex-dialog-buttons {
 	display: none!important;
 }
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index ecc6f6014..01d5c5675 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -401,7 +401,7 @@ L.Socket = L.Class.extend({
 
 			var dialogOpened = vex.dialog.open({
 				message: message,
-				contentClassName: 'vex-idle'
+				contentClassName: 'loleaflet-user-idle'
 			});
 
 			if (textMsg === 'idle' || textMsg === 'oom') {
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index d9476a857..a20738b96 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -1048,7 +1048,7 @@ L.Map = L.Evented.extend({
 
 		vex.open({
 			content: message,
-			contentClassName: 'vex-idle',
+			contentClassName: 'loleaflet-user-idle',
 			afterOpen: function() {
 				var $vexContent = $(this.contentEl);
 				$vexContent.bind('click.vex', function() {