dev/null |binary
loleaflet/README | 12 +++---------
loleaflet/dist/toolbar.css | 2 +-
loleaflet/package.json | 8 +++-----
4 files changed, 7 insertions(+), 15 deletions(-)
New commits:
commit b230dcb26f344d166b77faa4f3538dbe82af9ac1
Author: Pranav Kant <pran...@collabora.com>
Date: Mon Jun 6 16:28:57 2016 +0530
loleaflet: Kill modules.zip
... and save ~3MB of space.
Change-Id: Iaa5cb62936d66044b657e6a507237a90f1d0a537
diff --git a/loleaflet/README b/loleaflet/README
index fedd119..4da5145 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -10,14 +10,10 @@ Build dependencies
First you need to install 'jake'. As root, do:
npm install -g jake
- npm install
npm is provided by the nodejs package.
-Alternatively, you can use the provided zip (as a normal user):
- unzip node_modules/modules.zip -d node_modules
-
-A third way is to use npm as a user, but set its prefix to a directory where
+Another way is to use npm as a user, but set its prefix to a directory where
you have write access. If you want that, you need to have an ~/.npmrc with the
line e.g.
@@ -26,11 +22,9 @@ line e.g.
Building
--------
-As a normal user:
+Just do:
- jake build
- cd plugins/draw-0.2.4
- jake build
+ make
Running
-------
diff --git a/loleaflet/node_modules/modules.zip
b/loleaflet/node_modules/modules.zip
deleted file mode 100644
index 89f2848..0000000
Binary files a/loleaflet/node_modules/modules.zip and /dev/null differ
commit a32ded97525e375e5e7cf0177db1752592bf6622
Author: Pranav Kant <pran...@collabora.com>
Date: Sat Jun 4 15:38:08 2016 +0530
loleaflet: Move websocket module to devDependencies
This module is only used from tests. These are not hard
depedencies.
Change-Id: I9b63562de827f9d2e12fa108555cc783a5689db2
diff --git a/loleaflet/package.json b/loleaflet/package.json
index 883699c..618dff4 100644
--- a/loleaflet/package.json
+++ b/loleaflet/package.json
@@ -16,7 +16,8 @@
"karma-safari-launcher": "~0.1.1",
"mocha": "~2.1.0",
"tin": "^0.5.0",
- "uglify-js": "~2.4.16"
+ "uglify-js": "~2.4.16",
+ "ws": "~0.7.2"
},
"main": "dist/leaflet-src.js",
"style": "dist/leaflet.css",
@@ -38,8 +39,5 @@
"type": "BSD-2-Clause",
"url": "https://github.com/Leaflet/Leaflet/blob/master/LICENSE";
}
- ],
- "dependencies": {
- "ws": "~0.7.2"
- }
+ ]
}
commit 3ec6c6b6625c04a55b7a704d903b3887abc029b9
Author: Pranav Kant <pran...@collabora.com>
Date: Sat Jun 4 15:16:33 2016 +0530
loleaflet: Reduce z-index of auxiliary toolbar
Otherwise, when the screen becomes inactive, it is the only
widget to shine separately.
Change-Id: Idf22e2cece3fd465ff37e7304f4776dbfdef66a8
diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index abc6c25..35e7976 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -34,7 +34,7 @@
width: 200px;
top: 65px;
border: 1px solid darkgrey;
- z-index: 8000;
+ z-index: 1000;
display: none;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
