[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - loleaflet/dist

[Pranav Kant]

 loleaflet/dist/toolbar.css |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit d09e5c0ad665d220d6d6693ad04a2294632eeacc
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Aug 4 17:41:54 2017 +0530

    loleaflet: Explicitly mention z-index to please MS Edge 40
    
    This is not required in any other browser, but Edge 40 requires it
    otherwise the popup window upon clicking the combo box goes behind the
    main #map element.
    
    Change-Id: Ie95263f08c8af27b16a56ba2c3c7a9faa308400a
    (cherry picked from commit 341c07b64f1012731b6d337929b120640d2474be)
    Reviewed-on: https://gerrit.libreoffice.org/40766
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index ab8894ca..0b65e88f 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -42,6 +42,16 @@
     width: 100%;
 }
 
+/* For MS Edge 40, the select2 combo boxes need to have higher z-index than #map
+ * Ideal would be to add the class to select2-container <span>, but
+ * https://github.com/select2/select2/issues/285
+ * So, for now just define the z-index here separately for the same class that select2 uses
+ * as a container
+ */
+.select2-container {
+    z-index: 11;
+}
+
 /* center the toolbar */
 #tb_presentation-toolbar_item_left {
     width: 50%;