[Libreoffice-commits] online.git: 2 commits - loleaflet/dist loleaflet/README

[Pranav Kant]

 loleaflet/README           |    3 ++-
 loleaflet/dist/toolbar.css |   10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 341c07b64f1012731b6d337929b120640d2474be
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

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index dbba1f3f..a4070770 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%;
commit dbadff5551da2261f58a610514cc8a3b7ba1ff0e
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Aug 4 17:38:47 2017 +0530

    loleaflet: Be more specific in README instructions regarding update
    
    An `npm update` on my local tries to update all the modules to latest
    version; surely we don't want it everytime only one module update is
    required.
    
    Change-Id: I2f79e77ae23edb9b8f8248ac7535e014b7b3218d

diff --git a/loleaflet/README b/loleaflet/README
index caa5e522..acc790da 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -31,7 +31,8 @@ directory, so build process can move forward even without an internet connection
 To update any of the dependency, process often goes like this:
 
 1.) Change version of the dependency in package.json
-2.) Do an `npm update', which fetches the new module from npm registry
+2.) Do an `npm update <package_name>', which fetches the new module from npm registry. Make sure that
+    only the module that you want to update is updated.
 3.) `npm shrinkwrap --dev` to update npm-shrinkwrap.json with newer information. You might see
     that this tool updates path convention of tarballs inside node_shrinkwrap/ also, but this
     should get corrected in next step.