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

[gokaysatir (via logerrit)]

 loleaflet/css/notebookbar.css              |    1 +
 loleaflet/src/control/Control.LokDialog.js |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 1be5550126f83d08cbc39f92647293130951dba5
Author:     gokaysatir <gokaysatir at collabora.com>
AuthorDate: Mon Jul 27 18:25:10 2020 +0300
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Tue Jul 28 00:44:41 2020 +0200

    loleaflet: lokDialog children are mispositioned bug.
    
    Change-Id: I9f84d1860d541c56da033dff6e95dbc4d7e0f68b
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/99513
    Tested-by: Jenkins
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Henry Castro <hcastro at collabora.com>

diff --git a/loleaflet/css/notebookbar.css b/loleaflet/css/notebookbar.css
index 09626e911..dbf9ccfb1 100644
--- a/loleaflet/css/notebookbar.css
+++ b/loleaflet/css/notebookbar.css
@@ -96,6 +96,7 @@
 
 #toolbar-wrapper.hasnotebookbar {
 	position: fixed;
+	z-index: 11;
 }
 
 /* unobuttons */
diff --git a/loleaflet/src/control/Control.LokDialog.js b/loleaflet/src/control/Control.LokDialog.js
index f88e74e5e..d2aa02af7 100644
--- a/loleaflet/src/control/Control.LokDialog.js
+++ b/loleaflet/src/control/Control.LokDialog.js
@@ -1674,7 +1674,7 @@ L.Control.LokDialog = L.Control.extend({
 		else if (grandParentID.includes('calc-inputbar')) {
 			// This is the calculator input bar.
 			L.DomUtil.setStyle(floatingCanvas, 'left', (containerLeft + left) + 'px');
-			L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop + top - 20) + 'px');
+			L.DomUtil.setStyle(floatingCanvas, 'top', (containerTop + 20) + 'px');
 		}
 		else
 		{